Mercurial > hg
view tests/test-convert-authormap.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 | 62154415821f |
| children |
line wrap: on
line source
initializing destination new repository Ignoring bad line in author map file authormap.txt: this line is ignored scanning source... sorting... converting... 0 foo Writing author map file new/.hg/authormap 0 user name=Long User Name changeset: 0:d89716e88087 tag: tip user: Long User Name date: Thu Jan 01 00:00:00 1970 +0000 summary: foo Ignoring bad line in author map file new/.hg/authormap: this line is ignored scanning source... sorting... converting... 0 foo 0 changeset: 0:d89716e88087 tag: tip user: Long User Name date: Thu Jan 01 00:00:00 1970 +0000 summary: foo