tests/test-import-eol.out
author Steve Borho <steve@borho.org>
Fri, 17 Sep 2010 12:44:35 -0500
branchstable
changeset 12317 ed639917c825
parent 12067 a4fbbe0fbc38
permissions -rw-r--r--
test-eol-update: record new results as correct Changeset 0852da25a31b changed the result of this test. The 'hg update 0' command, which causes a merge of modified a.txt, now leaves a.txt in the EOLN format specified by .hgeol as it was committed in revision 0. Previously, it used the .hgeol contents from the working directory before the update.

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'
% auto EOL on LF file
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
applying eol.diff
'a\nyyyy\ncc\n\nd\ne'
% auto EOL on CRLF file
applying eol.diff
'a\r\nyyyy\r\ncc\r\n\r\nd\r\ne'
% auto EOL on new file or source without any EOL
applying noeol.diff
'noeol\r\nnoeol\n'
'neweol\nneweol\r\n'
adding b
% binary patch with --eol
applying bin.diff
'a\x00\nc\r\nd'