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

'svn diff' crates patch that cannot be applied back

From: ĻURDINA Michal <michal.durdina_at_assetsoft.sk>
Date: 2004-12-12 17:46:11 CET


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

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 not more than one file but not all had this problem.

How this is possible? Can you please tell me what am I doing wrong? Plain unix diff works correctly.

My versions:
svn, version 1.1.1 (r11581)
diff - GNU diffutils version 2.7
patch 2.5

Thank you,

To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Mon Dec 13 16:34:39 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.