Mercurial > hg

diff tests/test-bookmarks.t @ 14268:a55a0045704c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge with stable
author Matt Mackall <mpm@selenic.com>
date Sun, 08 May 2011 16:16:41 -0500
parents c315ffc13a25 89e7d35e0ef0
children 677339529a53
line wrap: on
line diff
--- a/tests/test-bookmarks.t	Sun May 08 11:39:24 2011 -0500
+++ b/tests/test-bookmarks.t	Sun May 08 16:16:41 2011 -0500
@@ -235,6 +235,7 @@
      Y                         2:db815d6d32e6
    * Z                         2:db815d6d32e6
      x  y                      2:db815d6d32e6
+
 test summary
 
   $ hg summary
@@ -249,6 +250,22 @@
   $ hg id
   db815d6d32e6 tip Y/Z/x  y
 
+test rollback
+
+  $ echo foo > f1
+  $ hg ci -Amr
+  adding f1
+  $ hg bookmark -f Y -r 1
+  $ hg bookmark -f Z -r 1
+  $ hg rollback
+  repository tip rolled back to revision 2 (undo commit)
+  working directory now based on revision 2
+  $ hg bookmarks
+     X2                        1:925d80f479bb
+     Y                         2:db815d6d32e6
+   * Z                         2:db815d6d32e6
+     x  y                      2:db815d6d32e6
+
 test clone
 
   $ hg bookmarks