Patchwork [1,of,2] test-bookmarks-pushpull.t: don't set bookmark active unnecessarily

login
register
mail settings
Submitter Kevin Bullock
Date Jan. 21, 2013, 7:48 p.m.
Message ID <911229b0565cb0c031ba.1358797684@slower-than-infinity.lan>
Download mbox | patch
Permalink /patch/700/
State Superseded
Headers show

Comments

Kevin Bullock - Jan. 21, 2013, 7:48 p.m.
# HG changeset patch
# User Kevin Bullock <kbullock@ringworld.org>
# Date 1358794739 21600
# Branch stable
# Node ID 911229b0565cb0c031baaae36f21a5829f78e3b1
# Parent  9354a8c1bdedec8e60d9b00aeba7cd2a4bd681a0
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.

Patch

diff --git a/tests/test-bookmarks-pushpull.t b/tests/test-bookmarks-pushpull.t
--- a/tests/test-bookmarks-pushpull.t
+++ b/tests/test-bookmarks-pushpull.t
@@ -128,15 +128,15 @@  divergent bookmarks
   $ 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 @@  divergent bookmarks
   $ 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