RE: Integration with Araxis Merge

In the attached zipfile you will find wrapper python scripts that will call
kdiff or perforce (p4winmrg). Both can be freely downloaded and need to be
copied to the same directory as where the generated executables are.
I am converting the python scripts to executables using py2exe (python
setup.py py2exe). You also have to add the necessary registry keys (look in
the subversion.reg file)
It should be easy to add calling araxis merge in these scripts.

Remark that I am using an adapted version of kdiff3. So I could be that you
have to pass the arguments of kdiff in a different order for the standard
version.

(I am using python 2.3 with the windows extensions, but ActiveState python
should also be OK)

Marc

-----Original Message-----
From: Mark Griffiths [mailto:mark@chive.com]
Sent: Wednesday, December 10, 2003 09:34 PM
To: users@subversion.tigris.org
Subject: Integration with Araxis Merge

Besides being a total Subversion convert, I am also a big fan of Araxis
Merge. I am
planning on trying to work out how I can get this to work with diff-cmd. A
first attempt
failed and I think I need to create a wrapper batch file. I was wondering
if anyone can
give me a head start?

Many thanks
Mark

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
  

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org