[PATCH 6 of 6] merge: add hints to use update in cases involving bookmarks

[Kevin Bullock]

On Dec 7, 2011, at 12:23 PM, Idan Kamara wrote:

> On Wed, Dec 7, 2011 at 7:40 PM, Kevin Bullock <kbullock+mercurial at ringworld.org> wrote:
> # HG changeset patch
> # User Kevin Bullock <kbullock at ringworld.org>
> # Date 1323278602 21600
> # Node ID fede3899ee6ebb337328dbc67f7b060f95d97afc
> # Parent  6bab2e0693916ee9160f41dc9fe52b9d7304de54
> merge: add hints to use update in cases involving bookmarks
> 
> pull probably needs to suggest update -B too.

Maybe so, only in the case where there's an active bookmark that isn't moved by the pull _and_ descendants of the current parent are pulled.

pacem in terris / мир / शान्ति / ‎‫سَلاَم‬ / 平和
Kevin R. Bullock

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://selenic.com/pipermail/mercurial-devel/attachments/20111207/7335fb10/attachment.html>