Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-merge-revert @ 5278:70e9a527cc61
convert: avoid dirstate checks; add a test
During a conversion, the dirstate contents are not consistent - there
are files that may be missing from the dirstate and there may be files
that shouldn't be in the dirstate.
While this is not fixed, don't mark files as added - put them directly
in state 'n'ormal.
| author | Alexis S. L. Carvalho <alexis@cecm.usp.br> |
|---|---|
| date | Sat, 01 Sep 2007 02:49:18 -0300 |
| parents | 46280c004f22 |
| children |
line wrap: on
line source
#!/bin/sh mkdir t cd t hg init echo "added file1" > file1 echo "added file2" > file2 hg add file1 file2 hg commit -m "added file1 and file2" -d "1000000 0" -u user echo "changed file1" >> file1 hg commit -m "changed file1" -d "1000000 0" -u user hg -q log hg id hg update -C 0 hg id echo "changed file1" >> file1 hg id hg revert --all hg diff hg status hg id hg update hg diff hg status hg id hg update -C 0 echo "changed file1" >> file1 hg update hg diff hg status hg id hg revert --all hg diff hg status hg id hg revert -r tip --all hg diff hg status hg id hg update -C hg diff hg status hg id