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

svn diff produces a patch which does not reapply cleanly

From: David Ellingsworth <david_at_identd.dyndns.org>
Date: Tue, 6 Jan 2009 19:57:19 -0500

While using TortoiseSVN 1.5.6 build 14908, I encountered an error
while trying to apply a patch with TortoiseMerge that was previously
created using TortoiseSVN's "Create Patch" feature. While I was unable
to apply the patch with TortoiseMerge, I did succeed while using the
standard patch command, but not without any fuzz.

The reply to the issue I posted on TortioseSVN"s user mailing list
indicates this is an error in svn's core since the patch generated is
equivalent to "svn diff file > patchfile". I have verified this using
svn client 1.5.1 and 1.5.5.

Attached are some files I created which are capable of reliably
reproducing the problem. The files are as follows: the original
file(test.txt), the updated file(test_v2.txt), and the associated
patch file generated from svn diff(test.patch).

For reference purposes, the original report posted to TortioseSVN's
user mailing list can be found here:
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=1007806

Regards,

David Ellingsworth

Received on 2009-01-07 08:54:19 CET

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