← Back to branch summary

~ubuntu-branches/ubuntu/saucy/xxdiff/saucy

« back to all changes in this revision

Viewing changes to index.html

  • Committer: Bazaar Package Importer
  • Author(s): Tomas Pospisek
  • Date: 2006-12-03 21:41:08 UTC
  • mfrom: (3.1.3 feisty)
  • Revision ID: james.westby@ubuntu.com-20061203214108-l7d3sleqmf1uu1is
Tags: 1:3.2-2
* oops /usr/man slipped in again. Re-re-re-moving it.
* fix doc-base reference problems reported by lintian

Show diffs side-by-side

added added

removed removed

Lines of Context:
index.html
3
3
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
4
4
<head>
5
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/" />
 
6
<meta name="generator" content="Docutils 0.5: http://docutils.sourceforge.net/" />
7
7
<title>xxdiff: Graphical File And Directories Comparator And Merge Tool</title>
8
 
<link rel="stylesheet" href="/docutils-style.css" type="text/css" />
 
8
<link rel="stylesheet" href="style.css" type="text/css" />
9
9
</head>
10
10
<body>
 
11
 
 
12
<div id="project-header">
 
13
  <a href="/"><img src="/home/furius-logo-w.png" id="logo"></a>
 
14
  
 
15
</div>
 
16
 
11
17
<div class="document" id="xxdiff-graphical-file-and-directories-comparator-and-merge-tool">
12
18
<h1 class="title">xxdiff: Graphical File And Directories Comparator And Merge Tool</h1>
13
 
<div class="contents topic" id="table-of-contents">
14
 
<p class="topic-title"><a name="table-of-contents">Table of Contents</a></p>
 
19
<div class="contents topic">
 
20
<p class="topic-title first"><a id="table-of-contents" name="table-of-contents">Table of Contents</a></p>
15
21
<ul class="simple">
16
 
<li><a class="reference" href="#description" id="id3" name="id3">Description</a><ul>
17
 
<li><a class="reference" href="#features" id="id4" name="id4">Features</a><ul>
18
 
<li><a class="reference" href="#unicode-and-inline-editing" id="id5" name="id5">Unicode and Inline Editing</a></li>
19
 
</ul>
20
 
</li>
21
 
</ul>
22
 
</li>
23
 
<li><a class="reference" href="#documentation" id="id6" name="id6">Documentation</a><ul>
24
 
<li><a class="reference" href="#screenshots" id="id7" name="id7">Screenshots</a></li>
25
 
</ul>
26
 
</li>
27
 
<li><a class="reference" href="#download" id="id8" name="id8">Download</a><ul>
28
 
<li><a class="reference" href="#tools" id="id9" name="id9">Tools</a></li>
29
 
<li><a class="reference" href="#packages" id="id10" name="id10">Packages</a></li>
30
 
</ul>
31
 
</li>
32
 
<li><a class="reference" href="#reporting-bugs" id="id11" name="id11">Reporting Bugs</a></li>
33
 
<li><a class="reference" href="#installation" id="id12" name="id12">Installation</a><ul>
34
 
<li><a class="reference" href="#dependencies" id="id13" name="id13">Dependencies</a></li>
35
 
<li><a class="reference" href="#portability" id="id14" name="id14">Portability</a></li>
36
 
</ul>
37
 
</li>
38
 
<li><a class="reference" href="#external-links" id="id15" name="id15">External Links</a></li>
39
 
<li><a class="reference" href="#copyright-and-license" id="id16" name="id16">Copyright and License</a></li>
40
 
<li><a class="reference" href="#author" id="id17" name="id17">Author</a></li>
 
22
<li><a class="reference" href="#description" id="id4" name="id4">Description</a><ul>
 
23
<li><a class="reference" href="#features" id="id5" name="id5">Features</a><ul>
 
24
<li><a class="reference" href="#unicode-and-inline-editing" id="id6" name="id6">Unicode and Inline Editing</a></li>
 
25
</ul>
 
26
</li>
 
27
</ul>
 
28
</li>
 
29
<li><a class="reference" href="#documentation" id="id7" name="id7">Documentation</a><ul>
 
30
<li><a class="reference" href="#screenshots" id="id8" name="id8">Screenshots</a></li>
 
31
</ul>
 
