3-way-diff-overview (diff3-ov)

Back to the sourceforge-summary

This project is a rather simple perl-Tk script which does the following:

Walk over a given directory-tree, the so called base
Compare the found source-code-files with the two versions derived from this base-version
show the gathered information as a graphical tree, with color-codes for the directories
Colors used:
- Green: no one changed any source-file in this directory
- Yellow : we changed at least one file in this directory
- Blue : "The others" changed at least one file in this directory
- Orange : We as well as "the others" changed at least one file in this directory, but different files
- Red : We as well as "the others" changed the same file(s) in this directory
You can save the generated info as either PNG-Graphic-File or as DOT-File for further work
As addition you also have the possibility to save the info as comma-seperated file (CSV) for input into e.g. a spreadsheet
On large source-trees the generated pictures will be rather big, so you have the possibility to blend out:
- unchanged directories
- directories with changes only by us
- directories with changes only by them

The following pictures shows e.g. only the directories where both "parties" changed, for a Linux-Kernel.
As base I've used Kernel 2.6.13, as derived version one I ve used the lates Kernel of the 2.6.13-series, the 2.6.13.5.
As the other derived version I've used the most recent version of the SuSE 10.0-distribution, the 2.6.13-15.8.

Klick to enlarge	Klick to enlarge (with details) F=Files in this Dir G=Good(not changed) files O=Our files=files changed by us T=Their files=files changed by the others B=files changed by Both
This is a picture of the whole linux-src-tree (attention 500kB)

And here is a picture of the (current really ugly) GUI working on the Linux-Sources:

Klick to enlarge

The aim of this project is to give - before starting to perform a 3-way-diff merge - an overview of what has to be expected when going into the actual merge-process.
When working on bigger projects there might be specialists available for the different areas in the project, so this project should give the project-manager at least a hint, where experts might be needed for the merging.

Back to the sourceforge-summary