Mercurial > hg
view tests/test-merge-revert2 @ 10579:f142fa3c0a8c stable
Make annotate --follow an alias for -f/--file to behave like in older versions
Since 98a0421b9e52 annotate follows copies/renames by default, but the output
of e.g. "annotate --follow --number" should not change without some
deprecation time.
| author | Thomas Arendsen Hein <thomas@intevation.de> |
|---|---|
| date | Wed, 03 Mar 2010 22:04:59 +0100 |
| parents | 93a4e72b4f83 |
| children | 4c94b6d0fb1c |
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 hg update hg diff --nodates 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