Contact us


All times are UTC - 8 hours



Post new topic Reply to topic  [ 8 posts ] 
Author Message
Offline Profile  


Joined: Tue Mar 08, 2005 12:23 am
Posts: 1315
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.

_________________
Catherine Sea
Dynamsoft Support Team
Follow us@Twitter, Facebook


Offline Profile  


Joined: Tue Mar 08, 2005 12:23 am
Posts: 1315
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% "

_________________
Catherine Sea
Dynamsoft Support Team
Follow us@Twitter, Facebook


Offline Profile  


Joined: Tue Mar 08, 2005 12:23 am
Posts: 1315
You are welcome. :)

_________________
Catherine Sea
Dynamsoft Support Team
Follow us@Twitter, Facebook


Offline Profile  


Joined: Tue Mar 08, 2005 12:23 am
Posts: 1315
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,

_________________
Catherine Sea
Dynamsoft Support Team
Follow us@Twitter, Facebook


Display posts from previous:  Sort by  
Post new topic Reply to topic  [ 8 posts ]  Moderators: Robert, Catherine


Who is online

Users browsing this forum: No registered users and 1 guest


You cannot post new topics in this forum
You cannot reply to topics in this forum
You cannot edit your posts in this forum
You cannot delete your posts in this forum

Search for:
cron
Copyright © 2016 Dynamsoft | All Rights Reserved
dynamic designed by Dynamsoft team