Mercurial > hg > mercurial-crew-with-dirclash
annotate tests/test-permissions @ 2548:0229ff95faec
Clarified message when nothing to merge is seen.
Sometimes there's a non-tip head waiting to be merged, especially after
pulling in remote changes while there were local modifications in the working
directory which had to be committed before 'hg merge' can work.
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Mon, 03 Jul 2006 19:14:29 +0200 |
parents | b72562060e45 |
children | c0b449154a90 |
rev | line source |
---|---|
1497 | 1 #!/bin/sh |
2 | |
3 hg init | |
4 echo foo > 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:
1497
diff
changeset
|
6 hg commit -m "1" -d "1000000 0" |
1497 | 7 hg verify |
2223 | 8 chmod -r .hg/data/a.i |
1497 | 9 hg verify 2>/dev/null || echo verify failed |
2223 | 10 chmod +r .hg/data/a.i |
1497 | 11 hg verify 2>/dev/null || echo verify failed |
2223 | 12 chmod -w .hg/data/a.i |
1497 | 13 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
|
14 hg commit -m "2" -d "1000000 0" 2>/dev/null || echo commit failed |
1497 | 15 |