Mercurial > hg
view tests/test-hardlinks-safety.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 | 14639c050251 |
children |
line wrap: on
line source
% no diff if hardlink % init adding foo to series file applying foo now at: foo adding bar to series file applying bar now at: bar 430ed4828a74fa4047bc816a25500f7472ab4bfe:foo 4e7abb4840c46a910f6d7b4d3c3fc7e5209e684c:bar % foo bar %%% 430ed4828a74fa4047bc816a25500f7472ab4bfe:foo % foo patch foo finalized without changeset message patch bar finalized without changeset message %%% 4e7abb4840c46a910f6d7b4d3c3fc7e5209e684c foo 430ed4828a74fa4047bc816a25500f7472ab4bfe bar % 4e7abb4840c46a910f6d7b4d3c3fc7e5209e684c lfoo 430ed4828a74fa4047bc816a25500f7472ab4bfe lbar %%% 4e7abb4840c46a910f6d7b4d3c3fc7e5209e684c foo % 4e7abb4840c46a910f6d7b4d3c3fc7e5209e684c lfoo