Mercurial > hg > mercurial-crew-with-dirclash
annotate tests/test-empty-dir @ 5483:0c43f87baba3 default tip
Fix file-changed-to-dir and dir-to-file commits (issue660).
Allow adding to dirstate files that clash with previously existing
but marked for removal. Protect from reintroducing clashes by revert.
This change doesn't address related issues with update. Current
workaround is to do "clean" update by manually removing conflicting
files/dirs from working directory.
author | Maxim Dounin <mdounin@mdounin.ru> |
---|---|
date | Sat, 27 Oct 2007 16:27:55 +0400 |
parents | 33b6c8193652 |
children |
rev | line source |
---|---|
578 | 1 #!/bin/sh |
2 | |
3 hg init | |
4 echo 123 > a | |
5 hg add a | |
1933
7544700fd931
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1926
diff
changeset
|
6 hg commit -m "first" -d "1000000 0" a |
578 | 7 mkdir sub |
8 echo 321 > sub/b | |
9 hg add sub/b | |
1933
7544700fd931
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1926
diff
changeset
|
10 hg commit -m "second" -d "1000000 0" sub/b |
578 | 11 cat sub/b |
12 hg co 0 | |
1926
ba198d17eea9
changes by John Levon to standardize some erroroutput
Peter van Dijk <peter@dataloss.nl>
parents:
814
diff
changeset
|
13 cat sub/b 2>/dev/null || echo "sub/b not present" |
3464
33b6c8193652
Don't use test -e in tests - sh doesn't like it on Solaris
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3418
diff
changeset
|
14 test -d sub || echo "sub not present" |
578 | 15 |
16 true |