Difference between revisions of "KMerge"

From Freehackers
Jump to: navigation, search
(New page: == Obsolescence == '''KMerge is dead !'''. This program was developed for KDE 1 and was never ported to KDE2, KDE3 or KDE4! However, KDE 3 features another program, Kompare, that is f...)
 
 
(4 intermediate revisions by the same user not shown)
Line 1: Line 1:
 
 
 
== Obsolescence ==
 
== Obsolescence ==
 
'''KMerge is dead !'''.  
 
'''KMerge is dead !'''.  
Line 8: Line 6:
 
do.  
 
do.  
  
If you are looking for a good diff/merge program, you can look at the
+
If you are looking for a good diff/merge program, you can look at the following:
following:
 
  
 
*  [http://kdiff3.sf.net KDiff3] (windows and KDE versions)
 
*  [http://kdiff3.sf.net KDiff3] (windows and KDE versions)
Line 59: Line 56:
  
 
==Release==
 
==Release==
 +
 +
No more releases planned.
  
 
=== Version 0.4: 08 september 2000 ===
 
=== Version 0.4: 08 september 2000 ===
Line 64: Line 63:
 
* Directory merging, CVS conflicts handling at the DIR level
 
* Directory merging, CVS conflicts handling at the DIR level
  
Download: [http://www.freehackers.org/media/bluebird/kmerge/kmerge-0.4.tar.bz2 kmerge-0.4.tar.bz2] ((141 kbytes)
+
Download: [http://www.freehackers.org/media/bluebird/kmerge/kmerge-0.4.tar.bz2 kmerge-0.4.tar.bz2] (141 kbytes)
  
 
=== Version 0.3: 09 july 2000 ===
 
=== Version 0.3: 09 july 2000 ===
Line 70: Line 69:
 
* CVS conflict handling
 
* CVS conflict handling
  
Download: [http://www.freehackers.org/media/bluebird/kmerge/kmerge-0.3.tar.bz2 kmerge-0.3.tar.bz2] ((124 kbytes)
+
Download: [http://www.freehackers.org/media/bluebird/kmerge/kmerge-0.3.tar.bz2 kmerge-0.3.tar.bz2] (124 kbytes)
  
 
=== Version 0.2: 15 may 2000 ===
 
=== Version 0.2: 15 may 2000 ===
Line 76: Line 75:
 
* Simple file merging  
 
* Simple file merging  
  
Download: [http://www.freehackers.org/media/bluebird/kmerge/kmerge-0.2.tar.bz2 kmerge-0.2.tar.bz2] ((121 kbytes)
+
Download: [http://www.freehackers.org/media/bluebird/kmerge/kmerge-0.2.tar.bz2 kmerge-0.2.tar.bz2] (121 kbytes)
  
 
=== Version 0.1: 15 september 1999 ===
 
=== Version 0.1: 15 september 1999 ===
Line 82: Line 81:
 
* Simple file diffing  
 
* Simple file diffing  
  
Download: [http://www.freehackers.org/media/bluebird/kmerge/kmerge-0.1.tar.bz2 kmerge-0.1.tar.bz2] ((158 kbytes)
+
Download: [http://www.freehackers.org/media/bluebird/kmerge/kmerge-0.1.tar.bz2 kmerge-0.1.tar.bz2] (158 kbytes)
  
  
Line 90: Line 89:
  
 
Email me at: phil at freehackers dot org
 
Email me at: phil at freehackers dot org
 +
 +
== Other softwares done by [[Philippe Fremy]] ==
 +
{{Bluebird's Projects}}

Latest revision as of 12:20, 23 January 2015

Obsolescence

KMerge is dead !.

This program was developed for KDE 1 and was never ported to KDE2, KDE3 or KDE4! However, KDE 3 features another program, Kompare, that is far more beautiful and features part of what KMerge could do.

If you are looking for a good diff/merge program, you can look at the following:

  • KDiff3 (windows and KDE versions)
  • WinMerge (windows only)
  • kompare, redistributed with KDE

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 and [http://www.kde.org 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


Screenshot

kmerge-shot.png

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 the e-diff mode of emacs. The first is VERY primitive (although sufficicent for simple 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, the e-diff mode of emacs, mdiff, my Needs and my Imagination.


Release

No more releases planned.

Version 0.4: 08 september 2000

Features:

  • Directory merging, CVS conflicts handling at the DIR level

Download: kmerge-0.4.tar.bz2 (141 kbytes)

Version 0.3: 09 july 2000

Features:

  • CVS conflict handling

Download: kmerge-0.3.tar.bz2 (124 kbytes)

Version 0.2: 15 may 2000

Features:

  • Simple file merging

Download: kmerge-0.2.tar.bz2 (121 kbytes)

Version 0.1: 15 september 1999

Features:

  • Simple file diffing

Download: kmerge-0.1.tar.bz2 (158 kbytes)


Feedback

Well, any feedback of any kind is welcome: bug reports, features request, ideas, suggestions, remarks, anything that makes me think that someone used kmerge is good.

Email me at: phil at freehackers dot org

Other softwares done by Philippe Fremy

  • LuaUnit: A unit-testing framework for the Lua language
  • Klotski: a mind-breaking game
  • Indent Finder: analyse source code indentation to set your editor automatically
  • PyTiCroque: a software to help playing at www.croquemonster.com