Added a note on `cvs import' and multiple "vendors". -- Hari

svn path=/trunk/; revision=141

1 files changed, 57 insertions, 0 deletions

diff --git a/support/README-gnome b/support/README-gnome
index 7ada2e41..1b04a5f3 100644
--- a/support/README-gnome
+++ b/support/README-gnome
@@ -13,3 +13,60 @@ sorted out with the glibc maintainer before long.
 
 - Tom Tromey <tromey@cygnus.com>
   Wed, Mar 4 1998
+
+Notes on CVS import:
+
+This directory has files from two "vendors".  There are, thus, two
+vendor branches
+
+	1.1.1	GNU
+	1.1.2	SNPRINTF_de_Raadt
+
+The files that have "vendor" versions are:
+
+	argp-ba.c		GNU
+	argp-eexst.c		GNU
+	argp-fmtstream.c	GNU
+	argp-fmtstream.h	GNU
+	argp-fs-xinl.c		GNU
+	argp-help.c		GNU
+	argp-namefrob.h		GNU
+	argp-parse.c		GNU
+	argp-pv.c		GNU
+	argp-pvh.c		GNU
+	argp-test.c		GNU
+	argp-xinl.c		GNU
+	argp.h			GNU
+	getopt.c		GNU
+	getopt.h		GNU
+	getopt1.c		GNU
+	strcasecmp.c		GNU
+	strndup.c		GNU
+	strnlen.c		GNU
+	strtok_r.c		GNU
+	vsnprintf.c		SNPRINTF_de_Raadt
+
+To find out the list of changes made against a "vendor" revision, you
+can say
+
+	cvs diff -r <vendor-branch-tag> 
+
+When any of these files are changed by the vendor, they can be
+reimported.  At the time of importing, please make sure you use the
+correct branch revision and vendor tag.
+
+So, if you are importing changes to any of the `GNU' files, please use
+
+    cvs import -b 1.1.1 gnome-common/support GNU <new-release-tag>
+
+If you are importing changes to "SNPRINTF_de_Raadt" files, please use
+
+    cvs import -b 1.1.2 gnome-common/support SNPRINTF_de_Raadt <new-rel-tag>
+	         ^^^^^^^                    ^^^^^^^^^^^^^^^^^^^
+		 |			    |
+		 Branch revision	    Vendor Tag
+
+In other words the "Branch revision" and "Vendor Tag" must agree.
+
+- Raja R Harinath <harinath@cs.umn.edu>
+  1998-03-11