Mercurial > hg
view tests/test-merge-revert @ 3400:d2b55e3c4e25
merge: if filemerge skips merge, report as updated
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Sun, 15 Oct 2006 16:18:09 -0500 |
| 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