From 5f10cf252efbd67b0936436dcc3c4d4765a0086d Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Fri, 5 Oct 2007 02:24:39 +0200 Subject: [PATCH] Talk about git instead or in addition to cvs. --- ChangeLog | 10 ++++++++++ doc/gnulib-intro.texi | 4 +++- doc/gnulib-tool.texi | 22 +++++++++++----------- doc/gnulib.texi | 2 +- 4 files changed, 25 insertions(+), 13 deletions(-) diff --git a/ChangeLog b/ChangeLog index 398d23b91..024eabc23 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2007-10-04 Benoit Sigoure + Bruno Haible + + Advertise for the Git server instead of the CVS server. + * doc/gnulib-intro.texi (Steady Development): Mention the Git + repository instead of the CVS one. + * doc/gnulib-tool.texi (VCS Issues): Renamed from "CVS Issues". Talk + about all VCS systems generically. + * doc/gnulib.texi (Introduction): Capitalize `Git'. + 2007-10-04 Bruno Haible * doc/gnulib.texi (Function Substitutes): Explain what an absent module diff --git a/doc/gnulib-intro.texi b/doc/gnulib-intro.texi index 00f500378..304edd2c6 100644 --- a/doc/gnulib-intro.texi +++ b/doc/gnulib-intro.texi @@ -276,7 +276,9 @@ information in the corresponding module description. Gnulib modules are continually adapted, to match new practices, to be consistent with newly added modules, or simply as a response to build failure reports. We don't make releases, but instead recommend to use the -newest version of Gnulib from the CVS, except in periods of major changes. +newest version of Gnulib from the Git repository, except in periods of major +changes. The source tree can also be fetched from a read-only CVS that +mirrors the Git repository. @node Openness @section Openness diff --git a/doc/gnulib-tool.texi b/doc/gnulib-tool.texi index f97c74126..7b5d315a8 100644 --- a/doc/gnulib-tool.texi +++ b/doc/gnulib-tool.texi @@ -31,7 +31,7 @@ a real run without changing anything. * Initial import:: First import of Gnulib modules. * Modified imports:: Changing the import specification. * Simple update:: Tracking Gnulib development. -* CVS Issues:: Integration with CVS. +* VCS Issues:: Integration with Version Control Systems. @end menu @@ -336,8 +336,11 @@ $ gnulib-tool --import This will create, update or remove files, as needed. -@node CVS Issues -@section CVS Issues +@node VCS Issues +@section Issues with Version Control Systems + +If a project stores its source files in a version control system (VCS), +such as CVS, SVN, or Git, one needs to decide which files to commit. All files created by @code{gnulib-tool}, except @file{gnulib-cache.m4}, should be treated like generated source files, like for example a @@ -347,20 +350,20 @@ should be treated like generated source files, like for example a @item In projects which commit all source files, whether generated or not, into -CVS, the @code{gnulib-tool} generated files should all be committed. +their VCS, the @code{gnulib-tool} generated files should all be committed. Gnulib also contains files generated by @command{make} (and removed by @code{make clean}), using information determined by @command{configure} -They should not be checked into CVS, but instead added to +They should not be checked into the VCS, but instead added to @file{.cvsignore}. When you have a Gnulib source file of the form @file{lib/foo_.h}, the corresponding @file{lib/foo.h} is such a file. @item -In projects which customarily omit from the CVS all files that generated +In projects which customarily omit from their VCS all files that are generated from other source files, all these files and directories would not be -added into CVS. The only file that must be added to CVS is +added into the VCS. The only file that must be added to the VCS is @file{gnulib-cache.m4} in the M4 macros directory. Also, the script for -restoring files not in CVS, customarily called @file{autogen.sh} or +restoring files not in the VCS, customarily called @file{autogen.sh} or @file{bootstrap.sh}, will typically contain the statement for restoring the omitted files: @@ -374,6 +377,3 @@ Also it does not report in the ChangeLogs the files that it had to add because they were missing. @end itemize - -The same holds for other version control systems than CVS, such as @samp{git} -or @samp{svn}. diff --git a/doc/gnulib.texi b/doc/gnulib.texi index 571904f28..e30f6cdb2 100644 --- a/doc/gnulib.texi +++ b/doc/gnulib.texi @@ -71,7 +71,7 @@ Resources: @itemize @item Gnulib is hosted at Savannah: @url{http://savannah.gnu.org/projects/gnulib}. Get the sources - through git or CVS from there. + through Git or CVS from there. @item The Gnulib home page: @url{http://www.gnu.org/software/gnulib/}. @end itemize -- 2.11.0