Mercurial > hg
view tests/test-parseindex.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 | 6563438219e3 |
children | 4c94b6d0fb1c |
line wrap: on
line source
changeset: 0:9c2cf2b35aa7 user: test date: Mon Jan 12 13:46:40 1970 +0000 summary: add foo changeset: 1:3756a9556b89 tag: tip user: test date: Mon Jan 12 13:46:41 1970 +0000 summary: change foo 2 revisions: 9c2cf2b35aa7 3756a9556b89