| Author: | Martin Blais <blais@furius.ca> |
|---|---|
| Version: | 1.8 |
Abstract
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.
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:
For more generic behaviour about merging patches graphically, see also xxdiff-patch. The current script is really about committing "some" cvs changes.
xxdiff-cvs-diff [<options>] [<file> <file> ...]
--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.
Copyright (C) 2003-2004 Martin Blais <blais@furius.ca>. This code is distributed under the terms of the GNU General Public License.