[PATCH 2 of 2] bookmarks: on a bare merge use config to choose target or choose @

[Jordi Gutiérrez Hermoso]

On Wed, 2014-03-12 at 20:27 +1100, Stephen Lee wrote:

> In a non-bookmark workflow, the new logic only triggers if you have an
> active bookmark and an @ bookmark (which should be rare in a
> non-bookmark workflow).

It seems to me that you're failing to account the situation of both
bookmarks and named branches being used intentionally, which is a
common thing to do with Mercurial (named branches aren't anathema).
When on a named branch, `hg update` keeps you on that branch and moves
you to it head, if unique. I think this is what mpm is complaining
about, what if you're on the stable named branch with no active
bookmark?

- Jordi G. H.