From d0abbf81fb91e2fcf59d8d59d49a9aa853d6d550 Mon Sep 17 00:00:00 2001
From: "David E. O'Brien" <obrien@FreeBSD.org>
Date: Sun, 13 Sep 1998 09:09:39 +0000
Subject: [PATCH] State that "-ko" should be used when importing on the Vendor
 branch to prevent CVS from corrupting any vendor RCS Ids.

Lack of said option in Amd import noticed by:	bde
---
 handbook/policies.sgml | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/handbook/policies.sgml b/handbook/policies.sgml
index f9686a1f3d..30a9f40bca 100644
--- a/handbook/policies.sgml
+++ b/handbook/policies.sgml
@@ -1,4 +1,4 @@
-<!-- $Id: policies.sgml,v 1.17 1998-06-10 05:28:59 peter Exp $ -->
+<!-- $Id: policies.sgml,v 1.18 1998-09-13 09:09:39 obrien Exp $ -->
 <!-- The FreeBSD Documentation Project -->
 
 <chapt><heading>Source Tree Guidelines and Policies
@@ -46,6 +46,7 @@ unless they agree to assume this duty.  On the other hand it doesn't
 have to be a committer and it can easily be a group of people.
 
 <sect><heading>Contributed Software</heading>
+<p><em>Contributed by &a.phk; and &a.obrien;.</em>
 
 <p>June 1996.
 
@@ -105,7 +106,8 @@ built or installed software.
 
 <p>The important thing here is that the "src/contrib/tcl" directory
 is created according to the rules: It is supposed to contain the
-sources as distributed (on a proper CVS vendor-branch) with as few
+sources as distributed (on a proper CVS vendor-branch, and without RCS
+keyword expansion) with as few
 FreeBSD-specific changes as possible.  The 'easy-import' tool on
 freefall will assist in doing the import, but if there are any
 doubts on how to go about it, it is imperative that you ask first
@@ -153,7 +155,8 @@ initial import.  Example wording from ``src/contrib/cpio'' is below:
 <verb>This directory contains virgin sources of the original distribution files
 on a "vendor" branch.  Do not, under any circumstances, attempt to upgrade
 the files in this directory via patches and a cvs commit.  New versions or
-official-patch versions must be imported.
+official-patch versions must be imported.  Please remember to import with
+"-ko" to prevent CVS from corrupting any vendor RCS Ids.
 
 For the import of GNU cpio 2.4.2, the following files were removed:
 
@@ -168,12 +171,12 @@ To upgrade to a newer version of cpio, when it is available:
            FreeBSD.
 
         3. Use the command:
-                cvs import -m 'Virgin import of GNU cpio v<version>' \
-                        src/contrib/cpio GNU v<version>
+                cvs import -ko -m 'Virgin import of GNU cpio v<version>' \
+                        src/contrib/cpio GNU cpio_<version>
 
            For example, to do the import of version 2.4.2, I typed:
-                cvs import -m 'Virgin import of GNU v2.4.2' \
-                        src/contrib/cpio GNU v2.4.2
+                cvs import -ko -m 'Virgin import of GNU v2.4.2' \
+                        src/contrib/cpio GNU cpio_2_4_2
 
         4. Follow the instructions printed out in step 3 to resolve any
            conflicts between local FreeBSD changes and the newer version.