Projects

GNU Diff Utilities

The GNU diffutils are comprised of diff, diff3, sdiff, and cmp, utilities for showing differences between files. The manual also documents patch, which uses diff output to update files.

Meld

Meld is a visual diff and merge tool. You can compare two or three files and edit them in place (diffs update dynamically). You can compare two or three folders and launch file comparisons. You can browse and view a working copy from popular version control systems such such as CVS, Subversion, Bazaar-ng and Mercurial.

Kompare (KDE)

claimed by KDE

Kompare is a graphical difference viewer that allows you to visualize changes to a file. Whether you're a developer comparing source code, or you just want to see the difference between that research paper draft and the final document, Kompare is the tool you need.

KDiff3

KDiff3 is a graphical text difference analyzer for up to 3 input files, provides character-by-character analysis and a text merge tool with integrated editor. It can also compare and merge directories. Platform-independant.

TkDiff

TkDiff is a graphical front end to the diff program. It provides a side-by-side view of the differences between two files, along with several innovative features such as diff bookmarks and a graphical map of differences for quick navigation.

netstiff

netstiff (formerly known as webdiff) is a powerful Web and FTP site update checker. It supports a variety of different methods (diff, html, size, date, MD5 sum, regexp) to check for updates. There are also sophisticated settings to make it useful for partly dynamic Web pages. Without any given ... [More] arguments, netstiff will either run its interactive configuration tool or check your sites for updates and print the changes in a diff(1)-like manner. [Less]

Eskil

Eskil is a graphical tool to view the differences between files and directories. It supports version management and patch files and has various preprocessing and alignment options to improve the display of tricky diffs.

cvsxxdiff

