Mercurial > hg
view tests/test-committer.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 | 78a0dd93db0b |
children | 5c5d23d93447 |
line wrap: on
line source
changeset: 0:9426b370c206 tag: tip user: My Name <myname@example.com> date: Mon Jan 12 13:46:40 1970 +0000 summary: commit-1 changeset: 1:4997f15a1b24 tag: tip user: foo@bar.com date: Mon Jan 12 13:46:40 1970 +0000 summary: commit-1 changeset: 2:72b8012b424e tag: tip user: foobar <foo@bar.com> date: Mon Jan 12 13:46:40 1970 +0000 summary: commit-1 changeset: 3:35ff3067bedd tag: tip user: foo@bar.com date: Mon Jan 12 13:46:40 1970 +0000 summary: commit-1 abort: Please specify a username. transaction abort! rollback completed No username found, using user@host instead