Large files no longer working with TortoiseMerge 1.6

[My first post to this forum... Hi, all.]

Some of the files we use with TortoiseMerge are very large (~80MB).

When diffing these files in version 1.5.9, we would see a few blue lines suggesting differences, even in spots where they were in fact identical.
This was a minor annoyance but did not otherwise interfere with our work.

In version 1.6, TortoiseMerge no longer works at all for these files.
The error is of the form:

---------------------------
TortoiseMerge
---------------------------
The diffing engine aborted because of an error:
The file
'C:\temp\run.bsl' changed unexpectedly during diff
---------------------------
OK
---------------------------

When this error takes place, TortoiseMerge.exe is using about 400MB memory, with a peak memory usage or 525 MB. The process closes after I dismiss the dialog.

The error is the same whether or not I check the "Use one-pane view as default" settings option.

WinDiff (eek) works fine with these files, with about 1/2 the memory footprint.

I am aware that we could refactor our test process to break this into smaller files. However, we'd prefer not to. I'd much prefer to see TortoiseMerge revert to its old behavior, or fix the issue entirely.

Thanks for any feedback,

Eric

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=1449398

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2009-03-28 08:12:46 CET