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

[Arne Babenhauserheide]

Uwe Brauer writes:

> Sigh, for me this is another reason to concentrate on named branches,
> since they behave much more as I expect them to behave. (Besides the
> evolve extension makes named branches much more flexible.)

Same for me. And I wish I could tell hg-git to use named branches — but
I know that this doesn’t work.

The trouble you run into is what git calls fast-forward merge, by the
way. It’s not an actual merge, just a pointer movement.

Maybe we could tell hg merge <bookmark-on-a-child> to simply
fast-forward, too. It’s what the user requested with "hg merge" (make A
part of B), though it’s not what merge actually does with the history.

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/20161218/39260633/attachment.asc>