Description

This simple script invokes 'cvs diff' with the given file arguments, then splits the output patch for individual files, applies the reverse patches to temporary files and for each file it then spawns an xxdiff to preview each modified file separately. This allows you to preview the current changes that are made in a cvs checkout.

Optionally, you can decide to accept changed and they are committed file by file by this script. In that case, the spawned xxdiff asks for a decision by the user, then the script takes the following actions upon the answer:

• ACCEPT: keep the new file as it is and commit
• MERGED: copy the merged file on the new file and commit
• REJECT: don't do anything, keep the new file as it but do not commit.

For more generic behaviour about merging patches graphically, see also xxdiff-patch. The current script is really about committing "some" cvs changes.

Usage

xxdiff-cvs-diff [<options>] [<file> <file> ...]

Options

--version     show program's version number and exit
-h, --help    show this help message and exit
-c, --commit  ask for confirmation and commit accepted changes.

Download

Download program here.