hg diff on win32 produces LF (not CR/LF) in 1.0

Andrey kamre at ngs.ru
Fri May 16 05:58:32 UTC 2008


Patrick Mézard <pmezard at gmail.com> wrote:
> 
> It should work with --binary
> 

I have tried to run "patch -p1 --binary < unix.diff" and 
it also doesn't work:
...
Hunk #1 FAILED at 8.
Hunk #2 FAILED at 294.
Hunk #3 FAILED at 334.
Hunk #4 FAILED at 478.
Hunk #5 FAILED at 1264.
5 out of 5 hunks FAILED
...
It works only if I convert line endings to CR/LF.

Patrick Mézard <pmezard at gmail.com> wrote:
> Just to be clear, you are patching CRLF files with a diff which diff lines 
> are made of CRLF or ? (I am not talking about the header or metadata, just 
> the hunk content).

> Or are you using win32ext ?

Yes, I am using win32ext, here is a piece of my 
Mercurial.ini:

[extensions]
hgext.win32text =

[encode]
; Encode files that don't contain NUL characters.
** = cleverencode:

[decode]
; Decode files that don't contain NUL characters.
** = cleverdecode:

So files in my working directory have CRLF. And I am 
trying to apply patch produced by "hg diff", but it 
contains LF only and patch utility fails.

May be it is possible to configure mercurial so that it 
produces CR/LF as it
did in version 0.95?

Now I have to convert line endings before using "patch" 
utility..


Regards,
  Andrey.



More information about the Mercurial mailing list