cvsxxdiff is a collection of utilities which allow the user to graphically review changes, track status and manage commits of files managed by a CVS repository. Latest stable version is cvsxxdiff-1.5.1, released 6th May 2008 IntroductionIn any software project, code changes need to be frequently ... [More] reviewed and coordinated. cvsxxdiff utilities offer the means for easily reviewing changes and coordinating development in a CVS managed project. The cvsxxdiff package consists of these utilities: cvsxxdiff, cvsnup and cvscommit cvsxxdiff is designed to display differences between files in the local working directory and the cvs repository or between two revisions on the repository. Convenient options to review revisions of a file as it was n versions ago and the cvs log accompanying that revision, are provided. Moreover, when invoked in conflict resolve mode, it works as a graphical tool to resolve conflicts. cvsnup inquires the status of the local files with those in a cvs repository. It finds any not updated, modified or missing files and reports them in various convenient ways. Also, it creates changelogs for any changes that have not yet been merged. cvscommit prepares a template based commit log. The revisions of the files commited are appended to the log in order to assist in the generation of changesets at a later time. All included functionality is accessed though convenient options, allowing an easy overview of changesets and the project's evolution. cvsxxdiff utilities work out of the box. They have been tested on Unix and Linux systems, and on Windows under CYGWIN. History / Previous releasesAs of December 2007, cvsxxdiff transformed from a single utility to a package of utilities. The second utility of the cvsxxdiff package is cvsnup. The third utility, cvscommit, was introduced in January 2008. In April 2006, the latest version of cvsxxdiff available at that time was integrated by Martin Blais in the Helper Scripts for xxdiff. The script's name was then changed to xx-cvs-revcmp. Featurescvsxxdiff:displays all changes between the local working directory and the remote source repository displays changes among selected file revisions select files for compare: by file's revision relative to current working version (eg. 1 version ago with current or 3 versions ago with 1 version ago) by specifying a date displays commit logs accompanying the files' revisions being reviewed assists in removal of conflicts reports on the status of the local repository produces colorful and easy to read output is one file and gets the job done. Minimal dependencies to other packages cvsnup:displays the status of all files not in sync with the trunk provides options to show only unupdated files of a specific status generates a changelog for the unupdated files. Can be used as summary of changes that will be merged by a `cvs update' command. is one file and gets the job done. Minimal dependencies to other packages cvscommit:prepares a commit based on a template message appends revision information to the commit log. This allows us to later retrieve the changes introduced by the commit offers short statistics about the commit Usage scenariosThis is how the first public release of cvsxxdiff was described in April 2006: What, here in our company, find useful about cvsxxdiff is: o) cvsxxdiff is one file. No python module directory or initialization is requierd. o) Do a 'cvs up; cvsxxdiff' before commit to see all the local changes we have made. o) Do 'cvs up; cvsxxdiff -b 1 file.c' to see the last chages that were made on a file by a colleague. o) We often need to track bugs in our code. This means going back to previous revisions, thus doing ex: 'cvsxxdiff -b 1 -b 2 file.c' to compare the previous with the 2nd previous revision. (similar with cvsxxdiff -r 1.1 -r 1.2 file.c) o) The utility prints in the standard output the logs between revisions i and j ( ex: cvsxxdif -b i -b j file.c) One script to do it all.TODOMerge again with xxdiff Helper Scripts! Dependenciescvsxxdiff uses the xxdiff package to graphically display changes among file revisions. It has been tested to work with xxdiff version 3 and newer. cvsxxdiff utilities are written in the Python language. They have been tested with python version 2.3 and newer. [Less]

qtmerge

This application might to be merging tool based on Qt4 framework, pubishing under GPLv3 license.

makedirdiff

Make Directory Difference (MakeDirDiff) tool Русский: Описание проекта MakeDirDiff IntroductionMakeDirDiff is a simple command line tool for finding differences between two directories and storing all new/updates files in a new directory. MakeDirDiff compares two ... [More] directories and creates the third directory with the first directory structure, but with new or updated files only. It can update the second directory content with the current content of the first directory. On the next run MakeDirDiff will find and place only new/changed files appeared in the first directory into the third directory Look at the MakeDirDiff.gif picture to get a visual notion about MakeDirDiff data flow. It's an Apache Ant task. I found this extremely useful for creating incremental backups and updating big web-sites. How it can be runIt is a simple java application, designed as an Apache Ant task. MakeDirDiff can be run from the command line, run as a single Ant task, used as a part of other Ant tasks or integrated into other applications like a library as well. System RequirementsTroubleshootingExecuting a sample ANT taskWe will run and analyze the sample ant task that is stored in build.xml file in each makeDirDiff-bin-1.x.zip file. Download makeDirDiff-bin-1.x.zip file from the Project Download page. Extract this archive to a directory. If you wish more details, look into 'build.xml' file to get some information about a way the example Ant task is defined there, otherwise skip this step. Go to this directory and run an 'ant' command using a system command line interface. You will see some output and words 'BUILD SUCCESSFUL' at the end. In this case the provided MakeDirDiff example works fine. This example task creates a 'result' directory and copy there all files from 'original' directory. It also stores an 'original' directory content into the 'previous' directory. Something has gone wrong when you don't see 'BUILD SUCCESSFUL' words. Look at the 'Troubleshooting' chapter here to find out what is your problem. That’s it! MakeDirDiff made a copy of new/updates files from the ‘original’ directory for you. Let’s try to make something more difficult. Please, remove the 'result' directory now and run 'ant' command again. You will see that the 'result' directory is created again, but it's empty. This is because it has only new/updated files and directories from the 'original' directory, which have not been changed. Make a small experiment then. Add some files and directories into the 'original' directory and run the 'ant' command again. The 'result' directory will contain all those new files and directories. It works! Running as a java applicationCommand line parametersMakeDirDiff requires three parameters: Note that MakeDirDiff without parameters or with wrong number of parameters shows this help text. MS Windows command examplejava -cp *; org.grenader.makedirdiff.MakeDirDiff ./original ./result ./previous You can find this command in the makeDirDiff-Example.bat in makeDirDiff-bin-1.x.zip archive Unix command examplejava -cp *: org.grenader.makedirdiff.MakeDirDiff ./original ./result ./previous You can find this command in the makeDirDiff-Example.sh in makeDirDiff-bin-1.x.zip archive Example ANT taskThe following Ant task is stored in build.xml file in each makeDirDiff-bin-1.x.zip file Look at other examples of calling MakeDirDiff from Ant FeaturesLicenseMakeDirDiff is released under the Apache Software License. See LICENSE.txt for more details. How to contributeAcknowledgementsI'd like to thank Dmitry Solomadin who was so kind and smart to invent a name of the MakeDirDiff tool for me. Links [Less]