3 Way Compare via Command Line

Two- and three-way text compare and merge issues.

3 Way Compare via Command Line

Postby MrDoomMaster » Tue Aug 08, 2006 3:13 pm

Hi,

I use TortoiseSVN as my source control for a project. Within TortoiseSVN, I am able to resolve conflicts, which means it opens up an external editor with a 3 way compare. So far, UC fails to open when I select this option. I have tried the following syntax:

UC.EXE -t [file1] [file2] [file3]

where the corresponding [file#] represents 1 absolute path to a source file to compare.

What is the appropriate command line parameter for UC to allow a three way comparison?

Thanks.
User avatar
MrDoomMaster
Newbie
 
Posts: 7
Joined: Mon May 08, 2006 11:00 pm

Re: 3 Way Compare via Command Line

Postby Mofi » Wed Aug 09, 2006 5:23 am

Use -3 instead of -t according to the UltraCompare help page Command Line Options. Please read the manual before asking questions. The help contains also a command line example for 3-way text compare.
User avatar
Mofi
Grand Master
Grand Master
 
Posts: 4049
Joined: Thu Jul 29, 2004 11:00 pm
Location: Vienna

Re: 3 Way Compare via Command Line

Postby MrDoomMaster » Wed Aug 09, 2006 2:17 pm

I did read the manual before posting my question. Obviously I did not find such information.
User avatar
MrDoomMaster
Newbie
 
Posts: 7
Joined: Mon May 08, 2006 11:00 pm

Re: 3 Way Compare via Command Line

Postby TonyA11 » Wed Feb 14, 2007 4:34 pm

UC can be used as both the Diff tool and the Merge tool in TortoiseSVN.

Diff Viewer Command:

C:\...\UltraCompare\UC.exe -t %base %mine

Merge Tool Command(Need v4.20):

C:\...\UltraCompare\UC -rom %theirs %mine %merged

Tested this out using TortoiseSVN v1.4.3
User avatar
TonyA11
Newbie
 
Posts: 1
Joined: Tue Feb 13, 2007 12:00 am


Return to Text Compare and Merge

cron