Mercurial > hg
annotate tests/test-permissions @ 7104:9514cbb6e4f6
bdiff: normalize the diff (issue1295)
When the common part of a diff can be moved forward, move it forward.
Otherwise we don't get deterministic results (it would depends on the way we
split for the recursion).
That way we get identical hunks when doing the same change, it helps to solve
issue1295 (inconsistent diffs on different side during a merge).
author | Benoit Boissinot <benoit.boissinot@ens-lyon.org> |
---|---|
date | Tue, 14 Oct 2008 20:13:53 +0200 |
parents | 6f750e76fb46 |
children | 0df098871e3d |
rev | line source |
---|---|
1497 | 1 #!/bin/sh |
2 | |
5214
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 |
5519
b688d264a294
test-permissions: add a chmod +w to allow the directory to be removed
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
5215
diff
changeset
|
16 chmod -w . |
5215
74723744d8e0
fix test-permissions output
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
5214
diff
changeset
|
17 hg diff --nodates |
5519
b688d264a294
test-permissions: add a chmod +w to allow the directory to be removed
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
5215
diff
changeset
|
18 chmod +w . |
7099
6f750e76fb46
dirstate.walk: skip unreadable directories (issue1213)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
5519
diff
changeset
|
19 |
6f750e76fb46
dirstate.walk: skip unreadable directories (issue1213)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
5519
diff
changeset
|
20 chmod +w .hg/store/data/a.i |
6f750e76fb46
dirstate.walk: skip unreadable directories (issue1213)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
5519
diff
changeset
|
21 mkdir dir |
6f750e76fb46
dirstate.walk: skip unreadable directories (issue1213)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
5519
diff
changeset
|
22 touch dir/a |
6f750e76fb46
dirstate.walk: skip unreadable directories (issue1213)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
5519
diff
changeset
|
23 hg status |
6f750e76fb46
dirstate.walk: skip unreadable directories (issue1213)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
5519
diff
changeset
|
24 chmod -rx dir |
6f750e76fb46
dirstate.walk: skip unreadable directories (issue1213)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
5519
diff
changeset
|
25 hg status |