cvsxxdiff 1.5

cvsxxdiff package contains utilities to graphically review the status and changes on files managed by a CVS repository.

The cvsxxdiff package consists of two utilities: cvsnup and cvsxxdiff.

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.

All the 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.

Here are some key features of "cvsxxdiff":

cvsxxdiff main features:
· display all changes between the local working directory and the remote source repository
· display 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
· display commit logs accompanying the files' revisions being reviewed
· assist in removal of conflicts
· report on the status of the local repository
· colorful and easy to read output
· one file to get the job done. Minimal dependencies to other packages

cvsnup main features:
· display the status of all files not in sync with the trunk
· provide options to show only unupdated files of a specific status
· generate a changelog for the unupdated files. Can be used as summary of changes that will be merged by a `cvs update' command.
· one file to get the job done. Minimal dependencies to other packages

Usage scenarios

This 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.

Requirements:

· xxdiff version 3 and newer
· Python version 2.3 and newer

What's New in This Release:

· In this version, reviewing of patch sets is significantly improved and the formating of the generated output has been polished.
· Man pages for all of the utilities included have been added.



Product's homepage