[10:21] <mgz> is there any way to mark a merge proposal as superseding another retroactively?
[10:22] <mgz> the only other option seems to be to mark it as rejected, which is a little confusing in the record
[10:22] <mgz> story:
[10:22] <mgz> contributor makes change against lp:bzr and creates mp
[10:24] <mgz> suggested to retarget against lp:bzr/2.5 instead
[10:24] <mgz> so, new branch and mp created, both in the list as needing review
[10:35] <czajkowski> mgz: not sure I'll find out and let you know
[10:54] <wgrant> Morning mgz.
[10:54] <wgrant> mgz: I don't think you can.
[10:54] <wgrant> Rejecting it is probably the best here.
[10:55] <czajkowski> wgrant: thank you
[10:56] <mgz> thanks
[11:57] <pfarrell> hi
[11:57] <pfarrell> is something wrong with proposing merges?
[11:57] <pfarrell> I am trying to propose a merge of my branch
[11:57] <pfarrell> and when I click propose merge, I just get the spinning waiting logo beside the button
[11:57] <pfarrell> but nothing actually happens
[11:58]  * pfarrell has to run to a meeting, sorry
[13:03] <Pikkachu> isn't it possible to import only a subdirectory or file from an external branch?
[13:03] <Pikkachu> why aren't branches with the same url shared among all users given they're the same stuff and unchangeable?
[13:04] <Pikkachu> also, can I merge from a specific file only? I wanted myfork/file.c and merge from hg-imported/lots-of-irrelevant/but/here/file.c
[13:09] <jelmer> hi Pikkachu
[13:09] <jelmer> Pikkachu: "bzr merge" should allow you to merge in a single file or subdirectory from another branch
[13:10] <jelmer> it will bring across all of the history of the other branch though
[13:19] <Pikkachu> all of the history? you mean metadata, like I will only notice that single file but everything is stored in the back?
[13:19] <Pikkachu> if so that helps already for simplicity
[13:20] <jelmer> Pikkachu: yes
[13:34] <Pikkachu> ah ok
[14:03] <savvas> Any other suggestions/patches to try for bug #942994 ?
[14:07] <Pikkachu> jelmer: I think I'll use this http://i.imgur.com/5aL3C.png
[14:09] <jelmer> Pikkachu: seems reasonable
[14:09] <Pikkachu> thanks
[15:44] <kirkland> flacoste: hiya!  we're still hoping for private blueprints in LP asap...any update on a target date for that feature being delivered?
[15:58] <Adri2000> would it be a good idea if the package view (distro/+source/package) showed the vcs infos from the package?
[16:29] <Adri2000> well I filed a bug
[16:49] <danilos> czajkowski, hi, I wonder if you can help me get rid of wrong packaging links in Launchpad: https://launchpad.net/linaro/+packages?
[16:49] <czajkowski> danilos: which ones?
[16:49] <danilos> czajkowski, all of them
[16:50] <danilos> czajkowski, "linaro" is a meta project and should not be linked to any source packages (or we end up with weird pages like https://answers.launchpad.net/linaro)
[16:52] <czajkowski> danilos: so you want under the 11.05 series linux-linaro-mx51   all 3 removed?
[16:52] <danilos> czajkowski, yes
[16:52] <czajkowski> danilos: done
[16:53] <danilos> czajkowski, excellent, thanks a lot for the quick response!
[16:53] <czajkowski> danilos: np
[16:53] <czajkowski> danilos: if you find any more just shout
[16:53] <danilos> czajkowski, will do, ta
[17:10] <kuuko> I'm importing translations for my launchpad project, so I would like to have clarification on the relevant guide: It says that I must have the template file in it's own directory, template1/template1.pot; Does it mean that the directory must be named after the template file or can I use any directory name like locale or po?
[17:39] <wilx> Hi. How fast do changes to Launchpad make it to production on the servers?
[17:43] <rick_h_> wilx: depends. Once a change submitted, tested, etc, it's usually live within a couple of days
[17:43] <wilx> Ok.
[17:55] <lifeless_> wilx: Once its qa'd, it can be deployed within an hour if needed; we try to deploy as often as we can to keep the change size low - reduces risk of making the change
[17:56] <wilx> Ok.
[17:56] <wilx> That's cool. I sort of feared the answer would be few weeks. :)
[17:57] <lifeless> wilx: the only thing which needs a significant delay is schema patches and thats because they take downtime to deploy; we have a window around 0800UTC daily to deploy them
[19:03] <dobey> ok, https://launchpad.net/~ubuntu-docs is definitely not what i was expecting to see there :)
[22:41] <cnd> I remember git in lp being on the roadmap a few months ago
[22:41] <cnd> is that still planned?