external merge tool for SourceAnywhere

ychen · **Joined:** Wed Sep 21, 2011 12:34 pm **Posts:** 7

Hi, what external merge tools (3-way merge) does SourceAnywhere(6.1.1) support? And it would be great if you can give me an example about how to configure it in "External Programs" Tab. Thanks!

Catherine · **Joined:** Tue Mar 08, 2005 12:23 am **Posts:** 1489

Hi ychen,

SourceAnywhere(6.1.1) supports external merge tools like WinMerge, DiffMerge, etc.

To configure the external tool, you can check out this article:
http://www.dynamsoft.com/help/SAW/COp_E ... ptions.htm

I'll do some tests and provide an example.

ychen · **Joined:** Wed Sep 21, 2011 12:34 pm **Posts:** 7

Thanks for the reply!

I've read that article, and it sounds not very straight forward to me. For example, I've tried with Beyond Compare, and for Beyond Compare, the command for diff two files are: BCompare.exe file1 file2. So I entered “%FIRST_FILE%” “%SECOND_FILE%” for "Arguments for diff files". But that does not work properly(The Beyond Compare program runs, but no files are opened). Later I searched on internet, and found an article and entered the following string as it mentioned:
/readonly /title1=”%FIRST_LABEL%” /title2=”%SECOND_LABEL%” “%FIRST_FILE%” “%SECOND_FILE%”
And this works fine! By reading the article you mentioned, I do not know why my original configuration does not work, and where those "/title1", "titile2" come from. Maybe I misunderstood sth here?

The other thing is it seems that SoureAnywhere does not support 3-way merge with beyond compare, right? If it does, please let me know how to configure "Arguments for 3-way merge". Otherwise, it would be great if you could give me an example configuration of WinMerge.

I really apprieciate your help!

Catherine · **Joined:** Tue Mar 08, 2005 12:23 am **Posts:** 1489

Hi ychen,

ychen wrote:

And this works fine! By reading the article you mentioned, I do not know why my original configuration does not work, and where those "/title1", "titile2" come from. Maybe I misunderstood sth here?

Actually the article only provides the parameters available for configuration. Since different diff/merge tools might have their own different arguments, we didn't list them.

ychen wrote:

The other thing is it seems that SoureAnywhere does not support 3-way merge with beyond compare, right? If it does, please let me know how to configure "Arguments for 3-way merge". Otherwise, it would be great if you could give me an example configuration of WinMerge.

I tried Beyond Compare, and seems the below configurations work fine:

Code:

Application for diff/merge:
D:\Program Files (x86)\Beyond Compare 3\BComp.exe

Arguments for diff files:
/readonly /title1="%FIRST_LABEL%" /title2="%SECOND_LABEL%" "%FIRST_FILE%" "%SECOND_FILE%"

Arguments for Three-way merge:
"%YOURS_FILE%" "%THEIRS_FILE%" "%BASE_FILE%" "%RESULT_FILE%" /title1="%FIRST_LABEL%" /title2="%SECOND_LABEL%""

By the way, below is how to configure WinMerge:

Code:

Application for diff/merge:
D:\Program Files (x86)\WinMerge\WinMergeU.exe

Arguments for diff files:
"%FIRST_FILE%" "%SECOND_FILE%"   -dl "%FIRST_LABEL%" -dr "%SECOND_LABEL% "

Arguments for Three-way merge:
-merge "%BASE_FILE%"  "%THEIRS_FILE%"  "%YOURS_FILE%"  "%RESULT_FILE%"  -dl "%FIRST_LABEL%" -dr "%SECOND_LABEL% "

ychen · **Joined:** Wed Sep 21, 2011 12:34 pm **Posts:** 7

Hi Catherine,

Sorry for the late response. I was on a vacation.

Thanks a lot for your solution! This will save me lots of time!

Catherine · **Joined:** Tue Mar 08, 2005 12:23 am **Posts:** 1489

You are welcome.

ychen · **Joined:** Wed Sep 21, 2011 12:34 pm **Posts:** 7

Hi Catherine,

I tried the setting you recommend for beyondcompare 3-way merge:
"%YOURS_FILE%" "%THEIRS_FILE%" "%BASE_FILE%" "%RESULT_FILE%" /title1="%FIRST_LABEL%" /title2="%SECOND_LABEL%""

It doesn't work. I noticed that there is one more " at the end, so I removed that. But still not working, the same results.

Beyond compare is opened, but it gives "Error Opening File".

It opens three panel, the link of left one is:C:\NMS\application\src\com\axerra\access\snmp\api\trap\TrapListenerImpl.java,
middle one:C:\Documents and Settings\ychen\Application Data\Dynamsoft\SourceAnywhere for VSS\temp\~_~_~_CheckinMergeFile228145SVHighLevel12442997244580S2A3W~_.tmp,
right one:C:\Documents and Settings\ychen\Application Data\Dynamsoft\SourceAnywhere for VSS\temp\~_~_~_CheckinMergeFile15705SVHighLevel12442997244580S2A3W~_.tmp

Did I miss sth?

Thanks,
Ying

Catherine · **Joined:** Tue Mar 08, 2005 12:23 am **Posts:** 1489

Hi ychen,

Which application did you specify in "Application for diff/merge"?

If it's

Code:

C:\Program Files\Beyond Compare 3\BCompare.exe

Please change it to:

Code:

C:\Program Files\Beyond Compare 3\BComp.exe

and see if this makes any difference.

Regards,

Dynamsoft Forums

external merge tool for SourceAnywhere

Who is online