[PATCH 0 of 6] improve help and hints, then add 'update --bookmark'

[Idan Kamara]

On Wed, Dec 7, 2011 at 7:40 PM, Kevin Bullock <
kbullock+mercurial at ringworld.org> wrote:

> The first two patches fix up some of the checking that merge does, and
> makes
> its abort messages more consistent.
>
> The third patch improves wording of bookmarks help.
>
> The remaining three add a -B/--bookmark switch to the update command, to
> provide a way to move the active bookmark forward along with the working
> directory. This provides an equivalent to Git's concept of "fast-forward
> merge", and is useful for those who use bookmarks for lightweight feature
> branches.
>
> The -B switch is only necessary when you have an active bookmark that is
> not
> at a branch tip. This can happen for example when you pull changes and
> either
> (1) your bookmark is only local; or (2) the pull doesn't move the bookmark,
> possibly because a different bookmark is tracking the upstream changes.


I'm curious if a flag is really needed here.

Why would you not want to move the *active* bookmark when updating to a
descendant? When opening issue2894 this is the behavior I expected, others
disagreed but I didn't understand the use cases in which this is undesired.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://selenic.com/pipermail/mercurial-devel/attachments/20111207/8756461d/attachment.html>