Mercurial > hg
view tests/test-merge-revert2 @ 3207:0790dce2f3a8
Add lookup method to filectx
| author | Brendan Cully <brendan@kublai.com> |
|---|---|
| date | Fri, 29 Sep 2006 16:26:09 -0700 |
| parents | 096f1c73cdc3 |
| children | 403ebd4d92d7 |
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 HGMERGE=merge hg update #hg diff --nodates | sed -e "s/\(<<<<<<<\) .*/\1/" -e "s/\(>>>>>>>\) .*/\1/" hg diff --nodates | sed -e "s/\(<<<<<<<\|>>>>>>>\) .*/\1/" 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 cd ..; /bin/rm -rf t