3-way-diff-overview / News: Recent posts

diff3-ov is a tool, written in perl/Tk, which should help you in the process of performing a 3-way-diff and merge on large Software-Projects. diff3-ov gives you an overview (in a graphical way/as a html/csv-table) of the whole project, where you have to expect merging-activities on changed areas and therefore have to allocate experts.

This new version includes several small changes, bugfixes and GUI-enhancements (still ugly...), and now is also able to detect files that are changed the same by the different parties (usually when patches are exchanged).
In all previous versions these files were treated as bad!

diff3-ov is a tool, written in perl/Tk, which should help you in the process of performing a 3-way-diff and merge on large Software-Projects. diff3-ov gives you an overview (in a graphical way/as a html/csv-table) of the whole project, where you have to expect merging-activities on changed areas and therefore have to allocate experts.

This new version includes HTML-Output and a Report for the pure "managers" as PDF-File (via Latex) and some small bugfixes.

I just upload the first version of diff3-ov to the project-page. In the screenshot-area you can see the output of the program, which was checking three versions of the Linux-Kernel.
As base the kernel 2.6.13 was used, one derived version was 2.6.13.5, the other derived version is the actual kernel for the SuSE 10.0 Distribution: 2.6.13-15.8.
So the picture shows areas, where real merge-activities have to be expected, the directories where only SuSE or the 2.6.13.5-workers have changed are not shown.