[Bug 5627] New: rebase moves bookmark backwards if it "created no changes to commit"
mercurial-bugs at mercurial-scm.org
mercurial-bugs at mercurial-scm.org
Thu Jul 20 23:03:02 UTC 2017
https://bz.mercurial-scm.org/show_bug.cgi?id=5627
Bug ID: 5627
Summary: rebase moves bookmark backwards if it "created no
changes to commit"
Product: Mercurial
Version: 4.3-rc
Hardware: All
OS: All
Status: UNCONFIRMED
Severity: bug
Priority: wish
Component: rebase
Assignee: bugzilla at mercurial-scm.org
Reporter: arcppzju+hgbug at gmail.com
CC: mercurial-devel at mercurial-scm.org
$ cat >> $HGRCPATH<<EOF
> [extensions]
> rebase=
> drawdag=$TESTDIR/drawdag.py
> EOF
$ hg init
$ hg debugdrawdag<<'EOS'
> B C
> |/
> A
> EOS
$ hg debugdrawdag<<'EOS'
> C
> |
> B
> EOS
$ hg bookmark -r 2 -i BOOK
$ hg log -G -T '{rev} {desc} {bookmarks}'
o 3 C
|
| o 2 C BOOK
| |
o | 1 B
|/
o 0 A
$ hg rebase -r 2 -d 3
rebasing 2:dc0947a82db8 "C" (BOOK)
note: rebase of 2:dc0947a82db8 created no changes to commit
saved backup bundle to
$TESTTMP/.hg/strip-backup/dc0947a82db8-d21b92a4-rebase.hg (glob)
$ hg log -G -T '{rev} {desc} {bookmarks}'
o 2 C
|
o 1 B
|
o 0 A BOOK
Expect: bookmark "BOOK" should be moved to rev 2.
This is a regression introduced by the scmutil.cleanupnodes refactoring. I will
send a fix.
--
You are receiving this mail because:
You are on the CC list for the bug.
More information about the Mercurial-devel
mailing list