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

Re: [TSVN] Re: Bug applying patches?

From: SteveKing <steveking_at_gmx.ch>
Date: 2005-06-06 20:43:00 CEST

John wrote:
> SteveKing <steveking <at> gmx.ch> writes:
>>>TMerge says 'Could not retrieve revision 374 of the file
>>>There seems to be a confusion between working copy path and repos path.
>>>'c:\inetpub\wwwroot\wa' is the working copy,
>>>and '\trunk\sourcecode\wwwroot\wa'
>>- How was the patch created?
>>- Can you provide the patchfile? I need to look at the "Index:" and the
>>three lines below that.
> I didn't make the patch, so I'll chase it up tomorrow. The top three lines are:
> Index: tags/v2.7/sourcecode/wwwroot/webActions/AttribPicker.ascx.cs
> ===================================================================
> --- tags/v2.7/sourcecode/wwwroot/webActions/AttribPicker.ascx.cs
> (revision 374)
> +++ tags/v2.7/sourcecode/wwwroot/webActions/AttribPicker.ascx.cc
> (working copy)

That's a either diff between a working copy and an URL, not a diff
between the wc and its base. Or the diff wasn't done from the wc root
but one level above it (that's why 'tags' is in the path). And with such
diffs the patch can't work.


   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.tigris.org
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Mon Jun 6 20:43:44 2005

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.