diff options
author | peter <peter@FreeBSD.org> | 1997-06-22 12:50:33 +0000 |
---|---|---|
committer | peter <peter@FreeBSD.org> | 1997-06-22 12:50:33 +0000 |
commit | 0a4476a7fbb430c03c65895aaf4ff402ef81e0d6 (patch) | |
tree | 05ebc16cbc7a14adf1a73a738dd0013d5685feec /contrib/cvs/src | |
parent | 6d701eaf76faf2ebbc25c764ba001943a9d199f3 (diff) | |
download | FreeBSD-src-0a4476a7fbb430c03c65895aaf4ff402ef81e0d6.zip FreeBSD-src-0a4476a7fbb430c03c65895aaf4ff402ef81e0d6.tar.gz |
remove some stray files
Diffstat (limited to 'contrib/cvs/src')
-rw-r--r-- | contrib/cvs/src/README-rm-add | 31 |
1 files changed, 0 insertions, 31 deletions
diff --git a/contrib/cvs/src/README-rm-add b/contrib/cvs/src/README-rm-add deleted file mode 100644 index 87fd7c6..0000000 --- a/contrib/cvs/src/README-rm-add +++ /dev/null @@ -1,31 +0,0 @@ -WHAT THE "DEATH SUPPORT" FEATURES DO: - -(Some of the death support stuff is documented in the main manual, but -this file is for stuff which noone has gotten around to adding to the -main manual yet). - -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. - -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. |