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-casefolding.t | |
parent | 59a96880b5d035db83067acda8345497c75d7716 (diff) | |
parent | 921ced43c48c1d170452a7b251b94cc96ec8dd44 (diff) | |
download | mercurial-tarball-4b0aa73b8c69bd5b7521337809f7bc4714209a5a.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-casefolding.t')
-rw-r--r-- | tests/test-casefolding.t | 110 |
1 files changed, 3 insertions, 107 deletions
diff --git a/tests/test-casefolding.t b/tests/test-casefolding.t index 5f59617..88f4831 100644 --- a/tests/test-casefolding.t +++ b/tests/test-casefolding.t @@ -1,8 +1,5 @@ $ "$TESTDIR/hghave" icasefs || exit 80 - $ hg debugfs | grep 'case-sensitive:' - case-sensitive: no - test file addition with bad case $ hg init repo1 @@ -26,48 +23,13 @@ test case collision on rename (issue750) adding a a committed changeset 0:07f4944404050f47db2e5c5071e0e84e7a27bba9 - -Case-changing renames should work: - $ hg mv a A - $ hg mv A a - $ hg st + A: not overwriting - file exists -test changing case of path components +'a' used to be removed under windows - $ mkdir D - $ echo b > D/b - $ hg ci -Am addb D/b - $ hg mv D/b d/b - D/b: not overwriting - file exists - $ hg mv D/b d/c - $ hg st - A D/c - R D/b - $ mv D temp - $ mv temp d - $ hg st - A D/c - R D/b - $ hg revert -aq - $ rm d/c - $ echo c > D/c - $ hg add D/c + $ test -f a || echo 'a is missing' $ hg st - A D/c - $ hg ci -m addc D/c - $ hg mv d/b d/e - moving D/b to D/e (glob) - $ hg st - A D/e - R D/b - $ hg revert -aq - $ rm d/e - $ hg mv d/b D/B - moving D/b to D/B (glob) - $ hg st - A D/B - R D/b $ cd .. test case collision between revisions (issue912) @@ -94,70 +56,4 @@ used to fail under case insensitive fs 1 files updated, 0 files merged, 1 files removed, 0 files unresolved $ hg up -C 1 files updated, 0 files merged, 1 files removed, 0 files unresolved - -no clobbering of untracked files with wrong casing - - $ hg up -r null - 0 files updated, 0 files merged, 1 files removed, 0 files unresolved - $ echo gold > a - $ hg up - A: untracked file differs - abort: untracked files in working directory differ from files in requested revision - [255] - $ cat a - gold - - $ cd .. - -issue 3342: file in nested directory causes unexpected abort - - $ hg init issue3342 - $ cd issue3342 - - $ mkdir -p a/B/c/D - $ echo e > a/B/c/D/e - $ hg add a/B/c/D/e - - $ cd .. - -issue 3340: mq does not handle case changes correctly - -in addition to reported case, 'hg qrefresh' is also tested against -case changes. - - $ echo "[extensions]" >> $HGRCPATH - $ echo "mq=" >> $HGRCPATH - - $ hg init issue3340 - $ cd issue3340 - - $ echo a > mIxEdCaSe - $ hg add mIxEdCaSe - $ hg commit -m '#0' - $ hg rename mIxEdCaSe tmp - $ hg rename tmp MiXeDcAsE - $ hg status -A - A MiXeDcAsE - mIxEdCaSe - R mIxEdCaSe - $ hg qnew changecase - $ hg status -A - C MiXeDcAsE - - $ hg qpop -a - popping changecase - patch queue now empty - $ hg qnew refresh-casechange - $ hg status -A - C mIxEdCaSe - $ hg rename mIxEdCaSe tmp - $ hg rename tmp MiXeDcAsE - $ hg status -A - A MiXeDcAsE - mIxEdCaSe - R mIxEdCaSe - $ hg qrefresh - $ hg status -A - C MiXeDcAsE - $ cd .. |