[issue2277] bookmark moves on rebase with track.current

[Jed Brown]

New submission from Jed Brown <jed at 59A2.org>:

In the following scenario, the destination bookmark moves upon rebase.  I 
would like x=c6d7 after rebasing y=46bc to produce y=1d45.  This would be 
consistent with the track.current option which I have enabled.

$ hg init; echo a > foo; hg add foo; hg commit -m +foo
$ hg book x; hg book y; echo b >> foo; hg commit -m b
$ hg update x; echo c >> foo; hg commit -m c; hg glog
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
created new head
@  changeset:   2:c6d72fa6916f
|  tag:         tip
|  tag:         x
|  parent:      0:7d9c08f4e648
|  user:        Jed Brown <jed at 59A2.org>
|  date:        Fri Jul 09 01:05:18 2010 +0200
|  summary:     c
|
| o  changeset:   1:46bc8d99e1f3
|/   tag:         y
|    user:        Jed Brown <jed at 59A2.org>
|    date:        Fri Jul 09 01:05:14 2010 +0200
|    summary:     b
|
o  changeset:   0:7d9c08f4e648
   user:        Jed Brown <jed at 59A2.org>
   date:        Fri Jul 09 01:05:10 2010 +0200
   summary:     +foo

$ hg rebase -s y -d x; sed -i '/^[<=>].*/d' foo; hg resolve -m foo; hg 
rebase --continue; hg glog
merging foo
warning: conflicts during merge.
merging foo failed!
abort: fix unresolved conflicts with hg resolve then run hg rebase --
continue
saved backup bundle to /tmp/c/.hg/strip-backup/46bc8d99e1f3-backup.hg
@  changeset:   2:1d45d4843b59
|  tag:         tip
|  tag:         x
|  tag:         y
|  user:        Jed Brown <jed at 59A2.org>
|  date:        Fri Jul 09 01:05:14 2010 +0200
|  summary:     b
|
o  changeset:   1:c6d72fa6916f
|  user:        Jed Brown <jed at 59A2.org>
|  date:        Fri Jul 09 01:05:18 2010 +0200
|  summary:     c
|
o  changeset:   0:7d9c08f4e648
   user:        Jed Brown <jed at 59A2.org>
   date:        Fri Jul 09 01:05:10 2010 +0200
   summary:     +foo

----------
messages: 13050
nosy: jedbrown
priority: bug
status: unread
title: bookmark moves on rebase with track.current

____________________________________________________
Mercurial issue tracker <bugs at mercurial.selenic.com>
<http://mercurial.selenic.com/bts/issue2277>
____________________________________________________