[PATCH] test-bookmarks.t: avoid nested repo
Siddharth Agarwal
sid0 at fb.com
Mon Aug 3 04:57:35 UTC 2015
# HG changeset patch
# User Siddharth Agarwal <sid0 at fb.com>
# Date 1438577798 25200
# Sun Aug 02 21:56:38 2015 -0700
# Branch stable
# Node ID 77223ecac7ab04d4779694b1a9be65ae839be78e
# Parent 79f0cb97d7537a7c2948f8f9b0a89148825a3a1d
test-bookmarks.t: avoid nested repo
This is (a) pretty unnecessary and (b) breaks tests for the third-party
hgwatchman extension, which doesn't support nested repos.
diff --git a/tests/test-bookmarks.t b/tests/test-bookmarks.t
--- a/tests/test-bookmarks.t
+++ b/tests/test-bookmarks.t
@@ -511,10 +511,10 @@ test clone with a specific revision
test clone with update to a bookmark
- $ hg clone -u Z . cloned-bookmarks-update
+ $ hg clone -u Z . ../cloned-bookmarks-update
updating to branch default
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
- $ hg -R cloned-bookmarks-update bookmarks
+ $ hg -R ../cloned-bookmarks-update bookmarks
X2 1:925d80f479bb
Y 2:db815d6d32e6
* Z 2:db815d6d32e6
@@ -569,10 +569,10 @@ pull --update works the same as pull &&
$ hg bookmark -r3 Y
moving bookmark 'Y' forward from db815d6d32e6
- $ hg -R cloned-bookmarks-update update Y
+ $ hg -R ../cloned-bookmarks-update update Y
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
(activating bookmark Y)
- $ hg -R cloned-bookmarks-update pull --update .
+ $ hg -R ../cloned-bookmarks-update pull --update .
pulling from .
searching for changes
adding changesets
More information about the Mercurial-devel
mailing list