Mercurial > hg
view tests/test-merge-revert @ 2394:a8f1049d1d2d
hgweb: fix errors and warnings found by pychecker
- fix missing import
- use type_ instead of type
- remove unused variable
| author | Benoit Boissinot <benoit.boissinot@ens-lyon.org> |
|---|---|
| date | Sun, 04 Jun 2006 12:19:51 +0200 |
| parents | 7544700fd931 |
| children | 890e285c52a1 |
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 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 hg diff hg status hg id hg revert -r tip hg diff hg status hg id hg update -C hg diff hg status hg id cd ..; /bin/rm -rf t