bzr diff + Araxis Merge

Stephen Ward sward.dev at verizon.net
Thu Nov 9 03:10:52 GMT 2006


On Wednesday 08 November 2006 10:52 am, Andrew Nguyen wrote:
> Hello all,
>
> We use Araxis Merge here at my company as our diff/merge tool.  I found
> the difftools package which doesn't look like it supports AM out of the
> box (but I really haven't dug in and checked yet).  Does anyone know if
> there is existing work on integrating with AM or is modifying difftools
> my best option?
>
> Thanks,
> Andrew

I haven't tried it, but a quick glance at the command-line help for Araxis 
Merge suggests that it would work (somewhat) by default as in:

  bzr diff --using=compare.exe 

Since it seems to support recursive directory tree diffs, it should probably 
get registered into difftools like this, to get full capability:

  register_diff_tool(TreeDiffTool('compare.exe'))

(see __init__.py).




More information about the bazaar mailing list