Mercurial > hg > mercurial-crew-with-dirclash
diff tests/test-log.out @ 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.out +++ b/tests/test-log.out @@ -144,6 +144,23 @@ summary: b1 2 files updated, 0 files merged, 1 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) +% log -r . with two parents +warning: working directory has two parents, tag '.' uses the first +changeset: 3:e62f78d544b4 +parent: 1:3d5bf5654eda +user: test +date: Thu Jan 01 00:00:01 1970 +0000 +summary: b1 + +% log -r . with one parent +changeset: 5:302e9dd6890d +tag: tip +parent: 3:e62f78d544b4 +parent: 4:ddb82e70d1a1 +user: test +date: Thu Jan 01 00:00:01 1970 +0000 +summary: m12 + % log --follow-first changeset: 6:2404bbcab562 tag: tip