Mercurial > hg
view tests/test-merge-revert2 @ 3698:a9090b264250
qrefresh: respect --git even in the slow path
| author | Alexis S. L. Carvalho <alexis@cecm.usp.br> |
|---|---|
| date | Mon, 20 Nov 2006 19:32:41 -0200 |
| parents | 403ebd4d92d7 |
| children | 9dcf9d45cab8 |
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 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