Re: [TSVN] Re: Bug applying patches?

John wrote:
> SteveKing <steveking <at> gmx.ch> writes:
>
>
>>>TMerge says 'Could not retrieve revision 374 of the file
>>>'c:\inetpub\wwwroot\wa\trunk\sourcecode\wwwroot\wa\support.cs'
>>>
>>>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.

Stefan

-- 
        ___
   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