push aborts for new branch even if no heads

CG Linden cg at lindenlab.com
Thu Nov 12 13:40:17 CST 2009


Here is our "user story" for heads and closed branches.

One of our projects uses this model:

   - Developers pull/push into a trunk branch
   - Team lead cherrypicks using the transplant extension into a release
   branch, from which the release is eventually made.
   - The release branch is not intended to be merged back into trunk.
   Emergency patches and bug fixes would be made to the release branch and then
   transplanted back into trunk.

Now I realize this is not necessarily an orthodox process, but it does fit
our use case well, and I need it to work with mercurial.

I am therefore very interested in seeing "closed branches" work and help me
to implement the process:

   - Closed branches should be pushable with no flag at all, and not affect
   "tip" unless "tip" happens to be on the closed branch.
   - Updating to a closed branch should require some sort of "reopen" flag.

My ideal post release process should be "tag, close, push". This would be
after QA ok's the build done on the tip of the soon to be closed branch, and
that build be the released build.
--
cg



On Thu, Nov 12, 2009 at 11:18 AM, Dirkjan Ochtman <dirkjan at ochtman.nl>wrote:

> On Thu, Nov 12, 2009 at 20:04, Henrik Stuart <hg at hstuart.dk> wrote:
> > When pushing, the existence of new remote heads is determined on a named
> > branch basis, so you are, in effect, creating a new remote head for the
> > branch t (even if it is merged into another branch it is still a branch
> > head), thus you'll require --force.
>
> Though if you --close-branch, then merge, it should still work, right?
>
> (I still hold the position that we should change branch closing to
> only be allowed in merges.)
>
> Cheers,
>
> Dirkjan
> _______________________________________________
> Mercurial-devel mailing list
> Mercurial-devel at selenic.com
> http://selenic.com/mailman/listinfo/mercurial-devel
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://selenic.com/pipermail/mercurial-devel/attachments/20091112/fdb7fbd0/attachment.htm>


More information about the Mercurial-devel mailing list