How to integrate Araxis Merge with TortoiseSVN

Araxis merge is an awesome merge/diff tool, which is something unvaluable when you work with a source code repository.

Here is how to integrate it with tortoisesvn, in order to replace the internal diff and merge tools.

Source: http://www.araxis.com/merge/scm_integration.html

The External Programs section of the TortoiseSVN Settings window enables external diff and merging programs to be configured.

Merge can also integrate directly with Subversion. Please see Subversion for more information.

To configure Merge as the Diff Viewer:

• In the TortoiseSVN Settings window, select the Diff Viewer page (located under External Programs).

• Select the External radio button.

• In path field, enter the following (all on one line):

  "C:\Program Files\Araxis\Araxis Merge\compare.exe" /max /wait /title1:%bname /title2:%yname %base %mine

  Note: in the above path, replace C:\Program Files\Araxis\Araxis Merge\ with the full path of the Merge installation directory on your machine.

To configure Merge as the Merge Tool:

• In the TortoiseSVN Settings window, select the Merge Tool page (located under External Programs).

• Select the External radio button.

• In path field, enter the following (all on one line):

  "C:\Program Files\Araxis\Araxis Merge\compare.exe" /a2 /max /wait /3 /title1:%tname /title2:%bname /title3:%yname %theirs %base %mine %merged

  Note: in the above path, replace C:\Program Files\Araxis\Araxis Merge\ with the full path of the Merge installation directory on your machine.

This page also contains how to integrate Araxis merge will all the other source control.

mardi 13 mai 2008 | Predicate<T>

Cher Entreprenaute, vous pouvez trouver ici votre passeport pour l'economie numerique