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

Patch created with "Create Patch" fails to apply using "Apply Patch"

From: David Ellingsworth <david_at_identd.dyndns.org>
Date: Tue, 6 Jan 2009 11:20:48 -0500

I've been having problems applying a patch that was created by
TortoiseSVN. The error message from TortoiseMerge is similar to the
following:

The patch seems outdated! The file line
line_4
and the patch line
line_2
do not match!

I've created and attached files which are capable of reproducing the
error. They are as follows: the original file(test.txt), the modified
version(test_v2.txt), and the patch file(test.patch) generated from
the using "Create Patch". If I apply the patch using the standard
patch application provided with cygwin, it applies with a fuzz of 2
and messages indicating hunk #2 succeeded at 7 (offset 2 lines), with
subsequent hunks succeeding at offsets of -2, 2, -2, 2, -2, etc.

FYI, I am using TortoiseSVN: 1.5.6 build 14908 and tools.

I suspect this is a bug with application used to create the patch
since the patch fails to apply using the standard patch application.

Regards,

David Ellingsworth

Received on 2009-01-06 17:51:14 CET

This is an archived mail posted to the TortoiseSVN Users mailing list.