Re: performance of "resolve conflict" for large files?

jens.scheidtmann@bayerbbs.com wrote:

> I have a working copy with a rather large text file (10 MB) which now
> has had a conflict.
>
> I nearly submitted a bug report, as "resolve conflict" called from
> TMerge took a very noticable amount of time (1-2 min).
> During this time TortoiseProc.exe showed up in Task Manager to consume
> ~100% CPU and it looked like it ate up memory slowly (at a rate of
> approximately 50-100 kB/s).
> E/A (Reading) increased gradually but slowly. But after some time it
> finished by itself.
>
> Have others experienced similar problems?
> Do you think I have to blame my virus scanner (again)?

Here's what happens when you click on "Mark as resolved" from TortoiseMerge:

TortoiseMerge:
* check if there's still a conflict inside the file
* if a conflict is still there, show a warning dialog
* check if the file is modified, if it is, save the file first
* call TortoiseProc

TortoiseProc:
* again, check if there's still a conflict inside the file by searching
for the conflict marker string ("<<<<<<<")
* show a warning dialog if a marker is found
* mark the conflicted file as resolved

For very big files, those two checks can take quite a while.
I think I should add another command line param to skip the check when
called from TortoiseMerge, because TortoiseMerge can do that check
itself already - the check in TortoiseProc will still be needed for
third-party merging applications if they don't do that check themselves.

I've filed an issue about this:
http://issues.tortoisesvn.net/?do=details&id=328

Stefan

-- 
        ___
   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.net
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org