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

RE: Windows: Patch can't process SVN Diff output

From: Sander Striker <striker_at_apache.org>
Date: 2003-05-27 20:51:20 CEST

> From: Mark Watts [mailto:mwatts3@stny.rr.com]
> Sent: Tuesday, May 27, 2003 8:49 PM

> When running the following against a local change
> C:\test\Svn diff > c:\temp\svndiff.txt
> I get the attached diff file as output. When using patch from
> http://unxutils.sourceforge.net/ to process this file and apply the patch
> back to a source tree patch fails. It would appear to fail because the diff
> file has mixed CRLF and LF chars.
> The chunk header (not sure it is called this) "@@ -1,4 +1,5 @@" is
> terminated by only a LF not a CRLF
> It also complains because the last line of the patch does not have a CRLF at
> the end.
> Now, I realize that the problem MAY in fact be in the version of patch that
> I am using but it does seem odd to m that the diff should contain mixed CRLF
> and LF chars in one file.

Ok, I can see that can be a problem. I'll fix this soonishly ;).


To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Tue May 27 20:52:11 2003

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

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