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

Re: Paths in patch files

From: Grzegorz Kossakowski <grek_at_tuffmail.com>
Date: 2007-02-24 16:05:59 CET

Tobias Schäfer napisa³(a):
> On Thursday 08 February 2007 09:55, Grzegorz Kossakowski wrote:
>
>> I'm not getting this. I thought that Subversion is platform-independent
>> so clients should also produce/treat data (patches in this case) in
>> platform-independent. How it can be that there is no way to apply patch
>> created by quite popular client - Subclipse?
>>
>
> It is common practice to produce patches with relative paths. I don't know
> why subclipse creates them with absolute paths.
>
> In revision 8683 I implemented the following:
>
> When applying patches with absolute paths which don't exist TortoiseMerge
> now tries to guess the correct path by stripping prefixes from the paths in
> the patchfile.
> Example:
> Path in the patchfile: "/home/ts/my-working-copy/dir/file.txt"
> Path in the working copy: "c:\wc\dir\file.txt"
> Path of the directory to which the patch is being applied: c:\wc\
>
> TortoiseMerge tries the following paths:
> "c:\wc\"+"home\ts\my-working-copy\dir\file.txt" -> no matches
> "c:\wc\"+"ts\my-working-copy\dir\file.txt" -> no matches
> "c:\wc\"+"my-working-copy\dir\file.txt" -> no matches
> "c:\wc\"+"dir\file.txt" -> matches!
>
> If you like you can try tomorrows nightly build or else wait for 1.5.0
> http://nightlybuilds.tortoisesvn.net/latest/
>
I'm sorry it took so long to test your changes but I've been very busy.
I've downloaded nightly build and tested with fairy complex projects and
patches. All works like a charm.
Thanks!

-- 
Grzegorz Kossakowski
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: users-help@tortoisesvn.tigris.org
Received on Sat Feb 24 16:06:17 2007

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

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