Mercurial > hg
view tests/test-diff-newlines.t @ 13624:78cc35e75ecc stable
eol: do not abort when win32text is found, only warn
The win32text extension does not break eol or vice-versa, so it is not a fatal
error to have both of them enabled. It's just folly. So spewing warnings in
this condition is preferrable to aborting. When both extensions are enabled,
the user now sees:
% hg st
the eol extension is incompatible with the win32text extension
win32text is deprecated: http://mercurial.selenic.com/wiki/Win32TextExtension
M hgext/eol.py
author | Steve Borho <steve@borho.org> |
---|---|
date | Sun, 13 Mar 2011 10:03:06 -0500 |
parents | 05fffd665170 |
children | cf0f3cb8a332 |
line wrap: on
line source
$ hg init $ python -c 'print "confuse str.splitlines\nembedded\rnewline"' > a $ hg ci -Ama -d '1 0' adding a $ echo clean diff >> a $ hg ci -mb -d '2 0' $ hg diff -r0 -r1 diff -r 107ba6f817b5 -r 310ce7989cdc a --- a/a Thu Jan 01 00:00:01 1970 +0000 +++ b/a Thu Jan 01 00:00:02 1970 +0000 @@ -1,2 +1,3 @@ confuse str.splitlines embedded\rnewline (esc) +clean diff