diff options
author | Daniel Silverstone <daniel.silverstone@codethink.co.uk> | 2012-09-27 14:30:31 +0100 |
---|---|---|
committer | Daniel Silverstone <daniel.silverstone@codethink.co.uk> | 2012-09-27 14:30:31 +0100 |
commit | 4b0aa73b8c69bd5b7521337809f7bc4714209a5a (patch) | |
tree | 75f4c36771caf222280249cd1ed611d5ade8bd48 /tests/test-symlinks.t | |
parent | 59a96880b5d035db83067acda8345497c75d7716 (diff) | |
parent | 921ced43c48c1d170452a7b251b94cc96ec8dd44 (diff) | |
download | mercurial-tarball-baserock/morph.tar.gz |
Merge remote-tracking branch 'origin/master' into baserock/morphbaserock/morph
This changes us to 1.9.3 which might stand a better chance of being
usable by Lorry.
We also undo the setup.py change because python now supports bz2
Diffstat (limited to 'tests/test-symlinks.t')
-rw-r--r-- | tests/test-symlinks.t | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/tests/test-symlinks.t b/tests/test-symlinks.t index 660ab91..9d35c80 100644 --- a/tests/test-symlinks.t +++ b/tests/test-symlinks.t @@ -168,12 +168,11 @@ now addremove should remove old files ? foo $ hg status ../link ? foo - $ hg add foo - $ hg cp foo "$TESTTMP/link/bar" - foo has not been committed yet, so no copy data will be stored for bar. $ cd .. + + $ hg init b $ cd b $ ln -s nothing dangling @@ -195,13 +194,13 @@ now addremove should remove old files $ hg manifest --debug 2564acbe54bbbedfbf608479340b359f04597f80 644 @ dangling - $ "$TESTDIR/readlink.py" dangling + $ $TESTDIR/readlink.py dangling dangling -> nothing $ rm dangling $ ln -s void dangling $ hg commit -m 'change symlink' - $ "$TESTDIR/readlink.py" dangling + $ $TESTDIR/readlink.py dangling dangling -> void @@ -209,7 +208,7 @@ modifying link $ rm dangling $ ln -s empty dangling - $ "$TESTDIR/readlink.py" dangling + $ $TESTDIR/readlink.py dangling dangling -> empty @@ -217,13 +216,13 @@ reverting to rev 0: $ hg revert -r 0 -a reverting dangling - $ "$TESTDIR/readlink.py" dangling + $ $TESTDIR/readlink.py dangling dangling -> nothing backups: - $ "$TESTDIR/readlink.py" *.orig + $ $TESTDIR/readlink.py *.orig dangling.orig -> empty $ rm *.orig $ hg up -C @@ -236,7 +235,7 @@ copies $ hg st -Cmard A dangling2 dangling - $ "$TESTDIR/readlink.py" dangling dangling2 + $ $TESTDIR/readlink.py dangling dangling2 dangling -> void dangling2 -> void @@ -253,4 +252,3 @@ Issue995: hg copy -A incorrectly handles symbolic links $ mv dirlink newdir/dirlink $ hg mv -A dirlink newdir/dirlink - $ cd .. |