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

Re: Applying the results of svn diff to a disconnected repository

From: Olivier Sannier <obones_at_free.fr>
Date: 2006-08-25 11:48:03 CEST

Gavin Lambert wrote:
> Quoth Olivier Sannier <mailto:obones@free.fr>:
>
>>> Here is the output I get from "patch -i patchfile.diff":
>>>
>>> can't find file to patch at input line 5
>>> Perhaps you should have used the -p or --strip option?
>>>
> [...]
>
>>> This is the patch.exe from the UnxUtils package, under windows. I
>>> also tried with the one from MinGW, same result. I also tried with
>>> the -n option, it complains that there is only garbage in the file.
>>>
>>> Thanks for any pointers
>>>
>> Anyone ?
>>
>
> You might be running afoul of line endings -- the Windows svn client
> probably produces output with CRLF line endings, and the patch utils
> might be expecting to see only LF endings (since that's the UNIX
> convention). Try converting the file beforehand.
Tried that and it did not help.

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Fri Aug 25 11:47:50 2006

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.