[08:13] <mtaylor> jelmer: awake? you grok git, right?
[08:30] <ryan_scott> I've got two branches/repos cloned from the same SVN.  I want to merge the latest changes from one into the other.  I can generate a patch file and apply that, but it seemed like merge could facilitate this.
[08:31] <ryan_scott> However it's not working and I can't quite tell why.  It seems to be mis-identifying files (like using the wrong -p# would)
[08:31] <ryan_scott> I tried using --verbose to maybe get some hints, but that's not helping me in this case.
[08:31] <ryan_scott> Anyone have any pointers?
[08:54] <ryan_scott> Found out my issue was this: https://bugs.launchpad.net/bzr/+bug/318620
[08:54] <ubot5> Ubuntu bug 318620 in Bazaar "When merging two branches without common ancestry, Bazaar provides no means to map file IDs" [Medium,Confirmed]
[09:50] <Kamping_Kaiser> jeees, bzr just ate all my resources o.0
[09:50] <Kamping_Kaiser> oh, only 40% for bzr, vim has 10%. i take it back *g*
[10:20] <ryan_scott> Is there a way I can do a merge and ignore conflicts by using the version in the branch?
[10:29] <Ddorda> ‎hey guys, i commited and pushed a first rev, now i wish to remove it and to push a fixed commit. is that possible? i tried using uncommit + push, but it says "No new revisions to push." - any ideas?
[10:30] <Kamping_Kaiser> Ddorda: you may be able to --force it, or just sacrifice commit #2
[10:31] <Ddorda> ‎Kamping_Kaiser: bzr: ERROR: no such option: --force
[10:32] <Kamping_Kaiser> Ddorda: --overwrite is what i was thinking of, but hang around, you may get a better one
[11:03] <Ddorda> ‎Kamping_Kaiser: --overwrite doesn't work either
[11:03] <Ddorda> ‎Kamping_Kaiser: No new revisions to push.
=== abeaumont is now known as abeaumont_
=== Meths_ is now known as Meths
[13:12] <vila> Ddorda: this sounds like you're using a checkout (or a bound branch) and in this case you don't have to push as commit already put the new revision there
[13:13] <fullermd> mgz: Doesn't change anything; still deadlocks itself with your 613247 branch.
[13:13]  * fullermd waves at vila.
[13:13] <Ddorda> ‎vila: and when i use branch and not checkout only after push it really pushes it, right?
[13:13] <vila> _o/
[13:14] <vila> Ddorda: yup
[13:14] <Ddorda> ‎vila: thanks
[13:14] <Ddorda> ‎:)
[13:14] <vila> Ddorda: 'bzr info' is the best way to understand which branches are involved
[13:15] <Ddorda> ‎yea, that what i did
[13:15] <Ddorda> ‎thanks
=== habnabit is now known as _habnabit
[21:13] <lifeless> mgz: hey
[21:16] <mgz> hey lifeless.
[21:16] <lifeless> when do you think 2.4 will die?
[21:22] <mgz> probably soonish.
[21:24] <lifeless> thanks for your branch/bug
[21:24] <mgz> all systems will ship something newer these days, so it's just a question of how many old machines there are.
[21:26] <mgz> for most python packages, assuming 2.6 or 2.7 is reasonable.
[21:27] <mgz> but likewise, not many actually *depend* on any particular new feature, just get written to the modern syntax and style
[21:29] <lifeless> right
[21:29] <lifeless> testtools explicitly supports 2.4
[21:30] <lifeless> so deps for it (fixtures, scenarios) need to support 2.4, until we decide to raise the minimum
[21:32] <poolie> hi lifeless, mgz, spiv
[21:32] <poolie> i'm going to work offline for a while this morning
[22:10] <peitschie> mornin all :)