Mercurial > hg
view tests/test-merge-revert @ 3987:c6f10448278f
test-manifest-merging: we only need to remove files
| author | Benoit Boissinot <benoit.boissinot@ens-lyon.org> |
|---|---|
| date | Sun, 24 Dec 2006 22:28:01 +0100 |
| parents | 890e285c52a1 |
| children | 9dcf9d45cab8 |
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 HGMERGE=merge 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 cd ..; /bin/rm -rf t