Saving Merges Using KDiff3 with TortoiseSVN

Question

Desiring to use KDiff3 as a conflict resolution tool for TortoiseSVN, I followed the instructions here and here to configure TortoiseSVN to use KDiff3. So my merge tool options in TortoiseSVN:

C:\Program Files (x86)\KDiff3\kdiff3.exe %base %mine %theirs -o %merged --L1 %bname --L2 %yname --L3 %tname

Conflicts may be detected during the merge. If they hit the Edit Conflict button to launch KDiff3 and negotiate merge conflicts.

However, when you save the merge, the result is saved in a temporary file in the .svn folders, and not in the actual working file C:\projects\my-new-project\src\mvags1.mxml. A temporary location can also be seen in the KDiff3 output window.

Am I setting something up incorrectly or was expecting KDiff3 to work incorrectly with TortoiseSVN?

I am using TortoiseSVN 1.7.5 and KDiff3 0.9.96.

Answer 1

My expectations about how KDiff3 will work with TortoiseSVN and Subversion were wrong. The behavior I experienced is the right behavior.

The correct process for using KDiff3 with TortoiseSVN is:

• Click the Edit Conflicts button when conflicts are detected (in TortoiseSVN)
• Allow merging with KDiff3
• Click save button in KDiff3
• Close KDiff3
• In TortoiseSVN, mark the file as resolved

Answer 2

After merging with a working copy of the branch (svn merge --quiet --accept postpone http: //../trunk )

• I go to the TortoiseSVN extension menu and select "Resolve ..." A window appears with a list of conflicting items.
• " ". KDiff3.
• B .
• "". .
• KDiff3.

TortoiseSVN, KDiff3?

:

• Windows 10 x64
• TortoiseSVN 1.9.5, Build 27581 - 64
• kdiff3 0.9.98 (64 )
• TortoiseSVN C:\Program Files\KDiff3\kdiff3.exe% base% mine% theirs -o% --L1 Base --L2 Mine --L3