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

Re: 'svn diff' crates patch that cannot be applied back

From: Mikhail Sobolev <mss_at_mawhrin.net>
Date: 2004-12-13 10:31:53 CET

On Sun, Dec 12, 2004 at 05:58:14PM +0100, ?URDINA Michal wrote:
> it is odd that when I used svn diff, it created patch file, that could not be completely applied. All I did was:
> 1. svn checkout
> 2. modify file
> 3. svn diff file > patch.diff
> 4. svn revert file
> 5. patch -u -i patch.diff file
> Result:
> patching file `file'
> Hunk #2 FAILED at 25.
> 1 out of 3 hunks FAILED -- saving rejects to file.rej
> I tested this on many files and more than one file but not all had this problem.
> How is this possible? Can you please tell me what am I doing wrong?
> Plain unix diff works correctly.
Is it possible that you are using some keywords in the files that



Received on Mon Dec 13 10:34:06 2004

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.