Add a blurb on how to import newer versions of patch(1) so

that others don't make the same bone-headed mistakes that
I just did.

Obtained from: Peter Wemm's version of this file in contrib_cvs

1 files changed, 37 insertions, 0 deletions

diff --git a/contrib/patch/FREEBSD-upgrade b/contrib/patch/FREEBSD-upgrade
new file mode 100644
index 000000000000..c2ce7e8c21ba
--- /dev/null
+++ b/contrib/patch/FREEBSD-upgrade
@@ -0,0 +1,37 @@
+This directory contains the virgin patch source on the vendor branch.  Do
+not under any circumstances commit new versions onto the mainline, new
+versions or official-patch versions must be imported.
+
+To prepare a new patch dist for import, extract it into a fresh directory
+and remove the following files (and any others that are non-FreeBSD
+specific):
+
+Makefile.in
+config.hin
+configure
+configure.in
+install-sh
+mkinstalldirs
+pc/*
+
+The only other change that was made to the original tarball was to
+rename patch.man to patch.1.
+
+patch has RCS Id, Name and Header tags. It needs to be imported with -ko.
+
+It is imported from it's top level directory something like this:
+  cvs -n import -ko src/contrib/patch FSF patch_<version>
+
+The -n option is "don't do anything" so you can see what is about to happen
+first.  Remove it when it looks ok.
+
+The initial import was done with:
+  cvs import -ko src/contrib/patch FSF patch_2_4
+
+When new versions are imported, cvs will give instructions on how to merge
+the local and vendor changes when/if conflicts arise..
+
+steve@freebsd.org - 29 June 1997
+
+Current local changes:
+  - Make patch(1) compile -Wall clean.