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-audit-path.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-audit-path.t')
-rw-r--r-- | tests/test-audit-path.t | 40 |
1 files changed, 15 insertions, 25 deletions
diff --git a/tests/test-audit-path.t b/tests/test-audit-path.t index d105e94..23d2478 100644 --- a/tests/test-audit-path.t +++ b/tests/test-audit-path.t @@ -1,40 +1,39 @@ $ hg init -audit of .hg +should fail $ hg add .hg/00changelog.i - abort: path contains illegal component: .hg/00changelog.i (glob) + abort: path contains illegal component: .hg/00changelog.i [255] -#if symlink - -Symlinks - $ mkdir a $ echo a > a/a $ hg ci -Ama adding a/a $ ln -s a b $ echo b > a/b + +should fail + $ hg add b/b - abort: path 'b/b' traverses symbolic link 'b' (glob) + abort: path 'b/b' traverses symbolic link 'b' [255] + +should succeed + $ hg add b should still fail - maybe $ hg add b/b - abort: path 'b/b' traverses symbolic link 'b' (glob) + abort: path 'b/b' traverses symbolic link 'b' [255] -#endif - - unbundle tampered bundle $ hg init target $ cd target - $ hg unbundle "$TESTDIR/bundles/tampered.hg" + $ hg unbundle $TESTDIR/bundles/tampered.hg adding changesets adding manifests adding file changes @@ -46,7 +45,7 @@ attack .hg/test $ hg manifest -r0 .hg/test $ hg update -Cr0 - abort: path contains illegal component: .hg/test (glob) + abort: path contains illegal component: .hg/test [255] attack foo/.hg/test @@ -54,7 +53,7 @@ attack foo/.hg/test $ hg manifest -r1 foo/.hg/test $ hg update -Cr1 - abort: path 'foo/.hg/test' is inside nested repo 'foo' (glob) + abort: path 'foo/.hg/test' is inside nested repo 'foo' [255] attack back/test where back symlinks to .. @@ -62,23 +61,16 @@ attack back/test where back symlinks to .. $ hg manifest -r2 back back/test -#if symlink $ hg update -Cr2 abort: path 'back/test' traverses symbolic link 'back' [255] -#else -('back' will be a file and cause some other system specific error) - $ hg update -Cr2 - abort: * (glob) - [255] -#endif attack ../test $ hg manifest -r3 ../test $ hg update -Cr3 - abort: path contains illegal component: ../test (glob) + abort: path contains illegal component: ../test [255] attack /tmp/test @@ -86,7 +78,5 @@ attack /tmp/test $ hg manifest -r4 /tmp/test $ hg update -Cr4 - abort: *: $TESTTMP/target//tmp/test (glob) + abort: No such file or directory: $TESTTMP/target//tmp/test [255] - - $ cd .. |