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

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

From: Stefan Kueng <tortoisesvn_at_gmail.com>
Date: Tue, 06 Jan 2009 21:57:37 +0100

David Ellingsworth wrote:
> 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.

Can you please report this on the Subversion mailing list?

The patch is created using the equivalent of
svn diff file > patchfile

If that patchfile can not be applied (without fuzzies even if the patch
should apply cleanly) with the standard patch tool, then that's a bug in
the Subversion library.


  oo  // \\      "De Chelonian Mobile"
 (_,\/ \_/ \     TortoiseSVN
   \ \_/_\_/>    The coolest Interface to (Sub)Version Control
   /_/   \_\     http://tortoisesvn.net
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].

Received on 2009-01-06 21:59:09 CET

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