Mercurial > hg > mercurial-crew-with-dirclash
annotate tests/test-copy @ 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 | c0b449154a90 |
children |
rev | line source |
---|---|
544
3d4d5f2aba9a
Remove bashisms and use /bin/sh instead of /bin/bash.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
464
diff
changeset
|
1 #!/bin/sh |
363 | 2 |
3 hg init | |
4 echo a > 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 "1" -d "1000000 0" |
363 | 7 hg status |
8 hg copy a b | |
9 hg status | |
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 --debug commit -m "2" -d "1000000 0" |
1043 | 11 echo "we should see two history entries" |
12 hg history -v | |
13 echo "we should see one log entry for a" | |
363 | 14 hg log a |
1043 | 15 echo "this should show a revision linked to changeset 0" |
3853
c0b449154a90
switch to the .hg/store layout, fix the tests
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
2223
diff
changeset
|
16 hg debugindex .hg/store/data/a.i |
1043 | 17 echo "we should see one log entry for b" |
18 hg log b | |
19 echo "this should show a revision linked to changeset 1" | |
3853
c0b449154a90
switch to the .hg/store layout, fix the tests
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
2223
diff
changeset
|
20 hg debugindex .hg/store/data/b.i |
1043 | 21 |
22 echo "this should show the rename information in the metadata" | |
3853
c0b449154a90
switch to the .hg/store layout, fix the tests
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
2223
diff
changeset
|
23 hg debugdata .hg/store/data/b.d 0 | head -3 | tail -2 |
1043 | 24 |
3853
c0b449154a90
switch to the .hg/store layout, fix the tests
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
2223
diff
changeset
|
25 $TESTDIR/md5sum.py .hg/store/data/b.i |
462 | 26 hg cat b > bsum |
1923
7d83a351a936
fix testsuite for freebsd and one timingissue
Peter van Dijk <peter@dataloss.nl>
parents:
1252
diff
changeset
|
27 $TESTDIR/md5sum.py bsum |
462 | 28 hg cat a > asum |
1923
7d83a351a936
fix testsuite for freebsd and one timingissue
Peter van Dijk <peter@dataloss.nl>
parents:
1252
diff
changeset
|
29 $TESTDIR/md5sum.py asum |
363 | 30 hg verify |