closing named branches

[Idan Kamara]

On Sat, Dec 29, 2012 at 9:32 AM, Christian Widmer <cwidmer at ymail.com> wrote:
>
> i am a bit confused
>
> i have a named feature branch 'foo' which i want to merge into the
> 'default' branch (merges are asymmetric) . i want to stay on 'default' and
> the 'foo' branches should be closed.
>
> a) to stay on default i have to update to 'default' then merge 'foo' and
> commit. if i use --close-branch on the final commit i will close
'default'.
> not really the way to go
>
> b) thus i have to stay on 'foo' and merge 'default' and use --close-branch
> on the final commit. thus 'foo' gets closed but now i actually have merged
> in 'default' into 'foo'. i am on a closed branch. i would have to update
to
> default first.

c) merge foo into default without --close-branch, then
    'hg update foo && hg ci --close-branch -m 'closed'

d) like c) but do the closing before the merge

Picking between c) and d) is a matter of choice, some don't like
the 'dangling' commit after the final merge and prefer d).

>
> am i wrong to say that what it try to accomplish is an exotic use case or
> is there another/better way to do this with named branches?
>
> thanks
>
> _______________________________________________
> Mercurial mailing list
> Mercurial at selenic.com
> http://selenic.com/mailman/listinfo/mercurial
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.mercurial-scm.org/pipermail/mercurial/attachments/20121229/cb172664/attachment-0002.html>