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
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
|
ReadMe(FHist) ReadMe(FHist)
NAME
fhist - file history and comparison tools
Copyright (C) 1991, 1992, 1993, 1994, 1995, 1996, 1997,
1998, 1999, 2000, 2001, 2002, 2003 Peter Miller; All
rights reserved.
Portions of this program are
Copyright (C) 1990 David I. Bell.
The fhist package is distributed under the terms of the
GNU General Public License, see the LICENSE section,
below, for more information.
DESCRIPTION
The FHist package contains 3 utilities, a file history
tool ``fhist'', a file comparison tool ``fcomp'', and a
file merging tool ``fmerge'. All three are bundled
together, because they all use the same minimal-difference
algorithm.
fhist
Keeps track of versions of a file. It works
correctly when given binary files as input. See
fhist(1) for more information.
fcomp
Compares two versions of a file, usually line-for-
line textual comparison. It is capable of
comparing two binary files byte-for-byte. See
fcomp(1) for more information.
fmerge
Merges together edits from two descendants of a
file. See fmerge(1) for more information.
The history tool presented here, fhist, is a minimal
history tool. It provides no locking or branching. This
can be useful in contexts where the configuration
management or change control be being provided by some
other tool.
REFERENCES
This program is based on the algorithm in
An O(ND) Difference Algorithm and Its Variations,
Eugene W. Myers, TR 85-6, 10-April-1985, Department
of Computer Science, The University of Arizona,
Tuscon, Arizona 85721.
See also:
A File Comparison Program, Webb Miller and Eugene
W. Myers, Software Practice and Experience, Volume
15, No. 11, November 1985.
BUILDING
For complete instructions for host to build these
programs, see the BUILDING file included in this
distribution.
ARCHIVE SITE
The latest version of fhist is available on the Web from:
URL: http://www.canb.auug.org.au/~millerp/
File: fhist.html # The FHist page.
File: fhist-1.13.README # Description, from the tar file
File: fhist-1.13.lsm # Description, in LSM format
File: fhist-1.13.spec # RedHat package spec
File: fhist-1.13.tar.Z # The complete source.
FHist is also carried by sunsite.unc.edu in its Linux
archives. You will be able to find FHist on any of its
mirrors.
URL: ftp://sunsite.unc.edu/pub/Linux/devel/vc/
File: fhist-1.13.README # Description, from the tar file
File: fhist-1.13.lsm # Description, in LSM format
File: fhist-1.13.spec # RedHat package spec
File: fhist-1.13.tar.Z # The complete source.
This site is extensively mirrored around the world, so
look for a copy near you (you will get much better
response).
COPYRIGHT
fhist version 1.13.D001
Copyright (C) 1991, 1992, 1993, 1994, 1995, 1996, 1997,
1998, 1999, 2000, 2001, 2002, 2003 Peter Miller; All
rights reserved.
This program is derived from a work
Copyright (C) 1990 David I. Bell.
This program is free software; you can redistribute it
and/or modify it under the terms of the GNU General Public
License as published by the Free Software Foundation;
either version 2 of the License, or (at your option) any
later version.
This program is distributed in the hope that it will be
useful, but WITHOUT ANY WARRANTY; without even the implied
warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
PURPOSE. See the GNU General Public License for more
details.
You should have received a copy of the GNU General Public
License along with this program; if not, write to the Free
Software Foundation, Inc., 59 Temple Place, Suite 330,
Boston, MA 02111, USA.
AUTHORS
Peter Miller Web: http://www.canb.auug.org.au/~millerp
/\/\* E-Mail: millerp@canb.auug.org.au
David I. Bell Web: http://www.canb.auug.org.au/~dbell
E-Mail: dbell@canb.auug.org.au
RELEASE NOTES
For excruciating detail, and also acknowledgements of
those who generously sent me feedback, please see the
etc/CHANGES.1.13 file included in this distribution.
A number of features and bug fixes have been added to
fhist with this release. A few of them are detailed here:
Version 1.12
* Some build problems have been fixed.
Version 1.11
* Some build problems, relating to modern ANSI C compilers
choking on K&R function definitions with variable
arguments, have been fixed.
* Two bugs relating to the handling of binary files by
fhist(1) have been fixed.
* A bug which left garbage files behind when a create
failed has been fixed.
Version 1.10
* Interrupt handling has been improved.
* There is a new fhist -No_Keywords option, used to
completely disable keyword substitution.
* Several build problems have been fixed.
Version 1.9
No public release.
Version 1.8
* There is a new -BINary option for the fcomp(1) program,
which compares binary files a byte at time, printing the
results in hexadecimal.
* The fcomp(1) program now silently copes with CRLF line
terminations.
Version 1.7
* The fhist(1) command now has a --binary option, which
may be used to store the history of binary files.
* The fhist(1) command has a new --make-path option, which
requests that the history directory be created if
necessary.
* A bug in fhist(1) wich caused a SEGFAULT when you used
the -t option (extract to terminal) has been fixed.
Version 1.6
* An RPM spec file has been added to the distribution.
* The code is now more robust about what various UNIX
systems return from pathconf().
* A bug with the ``fcomp -blank'' option has been fixed.
Version 1.5
* Binary files are now detected on input, and the
utilities file gracefully with a warning or error message,
as appropriate.
* Some buffer over-run bugs have been fixed.
* Several improvements have been made to the portability.
Version 1.4
* The install and build procedures have been made more
robust, and they take note of more of the information
provided by GNU Autoconf.
* The error messages have been internationalized, so it is
now possible to obtain error messages in your native
language. (If you would like to contribute with error
message translations, please contact the author.)
* An LSM description has been added, along with a HTML
page to present it all nicely at the archive site.
* A RedHat Package Manager spec file has been added, so
that a RedHat package can be created. The spec file is in
the standard distribution.
Version 1.3
This version was not distributed at all.
Version 1.2
This version was not distributed very widely.
* The non-standard isblank function is no longer used, it
cause too many portability problems.
* The use of pathconf is not more robust for more
operating systems.
Version 1.1
* The fhist package now uses a shell script called
configure to configure itself. This script is generated
using the GNU Autoconf utility. This should make fhist
significantly easier to configure, and significantly more
portable.
* A bug has been fixed in the conflict reporting of the
fmerge program. It now correctly opens the conflicts
file.
* The fhist program now uses pathconf(2) to determine file
name length limits.
Reference Manual FHist ReadMe(FHist)
|
