[issue2894] updating to a descendant of the current bookmark doesn't move it
Idan Kamara
bugs at mercurial.selenic.com
Mon Jul 11 10:47:38 CDT 2011
New submission from Idan Kamara <idankk86 at gmail.com>:
$ hg init
$ echo a >> a
$ hg ci -Aqm.
$ echo a >> a
$ hg ci -Aqm.
$ hg bookmark B
$ hg bookmark A -r 0
$ hg bookmarks
A 0:e8b3896ff7e8
* B 1:bd4a62848466
$ hg upd A
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg merge B
abort: nothing to merge (use 'hg update' or check 'hg heads')
The error is expected, so the user goes ahead and does 'hg update', but A is
still on 0, and the only option is to 'hg bookmark -f A', unless I missed
something.
You can think of A being a 'main' bookmark, and B being a 'feature'
bookmark. The scenario above happens when 'feature' is finished and should
be merged into 'main'.
(credit to this stackoverflow question http://ln-s.net/8zBh)
----------
messages: 16782
nosy: idank
priority: bug
status: unread
title: updating to a descendant of the current bookmark doesn't move it
____________________________________________________
Mercurial issue tracker <bugs at mercurial.selenic.com>
<http://mercurial.selenic.com/bts/issue2894>
____________________________________________________
More information about the Mercurial-devel
mailing list