Skip to content
Snippets Groups Projects
Commit 28b3d669 authored by Kevin Bullock's avatar Kevin Bullock
Browse files

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.
parent ddbe689a
No related branches found
No related tags found
No related merge requests found
......@@ -128,7 +128,7 @@
$ 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
......@@ -133,6 +133,6 @@
$ hg book
@ 1:9b140be10808
* X 1:9b140be10808
X 1:9b140be10808
Y 0:4e3505fd9583
Z 0:4e3505fd9583
foo -1:000000000000
......@@ -136,7 +136,7 @@
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,8 +152,8 @@
$ 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
......@@ -156,8 +156,8 @@
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
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment