CVS Diff/Merge
SmartCVS
SmartCVS supports enternal diff and 3-way merge tool integration. SmartCVS is an advanced Java
CVS client based on NetBean's javaCVS package.
To plugin Guiffy as the external compare tool in SmartCVS:
In the SmartCVS Edit Preferences Dialog for Compare:
Command: guiffy
Arguments: ${leftFile} ${rightFile}
To plugin Guiffy as the external merge tool in SmartCVS:
In the SmartCVS Edit Preferences Dialog for Conflict Solver:
Command: guiffy
Arguments: -m ${leftFile} ${rightFile} ${mergedFile}
NOTES:
-
If your Guiffy install directory is NOT in your PATH, specify the full path for the
Command in the above settings.
-
On Windows the above Command is the guiffy.exe
-
On Linux, Unix, and MacOS X the above command is the shell script and should be
specified as sh ./guiffy
-
Any of Guiffy's other command line options may be specified in the above Arguments
before the first File parameter. For example, Command line options may be used
to specify how to write EOLs in the merge result file or File Encoding formats.
See
Guiffy's Command Line interface.
Jalindi Igloo
For Windows users, the Jalindi Igloo package offers external 3-way merge
support and SCC IDE
integration.
Other CVS GUIs
The CVSGUIs(WinCVS, MacCVS, and gCVS) support using external diff programs by
setting the Preferences. BUT, they do NOT support using external merge
progams and are without a visual 3-way merge capability. If they are enhanced
in the future to support using external visual merge programs, Guiffy will work
just fine. In the meantime, you can use Guiffy to resolve merge conflicts
by loading the CVS conflict file...Merge -> Open CVS Conflict file.
Many CVS users find Guiffy's integrated Folder Compare features a handy way to
synchronize projects. From the Folder Compare Tree view, files can be compared
and merged. 3-way SureMerges can also be performed from the Tree view's
rightclick popup menu.