How to.. Guiffy DiffMerge

[cubincave1]

How do you setup using Guiffy and DiffMerge with SourceGear.Vault?

[lbauer]

Diff merge tools are configured in the Vault GUI Client, under Tools->Options Diff/Merge.

[cubincave1]

I should have been more specific. Inside the menu

Tools --> Options --> Diff / Merge

I am looking for the Arguements that will be needed to make Guiffy work.

EG:

DIFF
Program = "C:\program files\guiffy80\guiffy.exe"
Arguments = ??????

MERGE
Program = "C:\program files\guiffy80\guiffy.exe"
Arguments = ??????

I looked at Guiffy help, but they do not list the arguements for SourceGear.Vault. They seem to list all the other Source Control products. ( Crazy I know... Vault is the best! ) Since Vaults support has said in the past that many of its users use Guiffy as their merge tool, I figured someone out there has to know what the Arguments are.

[lbauer]

We haven't tested Guiffy here and aren't familiar with what the arguments should be. You might be able to get help at the Guiffy support forum:

http://www.cmcrossroads.com/component/o ... board,74.0

[cubincave1]

After playing with Guiffy and Vault a little more this is what I came up with for Arguements

Diff:
Program = C:\Program Files\guiffy80\guiffy.exe
Arugments = "%LEFT_PATH%" "%RIGHT_PATH%"

Merge:
Program = C:\Program Files\guiffy80\guiffy.exe
Arugments = -m "%DEST_PATH%" "%OTHER_PATH%"


NOTE: You might have installed Guiffy in a different location than in c:\program files soooo you will need to find out where the guiffy.exe is located.

NOTE: This setup will open guiffy to do a 2way merge. great if you let developers check out files at the same time. Only issue with this setup is when you save your merge file, the dialog box that Guiffy pops up usually is NOT the working directory of your file. I am trying to get more information from Guiffy on this one.

[lbauer]

Diff:
Program = C:\Program Files\guiffy80\guiffy.exe
Arugments = "%LEFT_PATH%" "%RIGHT_PATH%"

Thank you! I'm impressed -- I actually consulted with someone at Guiffy and we tried to determine the arguments -- but we weren't successful. Now that I've seen what works, I think we were making it too complicated.

This should certainly help other users.

[cubincave1]

Ok...

This is what you have to put into merge Arugments

Merge:
Program = C:\Program Files\guiffy80\guiffy.exe
Arugments = -m "%DEST_PATH%" "%OTHER_PATH%" "%DEST_PATH%"

What is different this time is the last "%DEST_PATH%". The position of this Vault macro will says to Guiffy to save the merge file on top of the local copy.

So these are the steps a developer will have to do if they check in a file that needs to be merged..

STEP 1:
Select a file to check in

STEP 2:
When "Warning" window opens, the developer will have to choose each file that is red and click "Merge"

STEP 3:
The Guiffy program will start, and the developer will have to make whatever changes he has to to resolve the issue.

STEP 4:
The Guiffy program will save his changes back to HIS ( or HER ) local copy. Then closes Guiffy down.

STEP 5:
Developer will have to make sure he changes do not break his build.

STEP 6:
Developer will go back to Vault's "Warning" window, and select the file he changed and then press "Resolve Merge Status".

STEP 7:
If merge was successfull, then Vault will remove the file from the "Warning" dialog box. If no more files are listed, then the developer clicks "OK"

STEP 8:
Developer is then presented with the standard check in dialog box from Vault.

STEP 9:
Developer pats himself on back for a job well done.