--- a/tests/test-bookmarks-pushpull.t Mon Feb 08 15:35:30 2016 -0800
+++ b/tests/test-bookmarks-pushpull.t Fri Feb 12 14:24:48 2016 +0000
@@ -680,12 +680,12 @@
pushing an existing but divergent bookmark with -B still requires -f
- $ hg clone -q . r
+ $ hg clone -q . ../r
$ hg up -q X
$ echo 1 > f2
$ hg ci -qAml
- $ cd r
+ $ cd ../r
$ hg up -q X
$ echo 2 > f2
$ hg ci -qAmr
@@ -696,7 +696,7 @@
abort: push creates new remote head 54694f811df9 with bookmark 'X'!
(pull and merge or see "hg help push" for details about pushing new heads)
[255]
- $ cd ..
+ $ cd ../addmarks
Check summary output for incoming/outgoing bookmarks