--- a/tests/test-rebase-bookmarks.t Fri Jun 29 00:01:19 2012 +0200
+++ b/tests/test-rebase-bookmarks.t Fri Jun 29 00:40:52 2012 -0500
@@ -36,8 +36,10 @@
adding d
created new head
+ $ hg book W
+
$ hg tglog
- @ 3: 'D' bookmarks:
+ @ 3: 'D' bookmarks: W
|
| o 2: 'C' bookmarks: Y Z
| |
@@ -60,7 +62,7 @@
$ hg tglog
@ 3: 'C' bookmarks: Y Z
|
- o 2: 'D' bookmarks:
+ o 2: 'D' bookmarks: W
|
| o 1: 'B' bookmarks: X
|/
@@ -82,7 +84,28 @@
|
o 2: 'B' bookmarks: X
|
- o 1: 'D' bookmarks:
+ o 1: 'D' bookmarks: W
+ |
+ o 0: 'A' bookmarks:
+
+
+Keep active bookmark on the correct changeset
+
+ $ cd ..
+ $ hg clone -q a a3
+
+ $ cd a3
+ $ hg up -q X
+
+ $ hg rebase -d W
+ saved backup bundle to $TESTTMP/a3/.hg/strip-backup/*-backup.hg (glob)
+
+ $ hg tglog
+ @ 3: 'C' bookmarks: Y Z
+ |
+ o 2: 'B' bookmarks: X
+ |
+ o 1: 'D' bookmarks: W
|
o 0: 'A' bookmarks: