Mercurial > hg
comparison tests/test-import-eol.out @ 8817:6c9dce20ed70
Fixed patch.eol bug that truncated all patched lines to one character
Also updated the import-eol test to test with lines longer than one character,
and also empty lines.
author | Colin Caughie <c.caughie@indigovision.com> |
---|---|
date | Tue, 16 Jun 2009 16:22:42 +0100 |
parents | ac92775b3b80 |
children | 1720d70cd6d4 |
comparison
equal
deleted
inserted
replaced
8816:a7c4eb0cc0ed | 8817:6c9dce20ed70 |
---|---|
3 % invalid eol | 3 % invalid eol |
4 applying eol.diff | 4 applying eol.diff |
5 abort: Unsupported line endings type: LFCR | 5 abort: Unsupported line endings type: LFCR |
6 % force LF | 6 % force LF |
7 applying eol.diff | 7 applying eol.diff |
8 'a\ny\nc\nd\nz' | 8 'a\nyyyy\ncc\n\nd\ne' |
9 % force CRLF | 9 % force CRLF |
10 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | 10 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
11 applying eol.diff | 11 applying eol.diff |
12 'a\r\ny\r\nc\r\nd\r\nz' | 12 'a\r\nyyyy\r\ncc\r\n\r\nd\r\ne' |
13 adding b | 13 adding b |
14 % binary patch with --eol | 14 % binary patch with --eol |
15 applying bin.diff | 15 applying bin.diff |
16 'a\x00\nc' | 16 'a\x00\nc' |