Viewing merge using an external merge tool problem.

When I update I want to be able to view any merges that took place using the configured external merge tool (KDiff3), but even though I'm fairly confident the configuration of the tool is correct, it is not loaded correctly. It works perfectly when viewing _conflicted_ merges, but for non-conflicted merges it displays in a manner that is not useful.

I have the external merge tool configured as follows

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

If I update a working copy to a revision that brings in conflicting changes, then in the 'Update Finished!' dialog I have the option to right click the conflicted file and select 'Edit Conflicts'. 'Edit Conflicts' is displayed in bold because it is the default menu command which is also executed if I double click that file entry in the 'Update Finished!' dialog.

If I do this KDiff3 is launched correctly with the 'Base' file on the left, 'Mine' file in the middle, 'Their' file on the right, and the merge output below. The behaviour is correct irrespective of whether I double click the file or right click and select 'Edit Conflicts'.

If I perform an update that has non-conflicting changes then in the 'Update Finished!' dialog the merged files are shown in green and I have the option to right click them and 'Compare with working copy'. Again 'Compare with working copy' is displayed in bold.

Now what I want to see here is the exact same output, the 'Base' file on the left, 'Mine' in the middle, 'Theirs' on the right and the completed merge below.

But if I right click and select 'Compare with working copy' then what I see instead is Base on the left, Merge result in the middle, Theirs on the right, and Merge result at the bottom as well. Mine isn't anywhere to be seen, which makes unpicking how the code has been merged a royal pain in the arse.

If I instead double click the merged file then I get a simple two file diff with 'Theirs' on the left, and the result of the merge on the right, which without being able to see 'Base' or 'Mine' isn't much use either.

Is it possible for a non-conflicting merge to be displayed in the same elegant manner as a conflicting merge is, and if so how?

Thanks.

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

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2013-03-26 15:02:31 CET