1
<?xml version="1.0" encoding="iso-8859-1" ?>
2
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
3
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
5
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
6
<meta name="generator" content="Docutils 0.3.1: http://docutils.sourceforge.net/" />
7
<title>xxdiff-cvs-diff</title>
8
<meta name="author" content="Martin Blais <blais@furius.ca>" />
9
<link rel="stylesheet" href="/docutils-style.css" type="text/css" />
12
<div class="document" id="xxdiff-cvs-diff">
13
<h1 class="title">xxdiff-cvs-diff</h1>
14
<table class="docinfo" frame="void" rules="none">
15
<col class="docinfo-name" />
16
<col class="docinfo-content" />
18
<tr><th class="docinfo-name">Author:</th>
19
<td>Martin Blais <<a class="reference" href="mailto:blais@furius.ca">blais@furius.ca</a>></td></tr>
20
<tr><th class="docinfo-name">Version:</th>
24
<div class="abstract topic">
25
<p class="topic-title">Abstract</p>
26
<p>This simple script invokes 'cvs diff' with the given file arguments, then splits
27
the output patch for individual files, applies the reverse patches to temporary
28
files and for each file it then spawns an xxdiff to preview each modified file
29
separately. This allows you to preview the current changes that are made in a
32
<div class="contents topic" id="table-of-contents">
33
<p class="topic-title"><a name="table-of-contents">Table of Contents</a></p>
35
<li><a class="reference" href="#description" id="id1" name="id1">Description</a></li>
36
<li><a class="reference" href="#usage" id="id2" name="id2">Usage</a></li>
37
<li><a class="reference" href="#options" id="id3" name="id3">Options</a></li>
38
<li><a class="reference" href="#download" id="id4" name="id4">Download</a></li>
39
<li><a class="reference" href="#requirements" id="id5" name="id5">Requirements</a></li>
40
<li><a class="reference" href="#copyright" id="id6" name="id6">Copyright</a></li>
43
<div class="section" id="description">
44
<h1><a class="toc-backref" href="#id1" name="description">Description</a></h1>
45
<p>This simple script invokes 'cvs diff' with the given file arguments, then splits
46
the output patch for individual files, applies the reverse patches to temporary
47
files and for each file it then spawns an xxdiff to preview each modified file
48
separately. This allows you to preview the current changes that are made in a
50
<p>Optionally, you can decide to accept changed and they are committed file by file
51
by this script. In that case, the spawned xxdiff asks for a decision by the
52
user, then the script takes the following actions upon the answer:</p>
54
<li>ACCEPT: keep the new file as it is and commit</li>
55
<li>MERGED: copy the merged file on the new file and commit</li>
56
<li>REJECT: don't do anything, keep the new file as it but do not commit.</li>
58
<p>For more generic behaviour about merging patches graphically, see also
59
xxdiff-patch. The current script is really about committing "some" cvs changes.</p>
61
<div class="section" id="usage">
62
<h1><a class="toc-backref" href="#id2" name="usage">Usage</a></h1>
63
<pre class="literal-block">
64
xxdiff-cvs-diff [<options>] [<file> <file> ...]
67
<div class="section" id="options">
68
<h1><a class="toc-backref" href="#id3" name="options">Options</a></h1>
69
<pre class="literal-block">
70
--version show program's version number and exit
71
-h, --help show this help message and exit
72
-c, --commit ask for confirmation and commit accepted changes.
75
<div class="section" id="download">
76
<h1><a class="toc-backref" href="#id4" name="download">Download</a></h1>
77
<p><a class="reference" href="../bin/xxdiff-cvs-diff">Download program here</a>.</p>
79
<div class="section" id="requirements">
80
<h1><a class="toc-backref" href="#id5" name="requirements">Requirements</a></h1>
85
<li>diffutils (patch)</li>
88
<div class="section" id="copyright">
89
<h1><a class="toc-backref" href="#id6" name="copyright">Copyright</a></h1>
90
<p>Copyright (C) 2003-2004 Martin Blais <<a class="reference" href="mailto:blais@furius.ca">blais@furius.ca</a>>.
91
This code is distributed under the terms of the GNU General Public License.</p>