head	1.2;
access;
symbols
	pkgsrc-2026Q3:1.2.0.186
	pkgsrc-2026Q3-base:1.2
	pkgsrc-2026Q2:1.2.0.184
	pkgsrc-2026Q2-base:1.2
	pkgsrc-2026Q1:1.2.0.182
	pkgsrc-2026Q1-base:1.2
	pkgsrc-2025Q4:1.2.0.180
	pkgsrc-2025Q4-base:1.2
	pkgsrc-2025Q3:1.2.0.178
	pkgsrc-2025Q3-base:1.2
	pkgsrc-2025Q2:1.2.0.176
	pkgsrc-2025Q2-base:1.2
	pkgsrc-2025Q1:1.2.0.174
	pkgsrc-2025Q1-base:1.2
	pkgsrc-2024Q4:1.2.0.172
	pkgsrc-2024Q4-base:1.2
	pkgsrc-2024Q3:1.2.0.170
	pkgsrc-2024Q3-base:1.2
	pkgsrc-2024Q2:1.2.0.168
	pkgsrc-2024Q2-base:1.2
	pkgsrc-2024Q1:1.2.0.166
	pkgsrc-2024Q1-base:1.2
	pkgsrc-2023Q4:1.2.0.164
	pkgsrc-2023Q4-base:1.2
	pkgsrc-2023Q3:1.2.0.162
	pkgsrc-2023Q3-base:1.2
	pkgsrc-2023Q2:1.2.0.160
	pkgsrc-2023Q2-base:1.2
	pkgsrc-2023Q1:1.2.0.158
	pkgsrc-2023Q1-base:1.2
	pkgsrc-2022Q4:1.2.0.156
	pkgsrc-2022Q4-base:1.2
	pkgsrc-2022Q3:1.2.0.154
	pkgsrc-2022Q3-base:1.2
	pkgsrc-2022Q2:1.2.0.152
	pkgsrc-2022Q2-base:1.2
	pkgsrc-2022Q1:1.2.0.150
	pkgsrc-2022Q1-base:1.2
	pkgsrc-2021Q4:1.2.0.148
	pkgsrc-2021Q4-base:1.2
	pkgsrc-2021Q3:1.2.0.146
	pkgsrc-2021Q3-base:1.2
	pkgsrc-2021Q2:1.2.0.144
	pkgsrc-2021Q2-base:1.2
	pkgsrc-2021Q1:1.2.0.142
	pkgsrc-2021Q1-base:1.2
	pkgsrc-2020Q4:1.2.0.140
	pkgsrc-2020Q4-base:1.2
	pkgsrc-2020Q3:1.2.0.138
	pkgsrc-2020Q3-base:1.2
	pkgsrc-2020Q2:1.2.0.134
	pkgsrc-2020Q2-base:1.2
	pkgsrc-2020Q1:1.2.0.114
	pkgsrc-2020Q1-base:1.2
	pkgsrc-2019Q4:1.2.0.136
	pkgsrc-2019Q4-base:1.2
	pkgsrc-2019Q3:1.2.0.132
	pkgsrc-2019Q3-base:1.2
	pkgsrc-2019Q2:1.2.0.130
	pkgsrc-2019Q2-base:1.2
	pkgsrc-2019Q1:1.2.0.128
	pkgsrc-2019Q1-base:1.2
	pkgsrc-2018Q4:1.2.0.126
	pkgsrc-2018Q4-base:1.2
	pkgsrc-2018Q3:1.2.0.124
	pkgsrc-2018Q3-base:1.2
	pkgsrc-2018Q2:1.2.0.122
	pkgsrc-2018Q2-base:1.2
	pkgsrc-2018Q1:1.2.0.120
	pkgsrc-2018Q1-base:1.2
	pkgsrc-2017Q4:1.2.0.118
	pkgsrc-2017Q4-base:1.2
	pkgsrc-2017Q3:1.2.0.116
	pkgsrc-2017Q3-base:1.2
	pkgsrc-2017Q2:1.2.0.112
	pkgsrc-2017Q2-base:1.2
	pkgsrc-2017Q1:1.2.0.110
	pkgsrc-2017Q1-base:1.2
	pkgsrc-2016Q4:1.2.0.108
	pkgsrc-2016Q4-base:1.2
	pkgsrc-2016Q3:1.2.0.106
	pkgsrc-2016Q3-base:1.2
	pkgsrc-2016Q2:1.2.0.104
	pkgsrc-2016Q2-base:1.2
	pkgsrc-2016Q1:1.2.0.102
	pkgsrc-2016Q1-base:1.2
	pkgsrc-2015Q4:1.2.0.100
	pkgsrc-2015Q4-base:1.2
	pkgsrc-2015Q3:1.2.0.98
	pkgsrc-2015Q3-base:1.2
	pkgsrc-2015Q2:1.2.0.96
	pkgsrc-2015Q2-base:1.2
	pkgsrc-2015Q1:1.2.0.94
	pkgsrc-2015Q1-base:1.2
	pkgsrc-2014Q4:1.2.0.92
	pkgsrc-2014Q4-base:1.2
	pkgsrc-2014Q3:1.2.0.90
	pkgsrc-2014Q3-base:1.2
	pkgsrc-2014Q2:1.2.0.88
	pkgsrc-2014Q2-base:1.2
	pkgsrc-2014Q1:1.2.0.86
	pkgsrc-2014Q1-base:1.2
	pkgsrc-2013Q4:1.2.0.84
	pkgsrc-2013Q4-base:1.2
	pkgsrc-2013Q3:1.2.0.82
	pkgsrc-2013Q3-base:1.2
	pkgsrc-2013Q2:1.2.0.80
	pkgsrc-2013Q2-base:1.2
	pkgsrc-2013Q1:1.2.0.78
	pkgsrc-2013Q1-base:1.2
	pkgsrc-2012Q4:1.2.0.76
	pkgsrc-2012Q4-base:1.2
	pkgsrc-2012Q3:1.2.0.74
	pkgsrc-2012Q3-base:1.2
	pkgsrc-2012Q2:1.2.0.72
	pkgsrc-2012Q2-base:1.2
	pkgsrc-2012Q1:1.2.0.70
	pkgsrc-2012Q1-base:1.2
	pkgsrc-2011Q4:1.2.0.68
	pkgsrc-2011Q4-base:1.2
	pkgsrc-2011Q3:1.2.0.66
	pkgsrc-2011Q3-base:1.2
	pkgsrc-2011Q2:1.2.0.64
	pkgsrc-2011Q2-base:1.2
	pkgsrc-2011Q1:1.2.0.62
	pkgsrc-2011Q1-base:1.2
	pkgsrc-2010Q4:1.2.0.60
	pkgsrc-2010Q4-base:1.2
	pkgsrc-2010Q3:1.2.0.58
	pkgsrc-2010Q3-base:1.2
	pkgsrc-2010Q2:1.2.0.56
	pkgsrc-2010Q2-base:1.2
	pkgsrc-2010Q1:1.2.0.54
	pkgsrc-2010Q1-base:1.2
	pkgsrc-2009Q4:1.2.0.52
	pkgsrc-2009Q4-base:1.2
	pkgsrc-2009Q3:1.2.0.50
	pkgsrc-2009Q3-base:1.2
	pkgsrc-2009Q2:1.2.0.48
	pkgsrc-2009Q2-base:1.2
	pkgsrc-2009Q1:1.2.0.46
	pkgsrc-2009Q1-base:1.2
	pkgsrc-2008Q4:1.2.0.44
	pkgsrc-2008Q4-base:1.2
	pkgsrc-2008Q3:1.2.0.42
	pkgsrc-2008Q3-base:1.2
	cube-native-xorg:1.2.0.40
	cube-native-xorg-base:1.2
	pkgsrc-2008Q2:1.2.0.38
	pkgsrc-2008Q2-base:1.2
	cwrapper:1.2.0.36
	pkgsrc-2008Q1:1.2.0.34
	pkgsrc-2008Q1-base:1.2
	pkgsrc-2007Q4:1.2.0.32
	pkgsrc-2007Q4-base:1.2
	pkgsrc-2007Q3:1.2.0.30
	pkgsrc-2007Q3-base:1.2
	pkgsrc-2007Q2:1.2.0.28
	pkgsrc-2007Q2-base:1.2
	pkgsrc-2007Q1:1.2.0.26
	pkgsrc-2007Q1-base:1.2
	pkgsrc-2006Q4:1.2.0.24
	pkgsrc-2006Q4-base:1.2
	pkgsrc-2006Q3:1.2.0.22
	pkgsrc-2006Q3-base:1.2
	pkgsrc-2006Q2:1.2.0.20
	pkgsrc-2006Q2-base:1.2
	pkgsrc-2006Q1:1.2.0.18
	pkgsrc-2006Q1-base:1.2
	pkgsrc-2005Q4:1.2.0.16
	pkgsrc-2005Q4-base:1.2
	pkgsrc-2005Q3:1.2.0.14
	pkgsrc-2005Q3-base:1.2
	pkgsrc-2005Q2:1.2.0.12
	pkgsrc-2005Q2-base:1.2
	pkgsrc-2005Q1:1.2.0.10
	pkgsrc-2005Q1-base:1.2
	pkgsrc-2004Q4:1.2.0.8
	pkgsrc-2004Q4-base:1.2
	pkgsrc-2004Q3:1.2.0.6
	pkgsrc-2004Q3-base:1.2
	pkgsrc-2004Q2:1.2.0.4
	pkgsrc-2004Q2-base:1.2
	pkgsrc-2004Q1:1.2.0.2
	pkgsrc-2004Q1-base:1.2
	pkgsrc-2003Q4:1.1.1.1.0.4
	pkgsrc-2003Q4-base:1.1.1.1
	netbsd-1-6-1:1.1.1.1.0.2
	netbsd-1-6-1-base:1.1.1.1
	pkgsrc-base:1.1.1.1
	TNF:1.1.1;
locks; strict;
comment	@# @;


1.2
date	2004.02.05.14.03.26;	author salo;	state Exp;
branches;
next	1.1;

1.1
date	2003.01.16.11.06.37;	author markd;	state Exp;
branches
	1.1.1.1;
next	;

1.1.1.1
date	2003.01.16.11.06.37;	author markd;	state Exp;
branches;
next	;


desc
@@


1.2
log
@Update to version 1.13.

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(?).
@
text
@  FHist is a minimalist 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.

fhist    Keeps track of versions of a file.  It works correctly when
         given binary files as input.

fcomp    Compares two versions of a file, usually line-for-line
         textual comparison.  It is capable of comparing two binary
         files byte-for-byte.

fmerge   Merges together edits from two descendants of a file.
@


1.1
log
@Initial revision
@
text
@d1 10
a10 3
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.
d12 1
a12 20
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.
@


1.1.1.1
log
@Initial import of fhist version 1.12

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.
@
text
@@