=== uDrunkNow is now known as root [01:15] anyone here know how to do a diff between two completely different bazaar branches on Launchpad? (in the same project) === nekohayo_ is now known as nekohayo [03:46] mwhudson: Thanks for the Loggerhead bug fix. :) [03:47] Peng_: thanks for the report! [03:47] i had a flight today, so nothing better to do... [03:50] :D [03:50] I can never decide, should I reply to the bug report to confirm it was fixed? [03:50] i don't think it's necessary really [03:50] obviously follow up if it's not fixed :) [03:51] Heh. [03:51] (Bugzilla has both "RESOLVED" and "VERIFIED" states. I think it's useful.) [04:20] Is there a set of prereq's of packages that needs to be installed for self-test to work? Is it documented anywhere? [08:07] Ah good, my branch finally made it through PQM. === mark1 is now known as markh [09:56] hey! how can I get a file back? I managed to ruin it in my last commit [10:04] lulzmachine: "bzr revert -r -2 foo.py"? [10:07] thx :) [11:22] Peng_: >:) [12:50] Hi again [12:50] I have a question [12:50] some time ago I've read that bzr can take an action after a commit / push etc [12:50] I cannot find it in docs again ;/ [12:53] pigmej: `bzr help hooks` [12:53] LarstiQ: i need python api for taht [12:53] that* [12:54] I'm almost sure that I read about that in docs / on page etc... [12:55] ok nevermind ;] [12:55] that's it ;) [12:59] pigmej: hmm? [13:00] That's what I need :) [13:00] I forgot english word ( hook ) for that ;) [15:08] Does TortoiseBzr have a simple way to push to remote repositories? [15:08] doesn't it have 'push'? [15:09] I couldn't find it. I'm not on Windows right now. [15:10] Is it in the commit dialog? [15:11] magcius: it's based on qbzr, so you could look at how it does things [15:12] There is qpush, but I couldn't find a menu item for it in TortoiseBzr. [15:13] LarstiQ, http://bazaar-vcs.org/TortoiseBzrContextMenu [15:13] Those are all the items in the context menu right now. I don't see any Push anywhere. [15:16] anyone experiencing issues connecting to Launchpad at the moment? [15:16] smoothice: yes, multiple people are, so it's not you [15:17] magcius: that page isn't really clear to me on how the menus actually look [15:19] LarstiQ: how long as this been going on? [15:19] has* [15:20] smoothice: no idea, couple of people have asked the same question in 1 page of scrollback on #launchpad [15:20] ok, thanks [15:20] we'll wait and see === root is now known as UdontKnow === thunderstruck is now known as gnomefreak [16:56] Bazaar Branch Format 6 (bzr 0.15) [16:56] is there a way to get the branch anyway ? [16:56] It's on a testing server.. I mean I'll not use that branch for commits & push [16:56] Just getting the sources [16:59] Goundy: I'm not sure what the question is. [16:59] LarstiQ well i started: bzr checkout http://bazaar.launchpad........ [16:59] to get my sources on a server am using to test my software [16:59] but it fails and says "Bazaar Branch Format 6 (bzr 0.15)" [17:00] I'm wondering how can I force getting the sources [17:00] that's not an error message [17:00] oh god [17:00] sorry >_< [17:00] I copied the wrong thing [17:00] bzr: ERROR: Unknown branch format: 'Bazaar Branch Format 6 (bzr 0.15)\n' [17:00] LarstiQ here it is :-) [17:01] Goundy: ok, so what version of bzr are you using? [17:01] 0.11 [17:01] ugh [17:01] I can't upgrade it's not my server [17:01] and it's the latest debian package I think [17:01] Goundy: you can run bzr from source though [17:01] LarstiQ run bzr from source ? I don't understand [17:01] Goundy: Debian stable is on 1.5 [17:01] ew [17:01] weird [17:02] Goundy: I really really recommend you use something not as ancient as 0.11 [17:02] LarstiQ well I know but it's just for getting the sources [17:02] and not for doing any commitments & push [17:02] Goundy: wget tarball; tar xzf tarball; cd bzr; ./bzr branch url [17:03] ah [17:03] Goundy: you are using an ancient version of bzr that can't read the (slight lesss ancient) newer format of the branch you're trying to use. [17:03] LarstiQ ok thanks ;) [18:11] hey [18:11] any way to do --stacked where the new branch is usable without the parent branch, provided I don't actually try to access the old stuff? [18:25] luke-jr: no, that's called "shallow branching", and we haven't implemented it yet. [18:38] jelmer: ping [18:38] rocky, pong [18:38] luke-jr, hi [18:38] hi [18:39] jelmer: i haven't done exhaustive testing but my TracBzr branch (bzr1.12-trac0.11.3) seems to work good now... [18:40] rocky, does it use revno's now? [18:40] jelmer: yes [18:40] branch,revno [18:40] luke-jr, any chance you could have a look at bug 326278 ? [18:40] Launchpad bug 326278 in bzr-svn "'bzr log' KeyError" [Undecided,Incomplete] https://launchpad.net/bugs/326278 [18:40] jelmer: the thing is, i haven't tested any of my changes on bzr < 1.12 or trac < 0.11 [18:41] jelmer: there's a good chance that the bzr changes i made will not work on bzr < 1.12 [18:41] rocky, bzr < 1.12 shouldn't be a problem [18:41] rocky, not sure about trac < 0.11 [18:42] jelmer: i suspect it may still work on trac < 0.11 but i haven't tested [18:42] i don't think i did anything that was trac-specific [18:43] s/did/changed/ [18:43] jelmer: maybe when I touch that project again; I don't really feel like working atm :x [18:43] so i don't know what trunk status is... if i should propose merging this first or what [18:43] * rocky hasn't used launchpad much either [18:58] if I have the Branch object and a revision id, how do I get a Revision object for that id? === UdontKnow is now known as [ === [ is now known as UdontKnow [19:16] * SamB wonders if there is a bzr equivalent for "darcs oblitarate" === luke-jr_ is now known as luke-jr [19:27] Good afternoon [19:27] What is the proper etiquette for landing a branch? [19:28] By which I mean, I've been using bzr very lightly, mostly for synchronizing hobby projects between my laptop/desktop/server machines [19:28] the idiom I've been using has been to make a bunch of changes, then push them to the "master" branch on my server [19:29] I recently realized that this was creating a rather odd version history [19:29] since I'd have a dozen changes I made on my laptop, then a dozen changes I made on my desktop, but they weren't organized into merges so I couldn't see in my history view when I'd done a "push" [19:30] The only better way to do things that has occurred to me is to make a local "trunk" branch and a local "working" branch on each machine [19:30] then do "bzr merge ../working" in trunk before I'm ready to push. [19:31] that is a common workflow [19:31] LarstiQ: Is there a way to do that without creating the second branch? [19:31] (you don't need to merge if working is a simple superset of trunk) [19:32] glyph: maybe you'd like to work with a checkout instead? [19:33] LarstiQ: I don't know :) but I don't think so [19:33] A checkout would force me to push after each commit, yes? [19:34] glyph: commit does the work, so you don't have to manually 'push', but yes [19:34] LarstiQ: I feel like a whiteboard would let me explain what I'm after much more easily... let me try to explain a different way [19:34] glyph: unless you supply --local to commit, when you're ready you would then `bzr update` and commit [19:35] glyph: sure [19:36] I encountered this problem a few days ago when the branches on my desktop and laptop diverged. [19:36] On my laptop, I just did 'bzr merge' to pull in all the changes from the server branch, and that worked great, but it took me a while to understand the diff in my working copy [19:38] when I finally resolved the conflicts and committed, the resulting history also confused me, because what I really wanted to say was "bundle up the conflicting changes here and let me re-apply them to trunk" or maybe "let me see what I've changed vs. the server's branch" [19:39] maybe I'm trying to get too complicated here, and just having the second local "trunk" branch makes sense [19:39] at least, I guess that would solve my current problem [19:39] but I'm wondering if there's more to it than that :) [19:40] * LarstiQ doesn't see a clear question to grasp onto [19:40] for example, right now I work in SVN for all my major projects. merging a feature branch in SVN means, unless you're a rocket-scientist, dropping the branch's history before you merge it [19:40] I like bzr because it allows me to keep the branch's history [19:40] LarstiQ: Yes, I apologize :) [19:42] the thing is, if you have a branch in SVN, it basically represents a diff against trunk since the point it diverged. If you've got a feature branch, that's really what you want; something that can be collapsed down to a single diff for easy viewing. I don't understand how to get that diff using bzr. [19:43] glyph: bzr diff -rancestor: [19:44] LarstiQ: oh. [19:44] oh that is so beautiful I could weep. [19:44] glyph: or you could diff two branches with bzr diff --old and --new [19:45] LarstiQ: hang on I'm still trying to appreciate the grandeur of -rancestor: [19:46] ok :) [19:47] glyph: also see `bzr help revisionspec` [19:48] LarstiQ: okay [19:49] LarstiQ: despite the complete incoherence of my question, you've helped a lot :) [19:49] One more thing though [19:49] I have heard certain people talk about a thing called a "merge instruction" [19:49] what's the right way to create one of those [19:49] glyph: merge-directive? `bzr send` [19:50] glyph: but a little more context wouldn't hurt to make sure I get what you mean :) [19:53] ah [19:53] merge *directive* [19:53] LarstiQ: well, let's say I'm working on a project with a guy on AIM [19:54] LarstiQ: I want to send him a pile of changes, but putting them on a web server is problematic (for reasons which are not too interesting) [19:54] and putting them on an SSH server is fraught with configuration peril [19:54] so I'd like to just drag and drop something onto the IM window (which, thanks to lots of work making sure my firewall _always_ does what I want for IM transfers, will actually work) [19:55] glyph: `bzr send` allows you to carry revisions in one file suitable for smtp or IM, so yeah [19:56] glyph: you tell it which branch to use as a basis to determine which revisions to include, and off you go === sdboyer-laptop_ is now known as sdboyer-laptop === sdboyer-laptop is now known as Guest13415 [22:00] does anybody know if somebody has looked at maybe getting bzr-gtk to use Ubuntu's new notify-osd system? [22:01] LaserJock: I know sabdfl did some bzr-gtk / new ubuntu notify related things [22:01] ah, cool [22:01] maybe I'll shoot him an email [22:06] $ bzr revert [22:06] bzr: ERROR: Could not acquire lock "[Errno 11] Resource temporarily unavailable" [22:06] ?? [22:06] how can i know what is unavailable? [22:07] fta: do you have write permissions on that tree? [22:07] fta: (see ~/.bzr.log for the traceback) [22:08] LarstiQ, http://paste.ubuntu.com/127974/ [22:09] sup? [22:10] LarstiQ, i own the full tree, everything is u+rw [22:12] strace shows no attempt to lock or open anything [22:19] fta: does `bzr info -v` say it's locked? [22:20] fta: in which case, either something is holding the lock, or it is stale and you can break it with `bzr break-lock` [22:22] nope, no mention of lock in there [22:23] and break-lock says: bzr: ERROR: The lock for '/data/bot/xulrunner-1.9.2.head.daily.intrepid' is in use and cannot be broken. [22:23] it doesn't mention a lock, yet it is in use? [22:23] * LarstiQ blinks [22:23] fta: lsof? [22:24] ohoh, an old bzr is still there [22:27] LarstiQ, thanks. I killed it. for some reason, a bzr bd was still running after 2 days, doing nothing [22:27] fta: woops [22:28] fta: james_w might be interested in that if you can reproduced it I guess [22:28] i guess so too. I'll keep an eye on my bot