Mercurial > hg
view tests/test-committer.out @ 9717:68a1b9d0663e
update: allow branch crossing without -c or -C, with no uncommitted changes
Update will now allow crossing branches within the same named branch,
when given a specific revision, if the working dir is clean, without
requiring the -c or -C option. Abort if no revision is given and
this would cross branches. Minor change to abort message if
uncommitted changes are found.
Modify test-update-branches and output to reflect the altered case. Modify
test-merge5.out to reflect the altered case. Modify
test-up-local-change.out with new message.
author | Stuart W Marks <smarks@smarks.org> |
---|---|
date | Thu, 05 Nov 2009 10:53:59 +0100 |
parents | c5b3d3e30de7 |
children | 951730b2b8ba |
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. No username found, using user@host instead transaction abort! rollback completed abort: empty username!