CVS Conflict Editor

Cvs Conflict Editor

Lastest changes

2001/06/19: Cvs Conflict Editor 1.1.0. Added multifiles drop support to the mainframe.
2001/06/18: Cvs Conflict Editor page added. A visual tools to resolve conflict that occurs when merging with CVS. You may find the install binary here (180Ko), and the zipped source there (313Ko).

Content

Overview
Requirement
Licensing
Download
What's new
Questions, comments and bugs reports

Overview

CVS Conflict Editor has been created to deal with conflict that occurs when merging file with CVS.

Here is a sample of conflict:

<<<<<<< testfile.txt
std::string LineReader::readLine()
{
return std::read_line( cin );
}=======
CString LineReader::ReadLine()
{
CString line;
m_archive >> line;
return line;
}>>>>>>> 1.1.1.1.2.1

This tool read this kind of file, and detect the conflicting block. The local file (the one you updated/merged into) is shown on the left window, the revision that was merged into the file is shown on the right window.

Here is a screen shot, showing a file containing two conflicts:

Screen shot of Cvs Conflict Editor

The marks in the margin show the conflicting block. The yellow color indicates the selected conflict block. You can navigate through the conflicts using the up arrow and the down arrow icons in the toolbar. The icons with two small arrows facing each other is used to scroll both window to the selected conflict.

The right window is read only, you can not modify the text in it (but you can copy to the clipboard). You solve the conflict in the left window, by editing the text, using cut and past, and the two strange icons near the printer icons in the toolbar.

Once you solved the conflict, save the file.

Requirement

Operating system : Windows 95/NT/2000.
Compiler: Visual C++ 6.0 (only required for source code compilation, not required to use Cvs Conflict Editor).

Licensing

CVS Conflict Editor is covered by the Gnu Public License.

Download

To use CVS Conflict Editor, you only need to download the install executable.

CVS Conflict Editor 1.1.0 install [180Ko] (include setup executable & documentation file readme.txt).
CVS Conflict Editor 1.1.0 source code [274Ko] (Zip file).

CVS Conflict Editor 1.0 install [180Ko] (include setup executable & documentation file readme.txt).
CVS Conflict Editor 1.0 source code [313Ko] (Zip file).

What's new

CVS Conflict Editor 1.1.0

Icons for file type & task bar
Multiple files drag'n'drop support on the main frame: you can drag the file from WinCVS and drop them on the mainframe to open them!

Questions, comments and bugs reports

This release of the software was developed in the laps of 3 days, with less than a day worth of development. There are bugs (I used an edit control I now nothing about and hacked into it with pure instinct), it is barely tested, and there is plenty of features to be done. Yet, I believe this release is functional and can be useful.

I'll set up a project on sourceforge (http://www.sourceforge.net) as soon as I can. Please wait until it's done before sending bug reports or feature requests. On sourceforge there will be the proper support do to this.

If you want to help, you can mail me a name suggestion for the project, as well of a summary of what it is doing (my English is weird, and I'd like to find a good summary of 1 or 2 sentences).

I'll post an update on my page as soon as the project is set up on sourceforge.

You can reach me at the following address: gaiacrtn@free.fr