--- a/tests/test-rebase-bookmarks.t Fri Feb 01 15:32:05 2013 -0600
+++ b/tests/test-rebase-bookmarks.t Sun Feb 03 14:26:39 2013 -0800
@@ -127,5 +127,36 @@
|
o 0: 'A' bookmarks:
+rebase --continue with bookmarks present (issue3802)
+
+ $ hg up 2
+ 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
+ $ echo 'C' > c
+ $ hg add c
+ $ hg ci -m 'other C'
+ created new head
+ $ hg up 3
+ 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+ $ hg rebase
+ merging c
+ warning: conflicts during merge.
+ merging c incomplete! (edit conflicts, then use 'hg resolve --mark')
+ abort: unresolved conflicts (see hg resolve, then hg rebase --continue)
+ [255]
+ $ echo 'c' > c
+ $ hg resolve --mark c
+ $ hg rebase --continue
+ saved backup bundle to $TESTTMP/a3/.hg/strip-backup/3d5fa227f4b5-backup.hg (glob)
+ $ hg tglog
+ @ 4: 'C' bookmarks: Y Z
+ |
+ o 3: 'other C' bookmarks:
+ |
+ o 2: 'B' bookmarks: X
+ |
+ o 1: 'D' bookmarks: W
+ |
+ o 0: 'A' bookmarks:
+
$ cd ..