Issue 125: visual diff for file history doesn't work with Araxis
http://bitbucket.org/tortoisehg/stable/issue/125/visual-diff-for-file-history-doesnt-work-with
bbbaga on Wed, 25 Mar 2009 00:41:43 +0100:
Comment:
That is more or less how i had it setup before, and it worked. I found the
problem though - one have to call ConsoleCompare.exe for THG 0.7+, while
Compare.exe worked for versions up to 0.6. Looks like something changed in the
way THG is starting diff/merge applications. One of the consequences is that
now you have to look at number of ugly command-line windows... (should be
changed?). Anyway, here is how i got it to work in 0.7+:
{{{
[extdiff]
cmd.vdiff = C:\Program Files\Araxis\Araxis Merge\ConsoleCompare.exe
opts.vdiff = /wait /readonly /title1:"Original" /title2:"Working copy" /2
[merge-tools]
;...
ardiff.executable = C:\Program Files\Araxis\Araxis Merge\ConsoleCompare.exe
ardiff.args = /wait /merge /a1 /3 /title1:"Merge" /title2:"Local"
/title3:"Other" $base $local $other $output
}}}
As far as i am concerned, this issue is closed. Sorry, i could not find a
proper place (like list of known diffs) in FAQ to put it in.
--
This is an issue notification from bitbucket.org.
You are receiving this either because you are the
owner of the issue, or you are following the issue.
------------------------------------------------------------------------------
Apps built with the Adobe(R) Flex(R) framework and Flex Builder(TM) are
powering Web 2.0 with engaging, cross-platform capabilities. Quickly and
easily build your RIAs with Flex Builder, the Eclipse(TM)based development
software that enables intelligent coding and step-through debugging.
Download the free 60 day trial. http://p.sf.net/sfu/www-adobe-com
_______________________________________________
Tortoisehg-develop mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/tortoisehg-develop
