Learn how easy it is to sync an existing GitHub or Google Code repo to a SourceForge project! See Demo

Close

#165 SVN Merge integration bug on 64 bit Win

open
nobody
None
5
2012-09-23
2012-02-13
Som-Som
No

In KDiff3 Windows installer you can select Integration/SVN Merge tool. That works fine on 32 bit Win. On 64 bit, however, that does not work, as Win7 installs 32 bit KDiff3 to "c:\Program Files (x86)\KDiff3\" by default, while diff3_cmd.bat refers to the traditional location.

The easiest fix is to change diff3_cmd.bat a bit:
if exist "C:\Program Files (x86)\KDiff3" (
SET DIFF3="C:\Program Files (x86)\KDiff3\kdiff3.exe"
) else (
SET DIFF3="C:\Program Files\KDiff3\kdiff3.exe"
)

Discussion

  • Som-Som
    Som-Som
    2012-08-13

    Now a 64 bit version of KDiff3 is released for Windows. The trouble is that KDiff3 is still set up into x86 directory in the following cases:

    1. If you already have a KDiff3 installation in x86 directory. You need to uninstall KDiff3 first to have the 64 bit Program Files directory the default on installation. (Actually in the installer it is relatively easy to check the existence of x86 directory and start uninstall.exe if found.)

    2. If you use a 32 bit browser (most browsers are released in 32 bit variant due to plug-in issues) then by default SF offers 32 bit binaries.

    So it is better to fix the bat file as described above. (Maybe making the x86 the less preferred path.)