An archive containing sample source code, and source code for a number of the tools that are a part of a Merge installation
can be found within the src folder in the Merge installation folder. The archive is called src.rar. The contents can be extracted using WinRAR 
.
Command line tools
A typical Merge installation includes several command line utilities: compare.exe, consolecompare.exe, araxisp4diff.exe and araxisp4winmrg.exe. These utilities all use the Automation API to control Merge. The source code for these utilities is available under the compare, consolecompare, araxisp4diff, and araxisp4winmrg folders.
Filesystem plugins
Source code for the filesystem plugins (Win32, FTP, Perforce, and Visual SourceSafe) is no longer included in the Merge installation. If you would like a copy of the source code for the filesystem plugins, please contact Araxis.
Automation API samples
SCM folder comparison reporting
The Perforce and Visual SourceSafe plugins enable Merge to access the contents of these two SCM systems. A common use for the plugins is to enable reports to be generated of the changes in the SCM system between two dates or revisions. The ChangeListReport sample (in the AutomationSamples folder) enables a report to be generated showing the differences between the content of a folder hierarchy within Perforce at two changelists or dates. C#, VB.NET, VB6, and JScript versions of the sample are available.
Automatic merging and conflict resolution
A common task when using a source control system like Perforce is that of resolving conflicts at check-in time. Merge is typically used to perform the merging of two potentially conflicting revisions of a file into a common base revision. In most cases there are no conflicts, so no manual processing is required. The Auto3WayMerge sample provides a way to perform the automatic merge and only present a merging user interface to the user when there are conflicts that require manual resolution.
Support
If you require assistance with using the Automation API or developing a plugin file system, please feel free to contact Araxis.
| Related topics |
|---|