diff --git a/tests/test-no-symlinks.out b/tests/test-no-symlinks.out deleted file mode 100644 index cfedc529e4a120015976eefa2718140882a23bb5_dGVzdHMvdGVzdC1uby1zeW1saW5rcy5vdXQ=..0000000000000000000000000000000000000000 --- a/tests/test-no-symlinks.out +++ /dev/null @@ -1,20 +0,0 @@ -% unbundle -4 files updated, 0 files merged, 0 files removed, 0 files unresolved -a -d/b -% move and copy -a -d/b -% bundle -2 changesets found -pulling from ../symlinks.hg -requesting all changes -adding changesets -adding manifests -adding file changes -added 2 changesets with 6 changes to 6 files -(run 'hg update' to get a working copy) -5 files updated, 0 files merged, 0 files removed, 0 files unresolved -a -a -d/b diff --git a/tests/test-no-symlinks b/tests/test-no-symlinks.t similarity index 22% rename from tests/test-no-symlinks rename to tests/test-no-symlinks.t index cfedc529e4a120015976eefa2718140882a23bb5_dGVzdHMvdGVzdC1uby1zeW1saW5rcw==..a419cb2395d5d8167d58f9466d2bee34e87d6b3a_dGVzdHMvdGVzdC1uby1zeW1saW5rcy50 100755 --- a/tests/test-no-symlinks +++ b/tests/test-no-symlinks.t @@ -1,6 +1,4 @@ -#!/bin/sh - -"$TESTDIR/hghave" no-symlink || exit 80 + $ "$TESTDIR/hghave" no-symlink || exit 80 # The following script was used to create the bundle: # @@ -14,10 +12,5 @@ # hg ci -Am t # hg bundle --base null ../test-no-symlinks.hg -# Extract a symlink on a platform not supporting them -echo % unbundle -hg init t -cd t -hg pull -q "$TESTDIR/test-no-symlinks.hg" -hg update +Extract a symlink on a platform not supporting them @@ -23,4 +16,21 @@ -cat a.lnk && echo -cat d/b.lnk && echo + $ hg init t + $ cd t + $ hg pull -q "$TESTDIR/test-no-symlinks.hg" + $ hg update + 4 files updated, 0 files merged, 0 files removed, 0 files unresolved + $ cat a.lnk && echo + a + $ cat d/b.lnk && echo + d/b + +Copy a symlink and move another + + $ hg copy a.lnk d/a2.lnk + $ hg mv d/b.lnk b2.lnk + $ hg ci -Am copy + $ cat d/a2.lnk && echo + a + $ cat b2.lnk && echo + d/b @@ -26,9 +36,3 @@ -# Copy a symlink and move another -echo % move and copy -hg copy a.lnk d/a2.lnk -hg mv d/b.lnk b2.lnk -hg ci -Am copy -cat d/a2.lnk && echo -cat b2.lnk && echo +Bundle and extract again @@ -34,14 +38,22 @@ -# Bundle and extract again -echo % bundle -hg bundle --base null ../symlinks.hg -cd .. - -hg init t2 -cd t2 -hg pull ../symlinks.hg -hg update - -cat a.lnk && echo -cat d/a2.lnk && echo -cat b2.lnk && echo + $ hg bundle --base null ../symlinks.hg + 2 changesets found + $ cd .. + $ hg init t2 + $ cd t2 + $ hg pull ../symlinks.hg + pulling from ../symlinks.hg + requesting all changes + adding changesets + adding manifests + adding file changes + added 2 changesets with 6 changes to 6 files + (run 'hg update' to get a working copy) + $ hg update + 5 files updated, 0 files merged, 0 files removed, 0 files unresolved + $ cat a.lnk && echo + a + $ cat d/a2.lnk && echo + a + $ cat b2.lnk && echo + d/b