[01:00] remerge --weave is quite exciting ;) [01:06] haha [01:21] so what's the latest on bzr and colocated branches? is bzr-colo still the thing to use? [01:25] probably [01:41] idnar: yeah, the support for colocated branches in bzr core was never finished [02:08] :( === mmrazik is now known as mmrazik|otp === mmrazik|otp is now known as mmrazik === mmrazik is now known as mmrazik|otp === mmrazik|otp is now known as mmrazik [10:33] Hi all, sorry for jumping in with a quick question: is there a way to push to a remote repo some local commits which is not a commit? (e.g. some form of push) Thanks! [10:41] kinkie: that doesn't make sense to me, what exactly are you trying to achieve? === mmrazik is now known as mmrazik|lunch [10:56] My main mode of developing is via a remote repo with local checkouts as I work in parallel on different systems. But sometimes I'm disconnected; in that case I favor to do local commits which I'd like to push when the main repo is available to me again [10:57] I can do it with a regular commit, but that's sometimes inconvenient. I'm just wondering if there's a way to push the local commits or to replay them somehow [10:58] have to go now, will read later [10:58] kinkie: you can just push local commits as they are when you reconnect [11:01] ah, I see, you need a commit without --local for that to happen [11:02] No, you can just push, assuming there's no divergeance. [11:02] You're off in the hairy corners of the boundbreckout mess of course. === mmrazik is now known as mmrazik|lunch === mmrazik|lunch is now known as mmrazik [11:47] fullermd: thanks, that's what I was looking for === mmrazik is now known as mmrazik|afk === mmrazik|afk is now known as mmrazik [14:35] hey [14:36] I tried to distro-patch bzr on raring [14:36] hi didrocks [14:36] adding the support for lp-propose to include the latest commit [14:36] however, it FTBFS (I built it on quantal :/) [14:36] hey jelmer! how are you? :) [14:36] https://launchpadlibrarian.net/123701411/buildlog_ubuntu-raring-i386.bzr_2.6.0~beta2-0ubuntu2_FAILEDTOBUILD.txt.gz [14:37] didrocks: I'm well thanks, hope you are too [14:37] it seems some obscure doc tool I don't know about :) [14:37] jelmer: yeah, quite busy, but good! :) [14:37] didrocks: I patched this for the Debian package, IIRC newer versions of python-docutils are slightly stricter [14:38] interesting [14:38] should I just steal your patch from Debian? [14:38] didrocks: see -r6570 of lp:bzr [14:38] jelmer: thanks a lot! you save more a bunch of time :) [15:31] how can I see what properties a revision has? [15:32] from the cmd line, idieally === hasselmm is now known as hasselmm|afk [16:07] jml: bzr cat-revision, though that will spit out the raw form [16:11] jelmer: thanks. [16:49] jam: how do I actually use meliae? [16:50] oh hey, I found this: http://jam-bazaar.blogspot.co.uk/2009/11/memory-debugging-with-meliae.html [16:53] yeah, that's helpful, really you still need to have a reasonable idea of the layout of things to understand what the dumps mean [17:28] hmm. [17:28] is there a visualizer for meliae output? [17:43] hmrmrmmm [17:43] oh, right. [19:44] jml: runsnakerun