head	1.2;
access;
symbols
	RELENG_2_1_7_RELEASE:1.1.1.1
	RELENG_2_1_6_1_RELEASE:1.1.1.1
	RELENG_2_1_6_RELEASE:1.1.1.1
	CVS_1_6_3_END:1.1.1.1
	RELENG_2_1_5_RELEASE:1.1.1.1
	RELENG_2_1_0:1.1.1.1.0.2
	cvs_1_6_3_951211:1.1.1.1
	CYCLIC:1.1.1;
locks; strict;
comment	@# @;


1.2
date	96.08.20.23.54.09;	author peter;	state dead;
branches;
next	1.1;

1.1
date	95.12.10.22.30.47;	author peter;	state Exp;
branches
	1.1.1.1;
next	;

1.1.1.1
date	95.12.10.22.30.47;	author peter;	state Exp;
branches;
next	;


desc
@@


1.2
log
@Update to use the cvs-1.8.1 sources from src/contrib/cvs
@
text
@WHAT THE "DEATH SUPPORT" FEATURES DO:

(this really should be in the main manual, but noone has gotten around
to updating it).

CVS with death support can record when a file is active, or alive, and
when it is removed, or dead.  With this facility you can record the
history of a file, including the fact that at some point in its life
the file was removed and then later added.

First, the following now works as expected:

	touch foo
	cvs add foo ; cvs ci -m "added" foo
	rm foo
	cvs rm foo ; cvs ci -m "removed" foo
	touch foo
	cvs add foo ; cvs ci -m "resurrected" foo

Second, files can now be added or removed in a branch and later merged
into the trunk.

	cvs update -A
	touch a b c
	cvs add a b c ; cvs ci -m "added" a b c
	cvs tag -b branchtag
	cvs update -r branchtag
	touch d ; cvs add d
	rm a ; cvs rm a
	cvs ci -m "added d, removed a"
	cvs update -A
	cvs update -jbranchtag

Added and removed files may also be merged between branches.

Files removed in the trunk may be merged into branches.

Files added on the trunk are a special case.  They cannot be merged
into a branch.  Instead, simply branch the file by hand.

I also extended the "cvs update -j" semantic slightly.  Like before,
if you use two -j options, the changes made between the first and the
second will be merged into your working files.  This has not changed.

If you use only one -j option, it is used as the second -j option.
The first is assumed to be the greatest common ancestor revision
between the revision specified by the -j and the BASE revision of your
working file.
@


1.1
log
@Initial revision
@
text
@@


1.1.1.1
log
@Import CVS-1.6.3-951211.. Basically, this is the cvs-1.6.2 release
plus a couple of minor changes..  

Some highlights of the new stuff that was not in the old version:
 - remote access support.. full checkout/commit/log/etc..
 - much improved dead file support..
 - speed improvements
 - better $CVSROOT handling
 - $Name$ support
 - support for a "cvsadmin" group to cut down rampant use of "cvs admin -o"
 - safer setuid/setgid support
 - many bugs fixed.. :-)
 - probably some new ones.. :-(
 - more that I cannot remember offhand..
@
text
@@
