/dirdiff, Displays differences between directories
2.1nb2, Package name:
dirdiff-2.1nb2, Maintainer: pkgsrc-users
dirdiff is a graphical tool to display the differences(a la diff)
between files in directories. Given two or more directory trees,
dirdiff will display the differences between them in various glorious
colors. It provides merging and the creation of patches.
Required to run:
Master sites: SHA1:
Version history: (Expand)
- (2014-01-11) Updated to version: dirdiff-2.1nb2
- (2012-08-22) Updated to version: dirdiff-2.1nb1
- (2012-06-11) Package has been reborn
- (2012-06-11) Package deleted from pkgsrc
- (2006-10-08) Updated to version: dirdiff-2.1
- (2006-02-06) Updated to version: dirdiff-1.6nb3
CVS history: (Expand)
| 2015-11-04 00:49:56 by Alistair G. Crooks | Files touched by this commit (330) |
Add SHA512 digests for distfiles for misc category
Problems found locating distfiles:
Package colorls: missing distfile ls.tar.gz
Package molden: missing distfile molden-4.6/molden4.6.tar.gz
Package softmaker-office-demo: missing distfile ofl06trial.tgz
Otherwise, existing SHA1 digests verified and found to be the same on
the machine holding the existing distfiles (morden). All existing
SHA1 digests retained for now as an audit trail.
| 2014-01-20 20:20:09 by Joerg Sonnenberger | Files touched by this commit (22) |
Fix build with TCL 8.6
| 2014-01-11 15:42:06 by Adam Ciarcinski | Files touched by this commit (106) |
Revbump after updating tcl/tk.
| 2012-10-08 11:57:42 by Aleksej Saushev | Files touched by this commit (239) |
Drop PKG_DESTDIR_SUPPORT setting, "user-destdir" is default these days.
| 2012-08-22 01:49:27 by John Marino | Files touched by this commit (90) |
Recursive PKGREVISION bump for tcl and tk upgrade to 8.5.12
| 2010-02-11 20:07:56 by Joerg Sonnenberger | Files touched by this commit (1) |
| 2006-10-08 13:43:06 by OBATA Akio | Files touched by this commit (2) | |
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
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
- 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
- Options to allow the user to select external diff and file viewer
* 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.
| 2006-03-04 22:31:14 by Johnny C. Lam | Files touched by this commit (2257) |
Point MAINTAINER to pkgsrc-users@NetBSD.org in the case where no
developer is officially maintaining the package.
The rationale for changing this from "tech-pkg" to \
that it implies that any user can try to maintain the package (by
submitting patches to the mailing list). Since the folks most likely
to care about the package are the folks that want to use it or are
already using it, this would leverage the energy of users who aren't