Follow-up thought:
The diff passed from TortoiseCVS to WinMerge is between
your current version and the CVS version, correct?
In that case, there is no correct filepath for the CVS version -- the
file comparison must be run on some local temporary copy.
So, the path in the patch will always be to some temporary filename.
It cannot be the filepath on the CVS server machine, as that is some
other machine whose local filesystem is not even accessible to
TortoiseCVS (much less WinMerge).
Cordially,
Perry
>To: tortoisecvs-users@...
>Subject: RE: [TortoiseCVS] Re: changing diff paramaters for Make Patch
>Date: Tue, 12 Jul 2005 04:08:26 +0000
>
>>From: Gids Goldberg
>>To: tortoisecvs-users
>>Subject: [TortoiseCVS] Re: changing diff paramaters for Make Patch
>>Date: Mon, 4 Jul 2005 10:44:53 +0100
>
>As long as the temp file contents are the same as the cvs file,
>the patch should be correct except for pointing to the wrong
>file -- is that true?
>
>This might be the outstanding WinMerge bug:
>
> BUG [ 1198614 ] Incorrect path to UTF8/16 file shown in generated patch
>
>
>http://sourceforge.net/tracker/index.php?func=detail&aid=1198614&group_id=13216&atid=113216
>
>for which I have made but not yet applied a patch -- but I am now getting
>off-topic from the TortoiseCVS mailing list :)
>
>Cordially,
>
>Perry
>
>
>
>>
>>Thanks for getting back to me, I had a go with the WinMerge however
>>the problem I found was that TortoiseCVS sends WinMerge a temp file to
>>work with when I select 'CVS diff' and the subsequent patch is against
>>the local file instead of CVS. How do others combine the two programs?
>>I'd still like to change the command for 'Make Patch' if possible as I
>>think it'd be the simplest way to do things.
>>
>>Thanks,
>>
>>Gids
>>
>>On 01/07/05, Alexey Lyubimov <alexeipobox@...> wrote:
>> > Hi Gids!
>> > How about using WinMerge (winmergeU.exe) as the
>> > external diff app? It has a seamless integration into
>> > TCVS and the unicode support under Win2k/XP.
>>
>>
>>-------------------------------------------------------
>>SF.Net email is sponsored by: Discover Easy Linux Migration Strategies
>>from IBM. Find simple to follow Roadmaps, straightforward articles,
>>informative Webcasts and more! Get everything you need to get up to
>>speed, fast. http://ads.osdn.com/?ad_idt77&alloc_id492&op=click
>>_______________________________________________
>>tortoisecvs-users mailing list
>>tortoisecvs-users@...
>>https://lists.sourceforge.net/lists/listinfo/tortoisecvs-users
>
>
>
>
>-------------------------------------------------------
>This SF.Net email is sponsored by the 'Do More With Dual!' webinar
>happening
>July 14 at 8am PDT/11am EDT. We invite you to explore the latest in dual
>core and dual graphics technology at this free one hour event hosted by HP,
>AMD, and NVIDIA. To register visit http://www.hp.com/go/dualwebinar
>_______________________________________________
>tortoisecvs-users mailing list
>tortoisecvs-users@...
>https://lists.sourceforge.net/lists/listinfo/tortoisecvs-users
|
