[00:03] btw, the bzrlib changes to enforce test isolation break 50 or so lauchpad tests [00:03] keeping up the tradition that it's test infrastructure changes that usually inhibit launchpad's attempts to upgrade bzr [00:03] mwhudson: sorry :) [00:04] mwhudson: OTOH test isolation is pretty important [00:04] yeah [00:04] mwhudson: btw, its saturday [00:04] in fact it's doing a good job of highlighting bits of launchpad that we'd need to fix to allow running the test suite in parallel on one machine [00:04] lifeless: swap day [00:05] ahh i c [00:05] so i should use pull to update the code when ive been working on it? [00:06] without a better description of what [00:06] argh [00:06] ub3rst4r: i think " That's like asking "why do I have to drive downtown?" If you have to go downtown, then you have to because you have to; if you don't, you don't" applies to that question too [00:07] The long answer is "it depends on what you're trying to do". The short one is "If you _can_, yes, probably" [00:08] thanks [00:10] * mwhudson has a hating multiple inheritance moment [00:10] That's no way to honor thy father and thy mother. [00:11] mwhudson: how is it doing that ? [highlighting] [00:12] lifeless: because many (not all) of the isolation violations are where the tests are accessing hard coded paths === keithy_ is now known as keithy [00:21] of course lots of the others are tests that create temporary directories by means other than the test infrastructure === keithy_ is now known as keithy === keithy_ is now known as keithy [00:39] mwhudson: :) === keithy_ is now known as keithy [00:48] I wish I could revision control puzzles - My mom was almost done with one and I knocked it on the floor === keithy_ is now known as keithy [01:13] hi people [01:13] how should I do to work group with bazaar? [01:14] have you read the workflow section of the documentation? [01:16] yes, but i'm not understand everything [01:18] which bits? [01:21] when i change same file and do commit, later sould be make a push [01:22] okey, so perfect here... but later? [01:22] how can i do a merge from other computer [01:22] bzr merge [01:22] bzr commit [01:23] this is all? === keithy_ is now known as keithy === keithy_ is now known as keithy === keithy_ is now known as keithy === keithy_ is now known as keithy === keithy_ is now known as keithy [01:43] https://bugs.edge.launchpad.net/bzr/+bug/464174 is stabbing me in the face :( [01:43] Launchpad bug 464174 in bzr "TestWithMemoryTransport sets $BZR_HOME to a unicode string" [Undecided,New] === keithy_ is now known as keithy [05:59] I'm happy I no longer use clarke [07:52] is there something equivilent to 'bzr revision' (eg, i just want the currentn commit number) [07:53] bzr revno [07:54] fab, thanks a lot :) [11:21] hi [11:21] how do I join two branches with no common ancestor? (and no common files) [11:23] nyu: merge -r 0..-1 [11:23] LarstiQ: what's -1? [11:23] last rev? [11:23] nyu: yes, and 0 is the null revision [11:24] nyu: - indexes from the end, so `bzr log -r -3..-1` would show you the log of the last 3 mainline revisisons [11:25] great, thanks [12:21] The BzrMigration page notes three possibilities for svn to bzr conversion: svn2bzr - two forks thereof, and bzr-svn. Is there guidance on how to choose which to use? [12:23] do you want on-going bidirectional support? [12:24] It's not a hard requirement [12:25] I can arrange for a stop-the-world migration if the end result is better [12:27] maxb: I recommend fast-export-from-svn [12:27] bidirection support with bzr-svn may result in data corruption [12:33] nyu: thankyou that looks promising. [12:48] nyu: oh? [12:57] LarstiQ: I hit this twice [13:29] nyu: More details please? :-) [13:30] maxb: I filed a bug in LP [14:55] hi. i was wondering whether it would be possible / feasible / desirable to integrate trac-bzr-loggerhead together. [14:57] a post commit hook that posts to trac and an apache rewirte rule so that the commit linking to the bzr source viewer ties into loggerhead instead. [23:41] Anyone out there on the "ether"? [23:42] Speifically, is Patrick Regan there? [23:54] OldAl: That would be rubbs. [23:54] jpds: that's right. Sorry for being late. OldAl found me in a private chate [23:55] rubbs: Oh right, sorry. [23:55] jpds: no problem. You didn't know. and I didn't show "publicly" that I found him. [23:57] So there are people in the bzr chat room!