Mercurial > hg
changeset 25893:04ae6feb04c5
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.
| author | Siddharth Agarwal <sid0@fb.com> |
|---|---|
| date | Sun, 02 Aug 2015 21:56:38 -0700 |
| parents | 3df1574f3e75 |
| children | c30b739c322f |
| files | tests/test-bookmarks.t |
| diffstat | 1 files changed, 4 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/test-bookmarks.t Sun Aug 02 12:16:19 2015 +0900 +++ b/tests/test-bookmarks.t Sun Aug 02 21:56:38 2015 -0700 @@ -511,10 +511,10 @@ 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 @@ $ 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