Mercurial > hg > mercurial-crew-with-dirclash
diff tests/test-log @ 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 | f80cf8b7bbd9 |
children |
line wrap: on
line diff
--- a/tests/test-log +++ b/tests/test-log @@ -47,6 +47,7 @@ hg log -pv d # log --follow tests hg init ../follow cd ../follow + echo base > base hg ci -Ambase -d '1 0' @@ -71,8 +72,15 @@ hg log -f -r 1:tip hg up -C 3 hg merge tip + +echo % log -r . with two parents +hg log -r . + hg ci -mm12 -d '1 0' +echo % log -r . with one parent +hg log -r . + echo postm >> b1 hg ci -Amb1.1 -d'1 0'