Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-merge-revert @ 4510:e0bc2c575044
Issue a warning if "-r ." is used with two working directory parents.
Rationale for not aborting instead:
The first parent is usually more important as it is the local branch
during a merge and commands like 'hg diff' and 'hg diff -r.' behave still
identically (except for the warning of course).
Added a test for log -r. with one and two parents.
| author | Thomas Arendsen Hein <thomas@intevation.de> |
|---|---|
| date | Wed, 06 Jun 2007 19:05:18 +0200 |
| parents | 46280c004f22 |
| children |
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 --all hg diff hg status hg id hg update hg diff hg status hg id hg update -C 0 echo "changed file1" >> file1 hg update hg diff hg status hg id hg revert --all hg diff hg status hg id hg revert -r tip --all hg diff hg status hg id hg update -C hg diff hg status hg id