Merge Tool Option

Rachel Lavoie · Post by **Rachel Lavoie** » Thu Dec 09, 2004 3:44 pm

Hi!

We recently upgrade Vault from version 2.0.6 to 3.0 and a problem appeared with the Merge Tool...

We use Perforce P4WinMerge as Merge tool, and I configured the Tool\Options\Diff/Merge, Merge sections with theses informations :

Program:C:\Program Files\...\P4WinMerge
Arguments: -nsf "%BASELINE_PATH%" "%OTHER_PATH%" "%WORKING_PATH%" "%DEST_PATH%"

With the version 2.0.6, theses arguments were working correctly, but with the version 3.0, the P4WinMerge don't seems to get correctly the files because it show up a windows asking the user which files to compare, as if no files where given to it.

The only think that changes on our computer is Vault's version.

I search the user's manual for any differences between these 2 versions that might help, wihtout success.

Do you have any Idea what it could be?

(Note: P4Win Merge is a free tool, you can easily install it to do some tests...)

Thanks in advance,
Regards

Rachel Lavoie
Labtronix R & D
Drummondville

dan · Post by **dan** » Thu Dec 09, 2004 4:28 pm

I'll install it and take a look and get back to you...

dan · Post by **dan** » Fri Dec 10, 2004 9:47 am

OK, I've reproduced the problem. We are sending an extra argument in 3.0 called /caption. Apparently, P4WinMerge doesn't like args that it doesn't recognize, and brings up the extra dialog.

We will be releasing a 3.0.1 very soon with the extra argument taken out for any diff/merge apps that are not SourceGear's DiffMerge.

Rachel Lavoie · Post by **Rachel Lavoie** » Fri Dec 10, 2004 12:58 pm

Thank you verry much!

Can I subscribe to a news or something to be advertise when this version will be ready? This problem slow our production and we will prefer have it as soon as possible...

(I rather this solution than verifying your web page every day...)

And, thank you for you quick answer too...

dan · Post by **dan** » Fri Dec 10, 2004 2:00 pm

No problem.

The best way to get announcments would be to get an rss feed on our announcments forum at http://support.sourcegear.com/viewforum.php?f=15. I think the RSS URL is http://support.sourcegear.com/rss.php?f=15