From ee7ee9b7369157592755539c255c008a1dcad022 Mon Sep 17 00:00:00 2001 From: obache Date: Sun, 8 Oct 2006 11:43:06 +0000 Subject: Update dirdiff to 2.1. Patch applied by Martin Wilke via PR 34432. What's new in dirdiff-2.1. -------------------------- * The diff display window can now display 3-way, 4-way and 5-way diffs as well as the normal 2-way diffs. When a line is identified as coming from multiple files, most of it will be colored for the newest of those files, and extra colored bars at the left of the line will identify which other files it is in. * You can now modify the diff display interactively (for example, to make it more understandable). You can use the middle mouse button to drag the blue separator bars to expose more context, or drag colored diff lines up and down (the movement is constrained so as to not alter the meaning of the diff). Dragging context lines splits them into colored diff lines. * There is now a menu on the diff display window for generating patches embodying the changes that could be made with the merge menu. That is, the diff lines that are checked in the diff viewer will be made into - and + lines in the generated patch. * The BitKeeper integration feature has been removed. I plan to add generic features for integration with arbitrary SCM systems in future. What was new in dirdiff-2.0. ---------------------------- * Some great new features from Dorothy Robinson: - A dialog box for choosing the directories to be diffed, if dirdiff is invoked without specifying any directories or files on the command line. - Colored icons instead of squares in the file list window. - Colored icons in the Diff and Copy/Del menus (provided you are using Tk 8.4 or later). - Modifications so dirdiff can be used under Windows. - A color key showing the ordering of the colors. - Use of two-level menus for the Diff, Copy/Del and Patch menus (the Diff and Copy/Del menus use two levels only when there are sufficient alternatives for it to make things simpler). - A filename search function using the filename bar in the file list window. - Options to allow the user to select external diff and file viewer programs. * There is now a mode for ignoring files in a directory if they match any of the patterns listed in the .cvsignore in that directory. This is invoked with the -C command-line option or by choosing the "Ignore files in .cvsignore" option in the Options menu. * Some users have requested a mode in which, when a directory exists in one tree but not another, dirdiff display the files in that directory as existing in the one tree but not the other (rather than displaying just a single line for the directory). This mode is enabled by choosing the "Show files that aren't in some dirs" option in the Options menu. * Trees can now be marked as "read-only" in the Options menu. This means that menu options that would modify those trees (in the Copy/Del, Touch and Merge menus) will not be offered. * Files can be added to the excluded file list by selecting them and choosing "Exclude selection" under the File menu. * Changes to the "Underline tabs" mode now take effect immediately. --- misc/dirdiff/Makefile | 5 ++--- misc/dirdiff/distinfo | 8 ++++---- 2 files changed, 6 insertions(+), 7 deletions(-) (limited to 'misc') diff --git a/misc/dirdiff/Makefile b/misc/dirdiff/Makefile index b8c73f786b2..e03f169ca56 100644 --- a/misc/dirdiff/Makefile +++ b/misc/dirdiff/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.12 2006/03/04 21:30:10 jlam Exp $ +# $NetBSD: Makefile,v 1.13 2006/10/08 11:43:06 obache Exp $ # -DISTNAME= dirdiff-1.6 -PKGREVISION= 3 +DISTNAME= dirdiff-2.1 CATEGORIES= misc tk MASTER_SITES= http://samba.org/ftp/paulus/ diff --git a/misc/dirdiff/distinfo b/misc/dirdiff/distinfo index 40ccc5ad2c0..888413b30d7 100644 --- a/misc/dirdiff/distinfo +++ b/misc/dirdiff/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.3 2005/02/24 11:02:51 agc Exp $ +$NetBSD: distinfo,v 1.4 2006/10/08 11:43:06 obache Exp $ -SHA1 (dirdiff-1.6.tar.gz) = b06003909ef50d4668660f3db4ba703ac17c4f14 -RMD160 (dirdiff-1.6.tar.gz) = a293f3f327cc1524e5076c765e120baa9b9749ea -Size (dirdiff-1.6.tar.gz) = 27965 bytes +SHA1 (dirdiff-2.1.tar.gz) = baa355b2eae4886de57a47cb69d8214c7545c0e8 +RMD160 (dirdiff-2.1.tar.gz) = 280ead77db4371eee2d6cc6d5df3ee362585fbb0 +Size (dirdiff-2.1.tar.gz) = 43105 bytes SHA1 (patch-aa) = 3d82bc63fe30b8c4eed2a84571d56f769d93a56a -- cgit v1.2.3