32
</li>
 
33
<li><a class="reference" href="#download" id="id9" name="id9">Download</a><ul>
 
34
<li><a class="reference" href="#tools" id="id10" name="id10">Tools</a></li>
 
35
<li><a class="reference" href="#packages" id="id11" name="id11">Packages</a></li>
 
36
</ul>
 
37
</li>
 
38
<li><a class="reference" href="#reporting-bugs" id="id12" name="id12">Reporting Bugs</a></li>
 
39
<li><a class="reference" href="#installation" id="id13" name="id13">Installation</a><ul>
 
40
<li><a class="reference" href="#dependencies" id="id14" name="id14">Dependencies</a></li>
 
41
<li><a class="reference" href="#portability" id="id15" name="id15">Portability</a></li>
 
42
</ul>
 
43
</li>
 
44
<li><a class="reference" href="#external-links" id="id16" name="id16">External Links</a></li>
 
45
<li><a class="reference" href="#copyright-and-license" id="id17" name="id17">Copyright and License</a></li>
 
46
<li><a class="reference" href="#author" id="id18" name="id18">Author</a></li>
41
47
</ul>
42
48
</div>
43
 
<div class="section" id="description">
44
 
<h1><a class="toc-backref" href="#id3" name="description">Description</a></h1>
 
49
<div class="section">
 
50
<h1><a class="toc-backref" href="#id4" id="description" name="description">Description</a></h1>
45
51
<p>This is the official home of <strong>xxdiff</strong>, a graphical file and
46
52
directories comparator and merge tool.</p>
47
53
<p><strong>xxdiff</strong> is provided under the GNU GPL open source license. It has
49
55
including IRIX, Linux, Solaris, HP/UX, DEC Tru64.  It has been
50
56
deployed inside many large organizations and is being actively
51
57
maintained by its author (Martin Blais).</p>
52
 
<div class="section" id="features">
53
 
<h2><a class="toc-backref" href="#id4" name="features">Features</a></h2>
 
58
<div class="section">
 
59
<h2><a class="toc-backref" href="#id5" id="features" name="features">Features</a></h2>
54
60
<ul class="simple">
55
61
<li>Comparing <strong>two</strong> files, <strong>three</strong> files, or two <strong>directories</strong>
56
62
(shallow and recursive);</li>
77
83
for notification at either freshmeat or sourceforge.  xxdiff is
78
84
implemented in C++ and its runtime dependencies is only the <strong>Qt UI
79
85
toolkit</strong> from TrollTech.</p>
80
 
<div class="section" id="unicode-and-inline-editing">
81
 
<h3><a class="toc-backref" href="#id5" name="unicode-and-inline-editing">Unicode and Inline Editing</a></h3>
 
86
<div class="section">
 
87
<h3><a class="toc-backref" href="#id6" id="unicode-and-inline-editing" name="unicode-and-inline-editing">Unicode and Inline Editing</a></h3>
82
88
<p><strong>xxdiff</strong> does not support comparing files encoded with Unicode.
83
89
Also, it does not support inline editing of the diffed files.  If you
84
90
need these features, you could try emacs or Meld (although both of
86
92
</div>
87
93
</div>
88
94
</div>
89
 
<div class="section" id="documentation">
90
 
<h1><a class="toc-backref" href="#id6" name="documentation">Documentation</a></h1>
 
95
<div class="section">
 
96
<h1><a class="toc-backref" href="#id7" id="documentation" name="documentation">Documentation</a></h1>
91
97
<ul class="simple">
92
 
<li><a class="reference" href="doc/xxdiff-doc.html">User's Manual</a> <em>(user's manual, all features, FAQ)</em>;</li>
93
 
<li><a class="reference" href="doc/xxdiff-integration.html">Integrating xxdiff with scripts</a>;</li>
94
 
<li><a class="reference" href="doc/xxdiff-secrets.html">The almost secret nifty features of xxdiff</a>;</li>
95
 
<li><a class="reference" href="CHANGES">CHANGES</a> <em>(news, recent changes, history)</em>;</li>
96
 
<li><a class="reference" href="TODO">TODO</a> <em>(future features, wishlist)</em>;</li>
 
98
<li><a class="reference" href="doc/xxdiff-doc.html">User's Manual</a> <em>(user's manual, all features, FAQ)</em></li>
 
