Araxis merge command line diff12/9/2023 ![]() In contrast, on my new Windows 10 based computer, I am using the latest version (191.183.0398) of p4v, but the same version of Araxis Merge. In that environment, if there was already an open Araxis Merge window, performing a diff in p4v would cause the diff result to appear in a new tab of the already open window. \Source\s\Common\SharedForms\SelectItemForm.On my previous Windows 7 based computer (which I can no longer refer back to because it died), I used the Perforce p4v client, and changed its preferences to use Araxis Merge as the diff application. T 2" "C:\Source\s\Common\SharedForms\" "c:\users\drobb\appdata\local\temp\SelĮctItemForm.pas~base.fmkwps" "c:\users\drobb\appdata\local\temp\SelectItemForm.pas~other.h3miys" "C: Parent 1" /title2:"Merge Result: ""C:\Source\s\Common\SharedForms\SelectItemForm.pas" /title3:"Paren executing just this command line:Ĭ:\source\s>"C:\Program Files\Araxis\Araxis Merge\\ConsoleCompare.exe" /3 /a2 /wait /merge /title1:" If I exclude the launching of the shell, i.e. ![]() If I execute the second command from a TCC prompt, it works. If I execute the entire command line manually from a TCC prompt, the same problem occurs. The difference must be in the way the quotes are being interpreted on TCC's command line. Here is the command line that is used when CMD.EXE is invoked:Ĭ:\windows\system32\cmd.exe /c ""C:\Program Files\Araxis\Araxis Merge\\ConsoleCompare.exe" /3 /a2 /wait /merge /title1:"Parent 1" /title2:"Merge Result: ""C:\Source\s\Common\SharedForms\SelectItemForm.pas" /title3:"Parent 2" "C:\Source\s\Common\SharedForms\" "c:\users\drobb\appdata\local\temp\SelectItemForm.pas~base.hhnp41" "c:\users\drobb\appdata\local\temp\SelectItemForm.pas~other.7ugqhw" "C:\Source\s\Common\SharedForms\SelectItemForm.pas"" I discovered that I could work around this issue by setting COMSPEC to CMD.EXE.įYI, here is the command line that hg.exe is using to launch Araxis, this must be where the problem is:Ĭ:\PROGRA~1\JPSoft\TCMD14~1\TCC.EXE /c ""C:\Program Files\Araxis\Araxis Merge\\ConsoleCompare.exe" /3 /a2 /wait /merge /title1:"Parent 1" /title2:"Merge Result: ""C:\Source\s\Common\SharedForms\SelectItemForm.pas" /title3:"Parent 2" "C:\Source\s\Common\SharedForms\" "c:\users\drobb\appdata\local\temp\SelectItemForm.pas~base.fmkwps" "c:\users\drobb\appdata\local\temp\SelectItemForm.pas~other.h3miys" "C:\Source\s\Common\SharedForms\SelectItemForm.pas"" Has anyone else encountered this behavior or can anyone suggest anything? I have the feeling someone will know right away what is wrong. I tried changing COMSPEC to point to TCC.EXE, but that didn't work. Merging Common/Classes/GTSOEStatementData.pas failed!Ĭ:\users\drobb\AppData\Local\Temp\GTSOEStatementData.pas~base.moebqrĬ:\users\drobb\AppData\Local\Temp\GTSOEStatementData.pas~other.bsvm6d Merging Common/Classes/GTSOEStatementData.pasĪraxis Merge Command Line Compare Utility v7.0 Not enough arguments for a three-way comparison. When running under CMD, Araxis is invoked successfully, but when running under TCC, I get the following output: c:\source\s>hg me kodiak When I perform a merge from one branch of the source repository to another, a merge conflict causes Mercurial to invoke Araxis to perform a manual three-way merge. ![]() It's good to finally have a real command processor! Unfortunately I have run into a problem that I need to resolve before committing to purchasing TCC. New user here, though I used to use 4DOS and 4OS2 way, way back in the day.
0 Comments
Leave a Reply.AuthorWrite something about yourself. No need to be fancy, just an overview. ArchivesCategories |