Memory configuration for mergetool

[dkoontz]

I need to merge some rather large (160+ MB) files. Using mergetool I can diff the files, but trying a 3-way merge fails with an out of memory error. Is there a way to pass a max memory setting to the mergetool?

[psantosl]

Hi,

The memory usage is not constrained by the size of the file but the number of differences.

Are the 3 contributors TOO different?? Maybe some EOLs wrongly changed from one version to next?? Please double check because it can be the case.

If everything fails and while we check the problem, in order to let you continue, configure KDiff3.exe which is a free mergetool. It is not as precise as ours but it will do with this weird case since it is more conservative with mem usage. This article here: http://codicesoftware.blogspot.com/2011/05/setting-up-plastic-scm-with-external.html shows you how to setup BC2, but it would be the same for KDiff3.

[dkoontz]

The 3 contributors are almost identical, I made 2 copies of the base file and modified about 3 lines in each one. I can send you the files if you'd like to have a test case.

[dkoontz]

I tried KDiff3 on my files and it will perform the merge, but while writing the merged file, it too crashes.

[psantosl]

Uhm... then looks like something really weird is going on.

Can you send me the 3 files and we'll take a look at it next Tuesday (there's a bank holiday on Monday)?

If you prefer I can give you an email.

[manu]

You can also write to support at codicesoftware dot com and we will try to reproduce the memory lack with your files.