elmentary (watson): merge (named) branches and/or bookmarks

[Arne Babenhauserheide]

Uwe Brauer writes:

> hg init
> hg bookmark master
> hg commit -m feature1
> hg bookmark exam
> hg commit -m exam
> hg update master
> hg merge exam
…
> Sigh what is the problem here?

The problem here is that exam is a child of master. You can simply
hg update exam
hg boo master -f

Essentially you have linear development so there’s nothing to merge and
the master bookmark is just a pointer to a non-head commit.

This is not optimal, because it requires some knowledge of the history,
but cannot be fixed without breaking backwards compatibility.

There’s work underway to fix this cleanly, but that’s not yet done. For
the current plan see https://www.mercurial-scm.org/wiki/TopicPlan

Best wishes,
Arne
-- 
Unpolitisch sein
heißt politisch sein
ohne es zu merken
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 800 bytes
Desc: not available
URL: <http://lists.mercurial-scm.org/pipermail/mercurial/attachments/20161217/393c337c/attachment.asc>