--- a/tests/test-evolve.t Wed May 21 12:01:28 2014 -0700
+++ b/tests/test-evolve.t Mon Jun 02 15:22:23 2014 -0700
@@ -518,6 +518,7 @@
7:a5bfd90a2f29 stable
$ echo 3 > 1
$ hg resolve -m 1
+ no more unresolved files
$ hg graft --continue -O
grafting revision 7
$ glog --hidden
--- a/tests/test-prev-next.t Wed May 21 12:01:28 2014 -0700
+++ b/tests/test-prev-next.t Mon Jun 02 15:22:23 2014 -0700
@@ -48,6 +48,7 @@
no-move 2:4e26ef31f919
$ hg up 1
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
+ (leaving bookmark mark)
$ hg next
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
[2] added c
--- a/tests/test-prune.t Wed May 21 12:01:28 2014 -0700
+++ b/tests/test-prune.t Mon Jun 02 15:22:23 2014 -0700
@@ -41,6 +41,7 @@
$ hg prune --user blah --date '1979-12-15' .
1 changesets pruned
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
+ (leaving bookmark BABAR)
working directory now at 47d2a3944de8
$ hg debugobsolete
9d206ffc875e1bc304590549be293be36821e66c 0 {'date': '314064000 0', ('p1': '47d2a3944de8b013de3be9578e8e344ea2e6c097', )?'user': 'blah'} (re)
@@ -236,6 +237,7 @@
$ hg bookmark -r 'c' 'delete'
$ hg up -C todelete
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
+ (activating bookmark todelete)
$ hg prune -B nostrip
bookmark 'nostrip' deleted
abort: nothing to prune
@@ -244,6 +246,7 @@
$ hg prune -B todelete
1 changesets pruned
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
+ (leaving bookmark todelete)
working directory now at d62d843c9a01
bookmark 'todelete' deleted
$ hg id -ir dcbb326fdec2
--- a/tests/test-stabilize-conflict.t Wed May 21 12:01:28 2014 -0700
+++ b/tests/test-stabilize-conflict.t Mon Jun 02 15:22:23 2014 -0700
@@ -164,6 +164,7 @@
reverting babar
$ safesed 's/dix/ten/' babar
$ hg resolve --all -m
+ no more unresolved files
$ hg evolve --continue
grafting revision 5
$ hg resolve -l
--- a/tests/test-stabilize-result.t Wed May 21 12:01:28 2014 -0700
+++ b/tests/test-stabilize-result.t Mon Jun 02 15:22:23 2014 -0700
@@ -25,6 +25,7 @@
$ hg bookmark changea
$ hg up 1
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+ (leaving bookmark changea)
$ echo a >> a
$ hg amend -m changea
1 new unstable changesets
@@ -94,6 +95,7 @@
abort: unresolved merge conflicts (see hg help resolve)
[255]
$ hg resolve -m a
+ no more unresolved files
$ hg evolve --continue
grafting revision 5
--- a/tests/test-uncommit.t Wed May 21 12:01:28 2014 -0700
+++ b/tests/test-uncommit.t Mon Jun 02 15:22:23 2014 -0700
@@ -238,6 +238,7 @@
$ hg up -C 3 --hidden
8 files updated, 0 files merged, 1 files removed, 0 files unresolved
+ (leaving bookmark touncommit-bm)
working directory parent is obsolete!
$ hg --config extensions.purge= purge
$ hg uncommit -I 'set:added() and e'