tests/test-import-eol.out
author Greg Ward <greg-hg@gerg.ca>
Mon, 15 Feb 2010 15:25:29 -0500
branchstable
changeset 10505 b3311e26f94f
parent 10130 7936cd261dc9
child 12067 a4fbbe0fbc38
permissions -rw-r--r--
merge: fix --preview to show all nodes that will be merged (issue2043). Formerly, it omitted nodes that were not descendants of the least common ancestor of the two merge parents, even though those nodes contribute to the merge. The new algorithm uses revlog.findmissing() instead of ancestor() + nodesbetween().

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'