Re: Redundant distro branches

2015-08-26 Thread Daniel van Vugt
There's no maintaining that needs to be saved, only potential confusion. I'm just trying to make the process a bit simpler and clearer wherever possible. Admittedly I chose the name lp:mir/ubuntu a while back and now it's apparent there's a potential for confusion in that name it's reasonable

Re: Redundant distro branches

2015-08-26 Thread Michał Sawicz
W dniu 26.08.2015 o 03:50, Daniel van Vugt pisze: > Wait a sec, is there really "going to be trouble"? > > I am reminded that the landing on the train branch (lp:mir/ubuntu) is > always the _last_ thing to happen by far. lp:ubuntu/mir and > lp:ubuntu/wily-proposed/mir as well as the archive itself

Re: Redundant distro branches

2015-08-25 Thread Daniel van Vugt
Wait a sec, is there really "going to be trouble"? I am reminded that the landing on the train branch (lp:mir/ubuntu) is always the _last_ thing to happen by far. lp:ubuntu/mir and lp:ubuntu/wily-proposed/mir as well as the archive itself with shiny new debs all get updated around a DAY earlie

Re: Redundant distro branches

2015-08-25 Thread Alberto Aguirre
That's what the merge proposal is used for! :) ci-train takes the MP, creates a source package from it, uploads it to the assigned PPA. On Tue, Aug 25, 2015 at 9:50 AM, Alan Griffiths < alan.griffi...@canonical.com> wrote: > On 25/08/15 15:17, Michał Sawicz wrote: > > Not necessarily true, you

Re: Redundant distro branches

2015-08-25 Thread Alan Griffiths
On 25/08/15 15:17, Michał Sawicz wrote: > Not necessarily true, you can just build a source package locally and > upload it to the train PPA. It's just more manual labour this way. And > that's how it deals with projects outside of LP. That sounds like something that could easily be automated to t

Re: Redundant distro branches

2015-08-25 Thread Michał Sawicz
W dniu 25.08.2015 o 05:13, Alberto Aguirre pisze: > The CI train also requires a merge proposal. Not necessarily true, you can just build a source package locally and upload it to the train PPA. It's just more manual labour this way. And that's how it deals with projects outside of LP. -- Michał

Re: Redundant distro branches

2015-08-25 Thread Alan Griffiths
On 25/08/15 04:13, Alberto Aguirre wrote: > The CI train also requires a merge proposal. How does it handle projects that are hosted outside of launchpad? -- Mir-devel mailing list Mir-devel@lists.ubuntu.com Modify settings or unsubscribe at: https://lists.ubuntu.com/mailman/listinfo/mir-devel

Re: Redundant distro branches

2015-08-24 Thread Daniel van Vugt
Thanks. I feared that, and was waiting for someone like you to confirm it. So Mir's ubuntu branch messiness is all to support the train... On 25/08/15 11:13, Alberto Aguirre wrote: The CI train also requires a merge proposal. On Aug 24, 2015, at 8:37 PM, Daniel van Vugt wrote: OK, so the

Re: Redundant distro branches

2015-08-24 Thread Alberto Aguirre
The CI train also requires a merge proposal. > On Aug 24, 2015, at 8:37 PM, Daniel van Vugt > wrote: > > OK, so the redundant distro branches have a reason: The train. Although we > could improve that slightly by renaming it to something train related instead > of the misleading lp:mir/ubuntu

Re: Redundant distro branches

2015-08-24 Thread Daniel van Vugt
OK, so the redundant distro branches have a reason: The train. Although we could improve that slightly by renaming it to something train related instead of the misleading lp:mir/ubuntu. But there's a better option again... Another apparently unnecessary part of the process is the merge proposa

Re: Redundant distro branches

2015-08-24 Thread Alan Griffiths
On 24/08/15 10:34, Stephen M. Webb wrote: > The problem is the dataflow. > > The ci-train assumes an "upstream" repo (here, it's lp:mir/ubuntu) > into which it merges the target branches. It builds source debs, > which then get uploaded to the -proposed pocket of the archive, which > then migrates

Re: Redundant distro branches

2015-08-24 Thread Stephen M. Webb
On Mon, Aug 24, 2015 at 4:17 AM, Daniel van Vugt wrote: > I'm kind of saying we should stop using: >lp:mir/ubuntu > and instead use: >lp:ubuntu/mir > > However that's not quite correct. You should target proposed first, so > actually we would target: >lp:ubuntu/wily-proposed/mir The p

Re: Redundant distro branches

2015-08-24 Thread Daniel van Vugt
I'm kind of saying we should stop using: lp:mir/ubuntu and instead use: lp:ubuntu/mir However that's not quite correct. You should target proposed first, so actually we would target: lp:ubuntu/wily-proposed/mir I can only imagine we're using lp:mir/ubuntu for one of two reasons: *

Re: Redundant distro branches

2015-08-24 Thread Alan Griffiths
On 24/08/15 08:45, Daniel van Vugt wrote: > We've been using this as our distro branch for a while, but actually > the distro does not use it: >https://code.launchpad.net/~mir-team/mir/ubuntu > > Why don't we just target future releases to the actual ubuntu > (proposed) branch instead? >htt