Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-merge-revert @ 1145:bd917e1a26dd
grep: change default to printing first matching rev.
Printing of every matching rev remains via --every-match/-e switch.
author | Bryan O'Sullivan <bos@serpentine.com> |
---|---|
date | Mon, 29 Aug 2005 08:24:06 -0700 |
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