99
<li><a class="reference" href="doc/xxdiff-secrets.html">The almost secret nifty features of xxdiff</a></li>
 
100
<li><a class="reference" href="doc/xxdiff-integration.html">Integrating xxdiff with scripts</a></li>
 
101
<li><a class="reference" href="doc/xxdiff-scripts.html">Helper Scripts for xxdiff</a></li>
 
102
<li><a class="reference" href="CHANGES">CHANGES</a> <em>(news, recent changes, history)</em></li>
 
103
<li><a class="reference" href="TODO">TODO</a> <em>(future features, wishlist)</em></li>
97
104
</ul>
98
 
<div class="section" id="screenshots">
99
 
<h2><a class="toc-backref" href="#id7" name="screenshots">Screenshots</a></h2>
 
105
<div class="section">
 
106
<h2><a class="toc-backref" href="#id8" id="screenshots" name="screenshots">Screenshots</a></h2>
100
107
<ul class="simple">
101
108
<li><a class="reference" href="doc/screenshots/dirindex.html">Screenshots</a></li>
102
109
</ul>
103
110
</div>
104
111
</div>
105
 
<div class="section" id="download">
106
 
<h1><a class="toc-backref" href="#id8" name="download">Download</a></h1>
 
112
<div class="section">
 
113
<h1><a class="toc-backref" href="#id9" id="download" name="download">Download</a></h1>
107
114
<ul class="simple">
108
 
<li><a class="reference" href="http://sourceforge.net/project/showfiles.php?group_id=2198">Releases Download</a>
109
 
<em>(source and binaries)</em></li>
 
115
<li><a class="reference" href="http://sourceforge.net/project/showfiles.php?group_id=2198">Releases Download</a></li>
 
116
<li><a class="reference" href="/downloads/xxdiff">Alternate Location and Snapshots</a></li>
110
117
<li>A Windows build (with some minor bugs) can be found <a class="reference" href="http://xxdiff.sourceforge.net/download/2.9/windows">here</a>.  No support offered
111
118
though.</li>
112
119
</ul>
113
 
<div class="section" id="tools">
114
 
<h2><a class="toc-backref" href="#id9" name="tools">Tools</a></h2>
 
120
<div class="section">
 
121
<h2><a class="toc-backref" href="#id10" id="tools" name="tools">Tools</a></h2>
115
122
<p><strong>xxdiff</strong> comes with a bunch of wrapper Python scripts that invoke xxdiff in
116
123
creative ways.  The author has been using these for a long time now and decided
117
124
for version 3.0 to clean them up and make them a little more generic so everyone
118
 
can use them.</p>
119
 
<ul>
120
 
<li><p class="first"><a class="reference" href="doc/xxdiff-cond-replace.html">xxdiff-conf-replace</a>: conditional to a user's
121
 
acceptance (or merge decision), replace an original file by a new file
122
 
(typically the result of some external process). This is useful in shell
123
 
loops, a general purpose interactive conditional copy operation;</p>
124
 
</li>
125
 
<li><p class="first"><a class="reference" href="doc/xxdiff-find-grep-sed.html">xxdiff-find-grep-sed</a>: walk a directory
126
 
hierarchy, and perform a conditional sed replacement on a given pattern,
127
 
accepting, rejecting or merging each change graphically;</p>
128
 
</li>
129
 
<li><p class="first"><a class="reference" href="doc/xxdiff-encrypted.html">xxdiff-encrypted</a>: compare contents of encrypted
130
 
files and merged into encrypted file.  This script takes care of decrypting
131
 
the input files and encrypting the merged output file with <a class="reference" href="http://www.gnupg.org">gpg</a>.</p>
132
 
</li>
133
 
<li><p class="first"><a class="reference" href="doc/xxdiff-match.html">xxdiff-match</a>: run xxdiff on a arbitrary set of
134
 
files, matching pairs or triples of files by basename. This effectively allows
135
 
you to do something like this:</p>
 
125
can use them.  As of version 3.2, the standalone scripts have been refactored a
 
126
great deal, to share code together and to make them more stable.  All this code
 
127
is now distributed with xxdiff, in an <tt class="docutils literal"><span class="pre">xxdiff</span></tt> Python package, which you can
 
