You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by Denis Gervalle <dg...@softec.st> on 2009/07/23 20:43:41 UTC

File produce by svn diff rejected by patch

Following my IRC discussion with PeterS, you will find attached a Zip  
file containing the files that should help reproducing this issue.

Here is the test case:

1) svn http://svn.xwiki.org/svnroot/xwiki/platform/skins/tags/xwiki-skin-toucan-1.22@22041
2) replace src/main/resources/toucan/toucan.css by the file  
toucan.css.new from the zip attached (note that toucan.css in the zip  
was the original file from the repository)
2) svn diff > diff.patch from the root of WC. I get the diff.patch  
file in the zip attached
3) svn -R revert .
4) patch -p0 < diff.patch

Result:
patching file src/main/resources/toucan/toucan.css
patch: **** unexpected end of file in patch

In the zip file, you will also find my current workaround, a file  
produced by diff -u where I have replaced the first two line, with the  
one of diff.patch.
I have experience this using the binarie for Mac OSX from openCollabNet.
I had the lastest version of Mac OSX and tried version 1.5.2 and 1.6.3  
with exactly the same result.

Hope this helps, let me know if you found anything or need more  
information.

Denis

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

Re: File produce by svn diff rejected by patch

Posted by Peter Samuelson <pe...@p12n.org>.
[Denis Gervalle]
> Following my IRC discussion with PeterS, you will find attached a Zip  
> file containing the files that should help reproducing this issue.

Thanks, Denis.  I can reproduce this in 1.6.3 on Linux, from the two
files in your zipfile.
-- 
Peter Samuelson | org-tld!p12n!peter | http://p12n.org/