kmerge v0.4
--------------------
by Philippe Fremy <pfremy@chez.com>
Program
Kmerge is an utility to handle diffing and merging of files or directories. It also deals with CVS conflicts and will perhaps handle other type of conflicts (diff3, patch).
Kmerge is distributed under the Gnu GPL and requires Qt 1.44, Kde 1 and Gnu diff.
The current version is 0.4 and it supports file diffing and merging, directory diffing and merging, cvs conflicts handling at file or directory level. KMerge is now usable and the next step before release will be mainly gui enhancing and port to Kde 2.
Features
- file diffing
- file merging
- directory diffing
- directory merging
- customized diff options
- file pattern exclusion
- cvs conflicts handling
History
A lot of programs today have many version developped at the same time and by many users. Developpers often need to synchronise everything. Although I found a lot of programs and IDE doing files and directories diffing, the only thing I could find to do interactive merging and patching was sdiff and e-diff mode of emacs. The first is VERY primitive (although sufficient for file merging) and the second is quite good but reserved to emacs-user (and I use vim).
So I decided to start kmerge. That was a good opportunity to learn Kde and Qt. I was inspired by kdiff, sdiff, e-diff mode of emacs, mdiff, tkdiff, my needs and my imagination.
Any feedback of any kind is welcome: Bug reports, Features request, Ideas, suggestions, remarks, anything. I'll be happy to know that this program is the program you've been waiting for years for or that you think that I'm wasting my time on a piece of s**t software.
Here is what the following version of kmerge should feature:
Kmerge 0.2: Simple file merging
Kmerge 0.3: Cvs conflicts handling
--> Kmerge 0.4: Directories merging
Kmerge 0.5: Enhanced GUI, Port to kde2
Kmerge 1.0: Stable release
I have absolutely no deadlines, so I don't know when any of these version will be available. Current version (0.4) was released in the middle of September 2000.