128
leverage to build your own file transformation scripts around xxdiff.</p>
 
129
<p>See the document <a class="reference" href="doc/xxdiff-scripts.html">Helper Scripts for xxdiff</a> for full
 
130
details.</p>
 
131
<p>The scripts are available in the xxdiff distribution.  To install them and the
 
132
accompanying Python package, use the standard distutils procedure:</p>
136
133
<pre class="literal-block">
137
 
xxdiff-match srcold/*.c srcnew/*.c
 
134
su -  # before root
 
135
cd xxdiff-3.x
 
136
python setup.py install
138
137
</pre>
139
 
</li>
140
 
<li><p class="first"><a class="reference" href="doc/xxdiff-patch-UNFINISHED.html">xxdiff-patch</a> (UNFINISHED): preview and
141
 
accept/reject a patch to a set of files.  <strong>This script is unfinished because
142
 
we have not been dealing with file additions and deletions, feel free to chip
143
 
in</strong>;</p>
144
 
</li>
145
 
<li><p class="first"><a class="reference" href="doc/xxdiff-cvs-diff.html">xxdiff-cvs-diff</a>: preview CVS changes and if
146
 
desired accept/reject changes to commit individually;</p>
147
 
</li>
148
 
</ul>
149
 
<!-- - `xxdiff-subversion <doc/xxdiff-subversion.html>`_: wrapper for xxdiff -->
150
 
<!-- that you can use to set the diff-cmd and diff3-cmd user configuration -->
151
 
<!-- values for `subversion <http://subversion.tigris.org>`_. -->
152
 
<p>Working versions and help files for <a class="reference" href="tools">scripts that support configuration
153
 
management systems</a> can be found in the distribution under the tools/
154
 
directory (CVS, ClearCase, etc.).</p>
 
138
<p>Other tools can be found in the distribution under the tools/ directory (CVS,
 
139
ClearCase, etc.).</p>
155
140
</div>
156
 
<div class="section" id="packages">
157
 
<h2><a class="toc-backref" href="#id10" name="packages">Packages</a></h2>
 
141
<div class="section">
 
142
<h2><a class="toc-backref" href="#id11" id="packages" name="packages">Packages</a></h2>
158
143
<p>Packages are available for some specific operating systems. Here are links to
159
144
the relevant pages.  The author does not publish binaries anymore.</p>
160
145
<ul class="simple">
161
146
<li><a class="reference" href="http://www.sourcepole.ch/sources/software/xxdiff/">Linux / Debian package</a>
162
147
(provided by Tomas Pospisek)</li>
163
 
<li><a class="reference" href="http://www.geek.co.il/RPMS/xxdiff">Linux / Mandrake package</a> (maintained by
164
 
Oded Arbel)</li>
165
 
<li><a class="reference" href="http://www.gentoo.org/dyn/pkgs/dev-util/xxdiff.xml">Linux / Gentoo port</a>
 
148
<li><a class="reference" href="http://www.geek.co.il/RPMS/xxdiff">Linux / Mandrake package (1)</a>
 
149
(maintained by Oded Arbel)</li>
 
150
<li><a class="reference" href="http://www.roberto.foglietta.name/pub/xxdiff">Linux / Mandrake package (2)</a>
 
151
(maintained by Roberto A. Foglietta)</li>
 
152
<li><a class="reference" href="http://packages.gentoo.org/ebuilds/?xxdiff-3.1">Linux / Gentoo port</a>
166
153
(in the dev-utils category)</li>
167
154
<li><a class="reference" href="http://www.openbsd.org/ports.html">OpenBSD / ports tree</a> (maintained by Dan
168
155
Weeks, available in the ports tree)</li>
171
158
</ul>
172
159
</div>
173
160
</div>
174
 
<div class="section" id="reporting-bugs">
175
 
<h1><a class="toc-backref" href="#id11" name="reporting-bugs">Reporting Bugs</a></h1>
 
161
<div class="section">
 
162
<h1><a class="toc-backref" href="#id12" id="reporting-bugs" name="reporting-bugs">Reporting Bugs</a></h1>
176
163
<ul class="simple">
177
164
<li><a class="reference" href="http://sourceforge.net/tracker/?group_id=2198">Reporting Bugs</a>
178
165
<em>(bugs and feature requests)</em></li>
183
170
a history and dates.  Please do not send the author email about bugs.  Log them,
184
171
you don't even need a SourceForge account. Thank you.</p>
185
172
</div>
186
 
<div class="section" id="installation">
187
 
<h1><a class="toc-backref" href="#id12" name="installation">Installation</a></h1>
188
 
<div class="section" id="dependencies">
189
 
<h2><a class="toc-backref" href="#id13" name="dependencies">Dependencies</a></h2>
 
173
<div class="section">
 
174
<h1><a class="toc-backref" href="#id13" id="installation" name="installation">Installation</a></h1>
 
175
<div class="section">
 
176
<h2><a class="toc-backref" href="#id14" id="dependencies" name="dependencies">Dependencies</a></h2>
190
177
<p>Build dependencies are:</p>
191
178
<ul class="simple">
192
179
<li>Qt-3.2 or higher</li>
198
185
<li>Qt-3.2 or higher</li>
199
186
</ul>
200
187
</div>
201
 
<div class="section" id="portability">
202
 
<h2><a class="toc-backref" href="#id14" name="portability">Portability</a></h2>
 
188
<div class="section">
 
189
<h2><a class="toc-backref" href="#id15" id="portability" name="portability">Portability</a></h2>
203
190
<p>xxdiff is known to build and work on a great majority of UNIX platforms where Qt
204
191
works.  It has also been ported it to Mac OSX.</p>
205
192
</div>
206
193
</div>
207
 
<div class="section" id="external-links">
208
 
<h1><a class="toc-backref" href="#id15" name="external-links">External Links</a></h1>
 
194
<div class="section">
 
195
<h1><a class="toc-backref" href="#id16" id="external-links" name="external-links">External Links</a></h1>
209
196
<ul class="simple">
210
197
<li><a class="reference" href="http://sourceforge.net/projects/xxdiff">SourceForge Project Page</a></li>
211
 
<li><a class="reference" href="http://www.freshmeat.net/projects/xxdiff">Freshmeat Application Index</a></li>
 
198
<li><a class="reference" href="http://freshmeat.net/projects/xxdiff">Freshmeat Application Index</a></li>
212
199
<li><a class="reference" href="http://www.osdir.com/Downloads-req-viewdownloaddetails-lid-402-ttitle-xxdiff.html">Open Source Directory (OSDir) application index</a></li>
213
200
<li>Other file comparison programs at <a class="reference" href="http://directory.google.com/Top/Computers/Software/File_Management/File_Comparison/">Google directory</a>,
214
201
<a class="reference" href="http://dmoz.org/Computers/Software/File_Management/File_Comparison/">DMOZ</a></li>
215
202
<li><a class="reference" href="http://furius.ca">Author's Homepage</a></li>
216
203
</ul>
217
204
</div>
218
 
<div class="section" id="copyright-and-license">
219
 
<h1><a class="toc-backref" href="#id16" name="copyright-and-license">Copyright and License</a></h1>
 
205
<div class="section">
 
206
<h1><a class="toc-backref" href="#id17" id="copyright-and-license" name="copyright-and-license">Copyright and License</a></h1>
220
207
<p>Copyright (C) 2001-2004  Martin Blais.  All Rights Reserved.</p>
221
208
<p>This code is distributed under the <a class="reference" href="COPYING">GNU General Public License</a>;</p>
222
209
</div>
223
 
<div class="section" id="author">
224
 
<h1><a class="toc-backref" href="#id17" name="author">Author</a></h1>
 
210
<div class="section">
 
211
<h1><a class="toc-backref" href="#id18" id="author" name="author">Author</a></h1>
225
212
<p>Martin Blais &lt;<a class="reference" href="mailto:blais&#64;furius.ca">blais&#64;furius.ca</a>&gt;</p>
226
213
<!-- official sourceforge logo code snippet -->
227
 
<p><img alt="SourceForge Logo" height="31" src="http://sourceforge.net/sflogo.php?group_id=2198&amp;type=1" width="88" /></p>
 
214
<img alt="SourceForge Logo" src="http://sourceforge.net/sflogo.php?group_id=2198&amp;type=1" style="width: 88px; height: 31px;" />
228
215
</div>
229
216
</div>
230
217
</body>