Perforce merge integration

[DevComp52]

Is there a way to integrate ExamDiff with Perforce as a merge tool ?

The command line params for a user selected merge tool are:
1) base file
2) their file
3) your file
4) merged result file

Thanks

[psguru]

Check out http://p4t3.lollotec.com/2008/03/using- ... ility.html Although not written for EDPro, the setup will be similar.

[jwfearn]

Any advice on how to use ExamDiff Pro as a MERGE application for Perforce? The link cited by @psguru describes setting up a competitor (http://www.altova.com/diffdog/diff-merge-tool.html) as a DIFF application for Perforce.

To do this for ExamDiff Pro, in P4V go to Edit | Preferences... | Diff, select "Other Application" and enter these settings:

Location: C:/Program Files/ExamDiff Pro/ExamDiff.exe [or whatever your ExamDiff path is]
Arguments: %1 %2

Does ExamDiff Pro do merging? If so, can anyone tell us the proper command line options to use?

[psguru]

ExamDiff Pro does visual 2-way merging. However, AFAIK, Perforce wants a 3-way merge tool for its Merge application, in which case you cannot use ExamDiff Pro.

[AlexL]

ExamDiff Pro does visual 2-way merging. However, AFAIK, Perforce wants a 3-way merge tool for its Merge application, in which case you cannot use ExamDiff Pro.

Yes, sometimes even 4-way: base (common root for both variants before their last modification, which caused the difference between variants), 1-st variant, 2-nd variant and result of the merge. Though personally I don't use 4 windows.

So I use EDP for diff, and Perforce built-in utility for merge.

But who knows, maybe first line here:
http://www.prestosoft.com/edp_suggestions.asp
some day will move to the first line here:
http://www.prestosoft.com/edp_history.asp