Mercurial > hg > mercurial-crew-with-dirclash
annotate tests/test-permissions @ 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 | 74723744d8e0 |
children |
rev | line source |
---|---|
1497 | 1 #!/bin/sh |
2 | |
5217
551958d5082c
testcase for issue705 (fixed by 316ce5e85b3e)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
3853
diff
changeset
|
3 hg init t |
551958d5082c
testcase for issue705 (fixed by 316ce5e85b3e)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
3853
diff
changeset
|
4 cd t |
1497 | 5 echo foo > a |
6 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:
1497
diff
changeset
|
7 hg commit -m "1" -d "1000000 0" |
1497 | 8 hg verify |
3853
c0b449154a90
switch to the .hg/store layout, fix the tests
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
2223
diff
changeset
|
9 chmod -r .hg/store/data/a.i |
1497 | 10 hg verify 2>/dev/null || echo verify failed |
3853
c0b449154a90
switch to the .hg/store layout, fix the tests
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
2223
diff
changeset
|
11 chmod +r .hg/store/data/a.i |
1497 | 12 hg verify 2>/dev/null || echo verify failed |
3853
c0b449154a90
switch to the .hg/store layout, fix the tests
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
2223
diff
changeset
|
13 chmod -w .hg/store/data/a.i |
1497 | 14 echo barber > a |
1933
7544700fd931
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1497
diff
changeset
|
15 hg commit -m "2" -d "1000000 0" 2>/dev/null || echo commit failed |
5217
551958d5082c
testcase for issue705 (fixed by 316ce5e85b3e)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
3853
diff
changeset
|
16 chmod -w ../t |
5219
74723744d8e0
fix test-permissions output
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
5217
diff
changeset
|
17 hg diff --nodates |