diff options
Diffstat (limited to 'tests/test-subrepo-relative-path.t')
| -rw-r--r-- | tests/test-subrepo-relative-path.t | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/tests/test-subrepo-relative-path.t b/tests/test-subrepo-relative-path.t index e101511..f3fc8f5 100644 --- a/tests/test-subrepo-relative-path.t +++ b/tests/test-subrepo-relative-path.t @@ -1,11 +1,9 @@ - $ "$TESTDIR/hghave" serve || exit 80 - Preparing the subrepository 'sub' $ hg init sub $ echo sub > sub/sub $ hg add -R sub - adding sub/sub (glob) + adding sub/sub $ hg commit -R sub -m "sub import" Preparing the 'main' repo which depends on the subrepo 'sub' @@ -17,9 +15,10 @@ Preparing the 'main' repo which depends on the subrepo 'sub' updating to branch default 1 files updated, 0 files merged, 0 files removed, 0 files unresolved $ hg add -R main - adding main/.hgsub (glob) - adding main/main (glob) + adding main/.hgsub + adding main/main $ hg commit -R main -m "main import" + committing subrepository sub Cleaning both repositories, just as a clone -U @@ -29,9 +28,6 @@ Cleaning both repositories, just as a clone -U 0 files updated, 0 files merged, 3 files removed, 0 files unresolved $ rm -rf main/sub -hide outer repo - $ hg init - Serving them both using hgweb $ printf '[paths]\n/main = main\nsub = sub\n' > webdir.conf @@ -74,7 +70,9 @@ subrepo debug for 'main' clone subrepo paths with ssh urls - $ hg clone -e "python \"$TESTDIR/dummyssh\"" ssh://user@dummy/cloned sshclone + $ cp $TESTDIR/dummyssh $BINDIR/ssh + + $ hg clone ssh://user@dummy/cloned sshclone requesting all changes adding changesets adding manifests @@ -89,17 +87,17 @@ subrepo paths with ssh urls added 1 changesets with 1 changes to 1 files 3 files updated, 0 files merged, 0 files removed, 0 files unresolved - $ hg -R sshclone push -e "python \"$TESTDIR/dummyssh\"" ssh://user@dummy/`pwd`/cloned + $ hg -R sshclone push ssh://user@dummy/$TESTTMP/cloned pushing to ssh://user@dummy/$TESTTMP/cloned pushing subrepo sub to ssh://user@dummy/$TESTTMP/sub searching for changes no changes found searching for changes no changes found - [1] $ cat dummylog Got arguments 1:user@dummy 2:hg -R cloned serve --stdio Got arguments 1:user@dummy 2:hg -R sub serve --stdio Got arguments 1:user@dummy 2:hg -R $TESTTMP/cloned serve --stdio Got arguments 1:user@dummy 2:hg -R $TESTTMP/sub serve --stdio + $ rm $BINDIR/ssh |