Mercurial > hg > mercurial-crew-with-dirclash
annotate tests/test-encode @ 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 |
|---|---|
| 1258 | 1 #!/bin/sh |
| 2 | |
| 3 hg init | |
| 4 | |
| 5 cat > .hg/hgrc <<EOF | |
| 6 [encode] | |
| 7 *.gz = gunzip | |
| 8 | |
| 9 [decode] | |
| 10 *.gz = gzip | |
| 11 | |
| 12 EOF | |
| 13 | |
| 14 echo "this is a test" | gzip > a.gz | |
| 15 hg add a.gz | |
|
1933
7544700fd931
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1258
diff
changeset
|
16 hg ci -m "test" -d "1000000 0" |
| 1258 | 17 echo %% no changes |
| 18 hg status | |
| 19 touch a.gz | |
| 20 | |
| 21 echo %% no changes | |
| 22 hg status | |
| 23 | |
| 24 echo %% uncompressed contents in repo | |
|
3853
c0b449154a90
switch to the .hg/store layout, fix the tests
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1933
diff
changeset
|
25 hg debugdata .hg/store/data/a.gz.d 0 |
| 1258 | 26 |
| 27 echo %% uncompress our working dir copy | |
| 28 gunzip < a.gz | |
| 29 | |
| 30 rm a.gz | |
| 31 hg co | |
| 32 | |
| 33 echo %% uncompress our new working dir copy | |
| 34 gunzip < a.gz |