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

[Uwe Brauer]

   > Uwe Brauer writes:

   > …

   > 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.

Thanks, so in my understanding it boils down to this,

 hg branch exam

Generated a new head, while

hg bookmark exam

does not, and the only way to deal with bookmark-like branches, is as you described.

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.)

   > 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


Yeah I have heard about it and had a look, looks very promising

Thanks

Uwe