Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-merge-revert2 @ 4385:93a4e72b4f83
run-tests.py: pass -L/--label to simplemerge
This should give us conflict markers that don't change from one run
to another.
Remove some sed's/egrep's from some tests.
| author | Alexis S. L. Carvalho <alexis@cecm.usp.br> |
|---|---|
| date | Sat, 28 Apr 2007 17:55:45 -0300 |
| parents | 46280c004f22 |
| children |
line wrap: on
line source
#!/bin/sh mkdir t cd t hg init echo "added file1" > file1 echo "another line of text" >> 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 --no-backup --all hg diff hg status hg id hg update hg diff hg status hg id hg update -C 0 echo "changed file1 different" >> file1 hg update hg diff --nodates hg status hg id hg revert --no-backup --all hg diff hg status hg id hg revert -r tip --no-backup --all hg diff hg status hg id hg update -C hg diff hg status hg id