[PATCH V2] bookmarks: avoid creating a nested repository during testing
Martijn Pieters
mj at zopatista.com
Fri Feb 12 14:27:41 UTC 2016
# HG changeset patch
# User Martijn Pieters <mjpieters at fb.com>
# Date 1455287088 0
# Fri Feb 12 14:24:48 2016 +0000
# Node ID 7f6709ffb24f82b534f13299e84433c2181f9753
# Parent cc591353a8663619865b7cfb7f9a1d6ae9f60290
bookmarks: avoid creating a nested repository during testing.
This helps the test to pass with hgwatchman, which would otherwise need to be
taught about a nested .hg directory. hgwatchman already blacklists
test-nested-repo.t which covers the actual usecase.
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
@@ -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
More information about the Mercurial-devel
mailing list