tests/test-strip.t
changeset 21847 f6f122f4813b
parent 21503 10f15e34d86c
child 21854 ba3bc6474bbf
--- a/tests/test-strip.t	Thu Jun 12 18:02:23 2014 -0700
+++ b/tests/test-strip.t	Tue Jul 08 16:24:23 2014 -0700
@@ -496,9 +496,9 @@
   abort: empty revision set
   [255]
   $ hg strip -B todelete
-  bookmark 'todelete' deleted
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   saved backup bundle to $TESTTMP/bookmarks/.hg/strip-backup/*-backup.hg (glob)
+  bookmark 'todelete' deleted
   $ hg id -ir dcbb326fdec2
   abort: unknown revision 'dcbb326fdec2'!
   [255]
@@ -508,10 +508,20 @@
      B                         9:ff43616e5d0f
      delete                    6:2702dd0c91e7
   $ hg strip -B delete
+  saved backup bundle to $TESTTMP/bookmarks/.hg/strip-backup/*-backup.hg (glob)
   bookmark 'delete' deleted
-  saved backup bundle to $TESTTMP/bookmarks/.hg/strip-backup/*-backup.hg (glob)
   $ hg id -ir 6:2702dd0c91e7
   abort: unknown revision '2702dd0c91e7'!
   [255]
+  $ hg update B
+  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
+  (activating bookmark B)
+  $ echo a > a
+  $ hg add a
+  $ hg strip -B B
+  abort: local changes found
+  [255]
+  $ hg bookmarks
+   * B                         6:ff43616e5d0f
 
   $ cd ..