RE: Large files no longer working with TortoiseMerge 1.6

Thanks Stefan.

I'll continue to look at & use workarounds for now, and follow up later if I have better repro steps. Currently, this is only happening on my machine, but I'm also the only one who has upgraded to 1.6.

Copies of these jumbo files are available on request if anyone is interested. They zip down to 3.7 MB.

-Eric
 

-----Original Message-----
From: Stefan Küng [mailto:tortoisesvn_at_gmail.com]
Sent: Saturday, March 28, 2009 8:09 AM
To: users_at_tortoisesvn.tigris.org
Subject: Re: Large files no longer working with TortoiseMerge 1.6

Eric Hirst wrote:
> [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.

I can't reproduce this issue. I've tried with two 60MB text files and
got an out-of-memory exception.
Slightly smaller files don't show the error you got but just show those
annoying spurious diff lines.

I've committed a fix for those spurious diff lines to Subversion and
proposed if for backporting to 1.6.x.

Stefan

-- 
       ___
  oo  // \\      "De Chelonian Mobile"
 (_,\/ \_/ \     TortoiseSVN
   \ \_/_\_/>    The coolest Interface to (Sub)Version Control
   /_/   \_\     http://tortoisesvn.net
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=1457141
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=1483148
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].