← Back to team overview

nova team mailing list archive

Re: Launchpad and reuse of feature branches


On 07/28/2010 05:39 PM, Ewan Mellor wrote:
> As a matter of policy, once a branch has been merged into trunk, is it
> acceptable to continue to submit code into that branch, with the intention
> to perform a second review+merge later?

Totally. I do this all the time.

> For example, I have a branch called nova/xenapi, adding Xen support to Nova.
> Some major refactoring has now been merged, but the feature will need further
> work before it's done.  Should I push that work to nova/xenapi (in which case,
> what happens with the workflow on Launchpad?) or should I create a new
> branch called nova/xenapi-a-bit-more?

At that point, just go to your branch on launchpad and submit for merge
again. Merge proposals themselves are individual objects, so you have
have many props per branch.

> My instinct is to keep using the nova/xenapi branch (i.e. treat them like
> we treat patch queues elsewhere) but I can imagine places where that would
> look odd on Launchpad.
> I have no preference -- I'm just looking for a policy decision from you guys.

Go with your instinct here. Should be fine.