Mercurial > hg
annotate tests/test-casefolding.t @ 14050:9e8a9d45945c stable
subrepo: handle svn tracked/unknown directory collisions
This happens more often than expected. Say you have an svn subrepository with
python code. Python would have generated unknown .pyc files. Now, you rebase
this setup on a revision where a directory containing python code does not
exist. Subversion is first asked to remove this directory when updating, but
will not because it contains untracked items. Then it will have to bring back
the directory after the merge but will fail because it now collides with an
untracked directory.
Using --force is not very elegant and only works with svn >= 1.5 but the only
alternative I can think of is to write our own purge command for subversion.
author | Patrick Mezard <pmezard@gmail.com> |
---|---|
date | Fri, 04 Mar 2011 14:00:49 +0100 |
parents | f1646efc54a6 |
children | b0a88bda3381 |
rev | line source |
---|---|
12603
f1646efc54a6
tests: unify test-casefolding
Brodie Rao <brodie@bitheap.org>
parents:
9396
diff
changeset
|
1 $ "$TESTDIR/hghave" icasefs || exit 80 |
6806
2134d6c09432
Add test for case folding issues
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
2 |
12603
f1646efc54a6
tests: unify test-casefolding
Brodie Rao <brodie@bitheap.org>
parents:
9396
diff
changeset
|
3 test file addition with bad case |
6806
2134d6c09432
Add test for case folding issues
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
4 |
12603
f1646efc54a6
tests: unify test-casefolding
Brodie Rao <brodie@bitheap.org>
parents:
9396
diff
changeset
|
5 $ hg init repo1 |
f1646efc54a6
tests: unify test-casefolding
Brodie Rao <brodie@bitheap.org>
parents:
9396
diff
changeset
|
6 $ cd repo1 |
f1646efc54a6
tests: unify test-casefolding
Brodie Rao <brodie@bitheap.org>
parents:
9396
diff
changeset
|
7 $ echo a > a |
f1646efc54a6
tests: unify test-casefolding
Brodie Rao <brodie@bitheap.org>
parents:
9396
diff
changeset
|
8 $ hg add A |
f1646efc54a6
tests: unify test-casefolding
Brodie Rao <brodie@bitheap.org>
parents:
9396
diff
changeset
|
9 adding a |
f1646efc54a6
tests: unify test-casefolding
Brodie Rao <brodie@bitheap.org>
parents:
9396
diff
changeset
|
10 $ hg st |
f1646efc54a6
tests: unify test-casefolding
Brodie Rao <brodie@bitheap.org>
parents:
9396
diff
changeset
|
11 A a |
f1646efc54a6
tests: unify test-casefolding
Brodie Rao <brodie@bitheap.org>
parents:
9396
diff
changeset
|
12 $ hg ci -m adda |
f1646efc54a6
tests: unify test-casefolding
Brodie Rao <brodie@bitheap.org>
parents:
9396
diff
changeset
|
13 $ hg manifest |
f1646efc54a6
tests: unify test-casefolding
Brodie Rao <brodie@bitheap.org>
parents:
9396
diff
changeset
|
14 a |
f1646efc54a6
tests: unify test-casefolding
Brodie Rao <brodie@bitheap.org>
parents:
9396
diff
changeset
|
15 $ cd .. |
f1646efc54a6
tests: unify test-casefolding
Brodie Rao <brodie@bitheap.org>
parents:
9396
diff
changeset
|
16 |
f1646efc54a6
tests: unify test-casefolding
Brodie Rao <brodie@bitheap.org>
parents:
9396
diff
changeset
|
17 test case collision on rename (issue750) |
f1646efc54a6
tests: unify test-casefolding
Brodie Rao <brodie@bitheap.org>
parents:
9396
diff
changeset
|
18 |
f1646efc54a6
tests: unify test-casefolding
Brodie Rao <brodie@bitheap.org>
parents:
9396
diff
changeset
|
19 $ hg init repo2 |
f1646efc54a6
tests: unify test-casefolding
Brodie Rao <brodie@bitheap.org>
parents:
9396
diff
changeset
|
20 $ cd repo2 |
f1646efc54a6
tests: unify test-casefolding
Brodie Rao <brodie@bitheap.org>
parents:
9396
diff
changeset
|
21 $ echo a > a |
f1646efc54a6
tests: unify test-casefolding
Brodie Rao <brodie@bitheap.org>
parents:
9396
diff
changeset
|
22 $ hg --debug ci -Am adda |
f1646efc54a6
tests: unify test-casefolding
Brodie Rao <brodie@bitheap.org>
parents:
9396
diff
changeset
|
23 adding a |
f1646efc54a6
tests: unify test-casefolding
Brodie Rao <brodie@bitheap.org>
parents:
9396
diff
changeset
|
24 a |
f1646efc54a6
tests: unify test-casefolding
Brodie Rao <brodie@bitheap.org>
parents:
9396
diff
changeset
|
25 committed changeset 0:07f4944404050f47db2e5c5071e0e84e7a27bba9 |
f1646efc54a6
tests: unify test-casefolding
Brodie Rao <brodie@bitheap.org>
parents:
9396
diff
changeset
|
26 $ hg mv a A |
f1646efc54a6
tests: unify test-casefolding
Brodie Rao <brodie@bitheap.org>
parents:
9396
diff
changeset
|
27 A: not overwriting - file exists |
f1646efc54a6
tests: unify test-casefolding
Brodie Rao <brodie@bitheap.org>
parents:
9396
diff
changeset
|
28 |
f1646efc54a6
tests: unify test-casefolding
Brodie Rao <brodie@bitheap.org>
parents:
9396
diff
changeset
|
29 'a' used to be removed under windows |
6806
2134d6c09432
Add test for case folding issues
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
30 |
12603
f1646efc54a6
tests: unify test-casefolding
Brodie Rao <brodie@bitheap.org>
parents:
9396
diff
changeset
|
31 $ test -f a || echo 'a is missing' |
f1646efc54a6
tests: unify test-casefolding
Brodie Rao <brodie@bitheap.org>
parents:
9396
diff
changeset
|
32 $ hg st |
f1646efc54a6
tests: unify test-casefolding
Brodie Rao <brodie@bitheap.org>
parents:
9396
diff
changeset
|
33 $ cd .. |
f1646efc54a6
tests: unify test-casefolding
Brodie Rao <brodie@bitheap.org>
parents:
9396
diff
changeset
|
34 |
f1646efc54a6
tests: unify test-casefolding
Brodie Rao <brodie@bitheap.org>
parents:
9396
diff
changeset
|
35 test case collision between revisions (issue912) |
f1646efc54a6
tests: unify test-casefolding
Brodie Rao <brodie@bitheap.org>
parents:
9396
diff
changeset
|
36 |
f1646efc54a6
tests: unify test-casefolding
Brodie Rao <brodie@bitheap.org>
parents:
9396
diff
changeset
|
37 $ hg init repo3 |
f1646efc54a6
tests: unify test-casefolding
Brodie Rao <brodie@bitheap.org>
parents:
9396
diff
changeset
|
38 $ cd repo3 |
f1646efc54a6
tests: unify test-casefolding
Brodie Rao <brodie@bitheap.org>
parents:
9396
diff
changeset
|
39 $ echo a > a |
f1646efc54a6
tests: unify test-casefolding
Brodie Rao <brodie@bitheap.org>
parents:
9396
diff
changeset
|
40 $ hg ci -Am adda |
f1646efc54a6
tests: unify test-casefolding
Brodie Rao <brodie@bitheap.org>
parents:
9396
diff
changeset
|
41 adding a |
f1646efc54a6
tests: unify test-casefolding
Brodie Rao <brodie@bitheap.org>
parents:
9396
diff
changeset
|
42 $ hg rm a |
f1646efc54a6
tests: unify test-casefolding
Brodie Rao <brodie@bitheap.org>
parents:
9396
diff
changeset
|
43 $ hg ci -Am removea |
f1646efc54a6
tests: unify test-casefolding
Brodie Rao <brodie@bitheap.org>
parents:
9396
diff
changeset
|
44 $ echo A > A |
6806
2134d6c09432
Add test for case folding issues
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
45 |
12603
f1646efc54a6
tests: unify test-casefolding
Brodie Rao <brodie@bitheap.org>
parents:
9396
diff
changeset
|
46 on linux hfs keeps the old case stored, force it |
f1646efc54a6
tests: unify test-casefolding
Brodie Rao <brodie@bitheap.org>
parents:
9396
diff
changeset
|
47 |
f1646efc54a6
tests: unify test-casefolding
Brodie Rao <brodie@bitheap.org>
parents:
9396
diff
changeset
|
48 $ mv a aa |
f1646efc54a6
tests: unify test-casefolding
Brodie Rao <brodie@bitheap.org>
parents:
9396
diff
changeset
|
49 $ mv aa A |
f1646efc54a6
tests: unify test-casefolding
Brodie Rao <brodie@bitheap.org>
parents:
9396
diff
changeset
|
50 $ hg ci -Am addA |
f1646efc54a6
tests: unify test-casefolding
Brodie Rao <brodie@bitheap.org>
parents:
9396
diff
changeset
|
51 adding A |
6806
2134d6c09432
Add test for case folding issues
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
52 |
12603
f1646efc54a6
tests: unify test-casefolding
Brodie Rao <brodie@bitheap.org>
parents:
9396
diff
changeset
|
53 used to fail under case insensitive fs |
6806
2134d6c09432
Add test for case folding issues
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
54 |
12603
f1646efc54a6
tests: unify test-casefolding
Brodie Rao <brodie@bitheap.org>
parents:
9396
diff
changeset
|
55 $ hg up -C 0 |
f1646efc54a6
tests: unify test-casefolding
Brodie Rao <brodie@bitheap.org>
parents:
9396
diff
changeset
|
56 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
f1646efc54a6
tests: unify test-casefolding
Brodie Rao <brodie@bitheap.org>
parents:
9396
diff
changeset
|
57 $ hg up -C |
f1646efc54a6
tests: unify test-casefolding
Brodie Rao <brodie@bitheap.org>
parents:
9396
diff
changeset
|
58 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
f1646efc54a6
tests: unify test-casefolding
Brodie Rao <brodie@bitheap.org>
parents:
9396
diff
changeset
|
59 $ cd .. |