test-bookmarks-pushpull.t: don't set bookmark active unnecessarily stable
authorKevin Bullock <kbullock@ringworld.org>
Mon, 21 Jan 2013 12:58:59 -0600
branchstable
changeset 18470 28b3d669295e
parent 18469 ddbe689af784
child 18471 2096e025a728
test-bookmarks-pushpull.t: don't set bookmark active unnecessarily The test in question doesn't have anything to do with having an active bookmark. This change makes the test change the two bookmarks it affects without making them active. It clears the way for adding a test for updating to an active bookmark that moved out from under us.
tests/test-bookmarks-pushpull.t
--- a/tests/test-bookmarks-pushpull.t	Thu Jan 24 00:21:22 2013 +0900
+++ b/tests/test-bookmarks-pushpull.t	Mon Jan 21 12:58:59 2013 -0600
@@ -128,15 +128,15 @@
   $ echo c2 > f2
   $ hg ci -Am2
   adding f2
-  $ hg book -f @
-  $ hg book -f X
+  $ hg book -if @
+  $ hg book -if X
   $ hg book
      @                         1:9b140be10808
-   * X                         1:9b140be10808
+     X                         1:9b140be10808
      Y                         0:4e3505fd9583
      Z                         0:4e3505fd9583
      foo                       -1:000000000000
-     foobar                    1:9b140be10808
+   * foobar                    1:9b140be10808
 
   $ hg pull --config paths.foo=../a foo
   pulling from $TESTTMP/a (glob)
@@ -152,12 +152,12 @@
   $ hg book
      @                         1:9b140be10808
      @foo                      2:0d2164f0ce0d
-   * X                         1:9b140be10808
+     X                         1:9b140be10808
      X@foo                     2:0d2164f0ce0d
      Y                         0:4e3505fd9583
      Z                         2:0d2164f0ce0d
      foo                       -1:000000000000
-     foobar                    1:9b140be10808
+   * foobar                    1:9b140be10808
   $ hg push -f ../a
   pushing to ../a
   searching for changes