bzr diff + Araxis Merge

[Aaron Bentley]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

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?

For diffing, difftools sounds like a good option.  You should try it,
and see if it 'just works'.

For merging, you probably want to let bzr handle files that merge
cleanly, and run a script afterward to merge the files that had conflicts.

When a conflict occurs, bzr dumps copies of the three versions it tried
to merge as 'foo.THIS', 'foo.BASE' and 'foo.OTHER'.  You can run AM
against those files.

Aaron
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)
Comment: Using GnuPG with Thunderbird - http://enigmail.mozdev.org

iD8DBQFFUgCP0F+nu1YWqI0RAp4uAJ9vTc13IBQeiE7mCf1s6z29xBx6OwCggkIq
buqvMerPcIm/h4pzC2yI7js=
=VSUi
-----END PGP SIGNATURE-----