Mercurial > hg
view tests/test-import-eol.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 | 6c9dce20ed70 |
children | 1720d70cd6d4 |
line wrap: on
line source
adding .hgignore adding a % invalid eol applying eol.diff abort: Unsupported line endings type: LFCR % force LF applying eol.diff 'a\nyyyy\ncc\n\nd\ne' % force CRLF 1 files updated, 0 files merged, 0 files removed, 0 files unresolved applying eol.diff 'a\r\nyyyy\r\ncc\r\n\r\nd\r\ne' adding b % binary patch with --eol applying bin.diff 'a\x00\nc'