Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-merge-revert @ 1108:7a75d8fbbdaf
Remove some options from 'hg grep':
-Z (we have -0 as in locate)
-a (use "-r 0:tip" instead, or always grep all unless -r is given)
-e (we have the PATTERN argument)
-v (doesn't work, and this is more of a job for 'hg cat|grep')
-s (we have -q/--quiet)
-f (should be always enabled if -l used, or enable on -v/--verbose)
| author | Thomas Arendsen Hein <thomas@intevation.de> |
|---|---|
| date | Sat, 27 Aug 2005 23:36:25 +0200 |
| parents | 9c918287d10b |
| children | 7544700fd931 |
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 "0 0" -u user echo "changed file1" >> file1 hg commit -m "changed file1" -d "0 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