=== verterok` is now known as verterok
[03:30] <FourDollars> Hi, any update for lp:ubuntu/precise/totem ?
=== r0bby_ is now known as robbyoconnor
[07:20] <mgz> er, and morning all
[07:30] <lifeless> o/
[08:47] <mgz> jam: so, what exactly is the status of handing the package importer over to l-osas?
[08:48] <mgz> vincent did give a nice summary I seem to recall, but I now can't find it
[08:59] <jam> mgz: a reasonable question, and I don't have a quick answer. AIUI one of the key bits to consider it transfered, is that we should not be directly connecting to jubany, even if it means we have to 'chopstick' debug (have them do something, give us the result, tell them what to do next)
[09:01] <jam> mgz: the last sentence in your email doesn't make sense to me. I think you are missing a verb or something. "(I wonder if they'd find it useful)" perhaps?
[09:03] <mgz> ...not even read-only? admittedly the habit of poking code locally on jubany needs to die, but there are a lot of logs and things that the web interface doesn't expose
[09:03] <mgz> and requeuing packages is all done manually at the moment...
[09:17] <jam> mgz: correct, we should not ssh into jubany, if we need a query run, we should ask them to run it.
[09:17] <jam> just like for lp
[09:19] <mgz> so, do have a list of stuff that needs doing apart from taking away our keys? the docs in branch are at least mostly updated for the chroot, and we could just get l-osas to do deployments and user requests for us
[09:20] <mgz> the length of time a deployment takes is a bit painful, as stopping the package importer when it's got firefox or something in the queue isn't quick.
=== yofel_ is now known as yofel
[12:03] <idnar> is there an easier way than "bzr log -r-1 --show-ids" to get the tip revision-id?
[12:04] <jelmer> idnar, bzr revision-info
[12:04] <idnar> aha! thanks
=== Guest81255 is now known as jpds
[15:12] <jelmer> mgz, icanhasreview?
[15:12] <jelmer> mgz: I was wondering if you had a moment to look at https://code.launchpad.net/~jelmer/bzr-stats/no-get-ancestry/+merge/121017?
[15:14]  * mgz goeshaslook
[15:15] <mgz> ah, bzr-stats, I don't get lp mail about plugin mps
[15:21] <jelmer> the test coverage isn't great, but previously this code was completely broken
[15:22] <mgz> ...I didn't even type my "t...t...t...test case?" line
[15:22] <mgz> which I had sitting in the buffer here for the last five minutes
[15:22]  * jelmer can read minds
[15:22] <jelmer> or maybe you're just predictable ;-)
[15:23] <mgz> :)
[15:23] <mgz> code looks good, only the middle one is actually doing anything different, right?
[15:27] <jelmer> mgz: yep, should be more efficient now
[17:28] <dashua> I'm a little rusty on merges.  Once my branch is approved, what is the command to merge into trunk?
[17:35] <wgz> dashua: generally just, if you have a copy of trunk locally adjacent to your featur branch, `bzr merge ../feature` then `bzr push`
[17:35] <wgz> some projects have fancy means of landing things with robots rather than manually though
[17:36] <dashua> wgz, Ok thanks, I thought I was doing it right, but on LP the commit message usually defaults to Merge branch lp:foo
[17:36] <dashua> It's not displaying a merged message
[17:37] <wgz> er.. I missed the "commit" after merging, that's the message that will be shown
[17:37] <wgz> the commit message in the merge proposal is for robot use, or as a hint if someone else merges your change to trunk for you
[17:38] <dashua> wgz, Ok great, then LP defaults to the merged branch commit message where it links the branch and corresponding bug report?
[17:38] <dashua> Ah ok
[17:44] <dashua> wgz, http://img6.imagebanana.com/img/q44d8lwz/Selection_007.png
[17:44] <dashua> That type of message is the one I'm missing
[17:45] <dashua> Merged branch and the link to the bug report
[17:57] <elmo> hi
[17:57] <elmo> Uncommit these revisions? ([y]es, [n]o): yes
[17:57] <elmo> bzr: ERROR: An inconsistent delta was supplied involving 'update-motd.d/00-header', '00header-20120816152510-yb60cvekto41dgii-914'
[17:58]  * kirkland waves at elmo, and then ducks and covers
[18:00] <vinmassaro> anyone know how to fix this under mac os 10.8.1? https://gist.github.com/35790586370836aae395
[18:17] <wgz> elmo: probably bug 910002
[18:17] <ubot5> Launchpad bug 910002 in Bazaar "uncommitting a dir rename causes InconsistentDelta error" [High,Confirmed] https://launchpad.net/bugs/910002
[18:18] <elmo> wgz: aha, damn it
[18:18] <elmo> wgz: I'm even already subscribed to that!
[18:18] <elmo> wgz: thanks
[18:19] <wgz> I need some spare weekends to work on bzr bugs :)
[18:23] <wgz> vinmassaro: you may need to file a bug against bzr-mac-installers, or post more details to the mailing list
[18:23] <wgz> none of these look directly like your issue: <https://bugs.launchpad.net/bzr-mac-installers/+bugs?field.searchtext=subvertpy>
[19:39] <sixstring> I'm having trouble pulling changes from an upstream trunk into my local branch. I do "bzr pull lp:upstream-trunk" and it does stuff. However, when I do "bzr merge", it says "Nothing to do." Now, my "parent" branch is not "lp:upstream-trunk". Does that matter? If so, why? And how do I fix it?
[19:39] <sixstring> BTW, hello #bzr! :)
[19:39]  * sixstring has a virtual donut for the right answer.
[19:48] <fullermd> Well, if merge is going from lp:upstream-trunk, of course it'll have nothing to do after you've just pulled from there.
[19:48] <sixstring> fullermd, i don't understand your answer, but i'll give you credit for answering.
[19:49]  * sixstring tosses fullermd a healthy virtual jelly donut.
[19:50] <fullermd> Is that a donut that's healthy because it has virtual jelly, or a jelly donut that's virtually healthy?
[19:51] <fullermd> Where's it trying to merge from, when you run the argless `merge` (assuming that's what you actually did)?
[20:47] <sixstring> fullermd, it's as healthy as you can imagine :)
=== zyga_ is now known as zyga
=== r0bby_ is now known as robbyoconnor