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

Re: [TSVN] Resolve conflict request feature

From: Will Dean <svn_at_indcomp.co.uk>
Date: 2005-01-12 11:40:39 CET

At 11:34 12/01/2005 +0100, you wrote:

>- In large directories (about 400 files) explorer.exe get stuck. We have
>resolved it disabling icons for that directory

Which version of TSVN are you running? And how 'stuck' was 'stuck'. I
don't think you should have much problem with 400 files in a directory on a
local drive with version 1.1.2.

>- When we resolve a conflict within "TortoiseMerge" we save the resolved
>file but we still have to navigate with the explorer to the directory
>where the file lies and select the option "resolve".

You can set an option in TMerge to do this for you when you save the merged
file. Have a look in the TMerge settings.

Cheers,

Will

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Wed Jan 12 13:17:11 2005

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