1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
|
.TH XXDIFF-SCRIPTS 1 "02 March 2008"
.SH NAME
xxdiff-scripts \- Tools that allow automation of tasks with xxdiff
.SH SYNOPSIS
.B xx-cvs-diff, xx-svn-diff, xx-*
.br
.SH DESCRIPTION
\fBxxdiff(1)\fP
is a graphical file and directories comparison and merge tool.
.PP
xxdiff-scripts is a collection of python scripts around xxdiff that
allows automation of various diff, review and merge tasks using xxdiff.
.SH COMMANDS
All the programs in xxdiff-scripts script collection support the usual
GNU command line syntax and have a \-\-help option that has detailed
information about the options supported.
.TP
.B svn-foreign
svn-foreign runs 'svn status' on the given Subversion checkout
directories, to find out which files are unaccounted for and allows
dealing with the files interactively.
.TP
.B xx-cond-replace
xx-cond-replace is a script to conditionally replace an original by a
generated file.
.TP
.B xx-cvs-diff
xx-cvs-diff invokes 'cvs diff' with the given file arguments, and allows
a xxdiff preview of the current changes made in a cvs checkout.
.TP
.B xx-cvs-revcmp
xx-cvs-revcmp displays file differences with the current or a previous
CVS version.
.TP
.B xx-diff-proxy
xx-diff-proxy is a wrapper script for xxdiff that presents options that
are the same as the diff or diff3 commands. This can be used with
programs that expect to call diff/diff3 to present differences to users,
and can be configured with a different diff program.
.TP
.B xx-encrypted
xx-encrypted is a script to compare and merge contents of encrypted
files relatively safely.
.TP
.B xx-filter
xx-filter walks a directory hierarchy, selects some files to be
processed, performs replacements in files and confirms the application
of changes via xxdiff.
.TP
.B xx-find-grep-sed
xx-find-grep-sed walks a directory hierarchy, selects some files to be
processed and performs global sed-like replacements in the set of files.
.TP
.B xx-hg-merge
xx-hg-merge implements an interface compatible with hgmerge.
Basically, it needs to exit with 0 on success, and to place the results of the
merge in the 'left' file.
.TP
.B xx-match
xx-match is a script for invoking xxdiff on matching files using the
basename of the files.
.TP
.B xx-pyline
xx-pyline walks a directory hierarchy, selects some files to be
processed and runs a given Python code on each line of the input.
xxdiff is presented to confirm application of the changes.
.TP
.B xx-rename
xx-rename walks a directory hierarchy, selects some files to be
processed and perform a replacement of a one string to another in the
files and confirm the application of changes via xxdiff.
.TP
.B xx-sql-schemas
xx-sql-schemas dumps the schemas for two PostgreSQL databases, re-orders
the contents so that they diff nicely, and spawns xxdiff on the results.
.TP
.B xx-svn-diff
xx-svn-diff invokes xxdiff for all modified files in the given
Subversion checkout area.
.TP
.B xx-svn-resolve
xx-svn-resolve invokes xxdiff with a 3-way merge view for all files in a
Subversion checkout whose conflicts need to be resolved. Depending on
the exit status, xxdiff also calls 'svn resolve' on the files.
.TP
.B xx-svn-review
xx-svn-review exports two SVN revision and reviews them.
.SH SEE ALSO
.IP "\fI/usr/share/doc/xxdiff-scripts/html/xxdiff-scripts.html\fR"
A description of the Python scripts and infrastructure that is provided
around xxdiff, to faciliate implementing processes requiring display and
selection of differences.
.IP "\fI/usr/share/doc/xxdiff-scripts/txt/xxdiff-scripts.txt.gz\fR"
The above documentation in plain text.
.IP "xxdiff(1)"
The xxdiff manual page
.BR
.SH AUTHOR
xxdiff was written by Martin Blais <blais@furius.ca>
.PP
This manual page was written by Y Giridhar Appaji Nag <giridhar@appaji.net>
for the Debian project (but may be used by others).
|
