| Age | Commit message (Collapse) | Author | Files | Lines |
|---|
|
|
|
Based on patch provided in PR 35539.
And I made two modification related to pkgsrc.
PKGSRC CHANGES:
Make document & nls files to be installed into standard location.
Add test target.
RELEASE NOTES:
Version 1.16 (20-Dec-2005)
* There is a new fmerge -ignore-identical-conflicts option which may be
used to suppress logical conflicts in which the same thing is done by
both variants. This is often a better match for users' expectations for
merging source code.
Version 1.15 (8-Nov-2005)
* There is a new fcomp -no-binary option, which may be used to prevent
the comparison of binary files, instead it treats them both as empty.
* A small build problem on MacOS X has been fixed.
Version 1.14 (8-Jun-2004)
* The ./configure script now understands the --with-nlsdir option, so
that you can place the .mo files.
* The fhist(1) program is now able to cope with numeric modules names.
* The occasional false negative from test 26 has been fixed. It was
failing for some users because of message translation
(internationalization) issues.
|
|
|
|
Based on a patch from MAINTAINER, sent privately.
Changes:
- DESCR should contain a short description, not manual.
- style nits.
No changelong available. Recursive diff to previous version shows some build
fixes, documentation updates and user authentication support(?).
|
|
Provided by Matthew Aldous in PR 18970.
Updated to version 1.12 by Duncan McEwan and tidied up by me.
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 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.
|
