[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: Ricard Pillosu <ricard_at_netlands-project.net>
Date: 2005-01-12 13:42:16 CET

Will Dean wrote:

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

In this directory we have initialy 200 files. After passing a parser, it
creates other 200 files. It's the moment when it becomes "stuck". After
this, it seems to work fine (thanks to the internal TSVN cache).

I'm running the latest version (1.1.2) and in this case "stuck" means
that explorer windows become not-usable (does not respond) for about
one minute more or less. The test are in a computer without any other
program running. It's strange, but while the explorer window becomes
stuck the CPU and Memory seems right (low).

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

Thanks a lot, I didn't saw this option.

Ricard

---------------------------------------------------------------------
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:43:15 2005

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