Mercurial > public > mercurial-scm > hg
diff tests/test-casefolding.t @ 15538:b0a88bda3381 stable
update: don't clobber untracked files with wrong casing
| author | Mads Kiilerich <mads@kiilerich.com> |
|---|---|
| date | Sun, 20 Nov 2011 23:09:32 +0100 |
| parents | f1646efc54a6 |
| children | 44fa047cef57 |
line wrap: on
line diff
--- a/tests/test-casefolding.t Sun Nov 20 16:06:51 2011 -0600 +++ b/tests/test-casefolding.t Sun Nov 20 23:09:32 2011 +0100 @@ -1,5 +1,8 @@ $ "$TESTDIR/hghave" icasefs || exit 80 + $ hg debugfs | grep 'case-sensitive:' + case-sensitive: no + test file addition with bad case $ hg init repo1 @@ -56,4 +59,16 @@ 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 + abort: untracked file in working directory differs from file in requested revision: 'a' + [255] + $ cat a + gold + $ cd ..