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

Re: "The Patch Seems Outdated! The File Line...And The Pathcline Do Not Match" - But they do!

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: Mon, 01 Sep 2008 13:19:32 +0200

BenTaylor wrote:
> Hi Stefan,
>
> I downloaded the zip, extracted it, and ran TortoiseMerge. I then
> selected "Apply Unified Diff" and located the diff/patch file and the
> directory of the clean source tree. Now, when I try and preview the
> patched file, I get a different error message, which is "The system
> cannot find the file specified."

That error message is expected, well, at least if the patch is outdated
(or appears to be for TortoiseMerge):
TortoiseMerge tries to find TortoiseProc to download the correct version
of the file to do a three-way merge. Only if that fails, you'll get the
"the patch seems outdated" error. But in your 32-bit case, it can't find
the 32-bit TortoisProc binary and that's the error you're seeing here.
Which means it's the same problem as before...

> Should I try uninstalling the 64 bit version and installing the 32 bit
> version just to make sure?

That won't help much.

> Also, I just thought of some other (maybe) relevant information. The
> "subversion" I am connecting to is on CodePlex. It is not a *real*
> Subversion, it is an implementation on top of TFS (I believe). Is it
> possible that this could be their bug?

Hmm - if it's on CodePlex it means it's free stuff:
please zip the patchfile and send it here, including the info about
which project you're trying to apply the patch to (url for checkout,
which revision is your working copy on).
That way I can reproduce the problem

Stefan

-- 
       ___
  oo  // \\      "De Chelonian Mobile"
 (_,\/ \_/ \     TortoiseSVN
   \ \_/_\_/>    The coolest Interface to (Sub)Version Control
   /_/   \_\     http://tortoisesvn.net

Received on 2008-09-01 13:19:44 CEST

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