Mercurial > hg

diff tests/test-bookmarks.t @ 19112:23f785b38af3 stable 2.6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
bookmarks: fix bug that activated a bookmark even with -r passed If the current revision was the target revision of -r, then the bookmark would be active. Test cases have been updated accordingly.
author Sean Farley <sean.michael.farley@gmail.com>
date Wed, 01 May 2013 15:24:21 -0500
parents 6439d78e14fb
children 5b1835485442
line wrap: on
line diff
--- a/tests/test-bookmarks.t	Tue Apr 30 21:12:49 2013 -0500
+++ b/tests/test-bookmarks.t	Wed May 01 15:24:21 2013 -0500
@@ -157,6 +157,7 @@
 bookmarks from a revset
   $ hg bookmark -r '.^1' REVSET
   $ hg bookmark -r ':tip' TIP
+  $ hg up -q TIP
   $ hg bookmarks
      REVSET                    0:f7b1eb17ad24
    * TIP                       2:db815d6d32e6
@@ -601,8 +602,8 @@
      Z                         0:f7b1eb17ad24
      Z@1                       1:925d80f479bb
      Z@2                       2:db815d6d32e6
-   * Z@3                       3:9ba5f110a0b3
-     four                      3:9ba5f110a0b3
+     Z@3                       3:9ba5f110a0b3
+   * four                      3:9ba5f110a0b3
      should-end-on-two         2:db815d6d32e6
   $ hg bookmark Z
   moving bookmark 'Z' forward from f7b1eb17ad24
@@ -620,9 +621,9 @@
   $ hg book foo@3 -r 3
   $ hg book foo -r foo@3
   $ hg book
-     Z                         3:9ba5f110a0b3
+   * Z                         3:9ba5f110a0b3
      Z@1                       1:925d80f479bb
-   * foo                       3:9ba5f110a0b3
+     foo                       3:9ba5f110a0b3
      foo@1                     0:f7b1eb17ad24
      foo@2                     2:db815d6d32e6
      four                      3:9ba5f110a0b3