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

Re: [TSVN] Another idea for the Merge pot

From: Will Dean <svn_at_indcomp.co.uk>
Date: 2005-01-20 16:34:39 CET

At 14:57 20/01/2005 +0000, you wrote:

>BTW. If I select 2 WC folders and try to diff them in TSVN I get "Access
>is denied" in TMerge. Looks like a bug.

It's a bit beyond me this one. TortoiseProc calls CUtils::StartDiffViewer
with the two directory names, but StartDiffViewer is an amazingly complex
function which re-uses its parameters in funny ways, and in this situation
ends-up calling TMerge with a rather bizarre command line, which TMerge
chokes on.

I think the bug is in StartDiffViewer, but I am so scared of that function
(and its bastard cousin, StartExtMerge) that I'd rather leave this to
Stephan...

I'm not actually sure whether or not TMerge does anything useful if asked
to diff two folders, so we're possibly only going to achieve a change in
the error message.

Will

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Thu Jan 20 16:37:52 2005

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