[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: Incorrect diff generation using SVN "internal" diff method

From: Sergey Proskurnya <alaley_at_gmail.com>
Date: Fri, 05 Dec 2008 18:06:32 +0200

Stefan Sperling пишет:
> Most significantly, the gnu diff uses windows line-endings
> and the svn diff uses unix-style line-endings.
>
> svn diff tries to generate the correct eol style automatically,
> and can be confused in some cases.
>
> Perhaps your patch program expects windows line-endings?
> Try running the svn diff through a newline converter to see if
> patch will eat it then.
>
> I would also try playing with options such as --ignore-eol-style
> and the svn:eol-style property to see if it's possible to get svn
> to produce a usuable diff by default. (I'm not sure if svn diff
> heeds the eol-style property, I could not find an answer during
> a quick glance into the source.)
>
> Stefan

Thanks for the hint!
Adding "-x --ignore-eol-style" option does not help,
"svn diff -x --ignore-eol-style" produce exactly the same
output as "svn diff".

Anyway, it seems strange that problem may be caused by incorrect
EOL handling by SVN - it perfectly handle EOL things automatically.

"svn diff -x -w" does not help also.

Thanks,
Serge.

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=980161

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2008-12-08 10:41:09 CET

This is an archived mail posted to the Subversion Users mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.