diff options
author | peter <peter@FreeBSD.org> | 2002-12-02 03:13:37 +0000 |
---|---|---|
committer | peter <peter@FreeBSD.org> | 2002-12-02 03:13:37 +0000 |
commit | 3dc96f7243ece1d1f7f87b03334f840415e0db63 (patch) | |
tree | 15f00bd8ebd718713d8c0a8707ebebfced99c550 /contrib/cvs/doc | |
parent | cf46dfb750863d760d19b9858b0a336b158275da (diff) | |
download | FreeBSD-src-3dc96f7243ece1d1f7f87b03334f840415e0db63.zip FreeBSD-src-3dc96f7243ece1d1f7f87b03334f840415e0db63.tar.gz |
Import cvs-1.11.2.1 as of 2002/12/01 onto vendor branch. This fixes all
of the bugs that I know of. We've been running a slightly older version
of this on freefall/repoman, where it was afflicted by a silly merge error
on my part (fixed).
Approved by: re
Diffstat (limited to 'contrib/cvs/doc')
-rw-r--r-- | contrib/cvs/doc/ChangeLog | 65 | ||||
-rw-r--r-- | contrib/cvs/doc/HACKING.DOCS | 37 | ||||
-rw-r--r-- | contrib/cvs/doc/Makefile.in | 74 | ||||
-rw-r--r-- | contrib/cvs/doc/cvs.texinfo | 41 | ||||
-rw-r--r-- | contrib/cvs/doc/stamp-1 | 4 | ||||
-rw-r--r-- | contrib/cvs/doc/stamp-vti | 8 | ||||
-rw-r--r-- | contrib/cvs/doc/version-client.texi | 4 | ||||
-rw-r--r-- | contrib/cvs/doc/version.texi | 8 |
8 files changed, 180 insertions, 61 deletions
diff --git a/contrib/cvs/doc/ChangeLog b/contrib/cvs/doc/ChangeLog index 713fa70..7662226 100644 --- a/contrib/cvs/doc/ChangeLog +++ b/contrib/cvs/doc/ChangeLog @@ -1,10 +1,65 @@ +2002-11-18 Derek Price <derek@ximbiot.com> + + * cvs.texinfo (commitinfo): Explain the environment of commands + run by commitinfo a little more fully. + (Original patch from Fred L. Drake, Jr. <fdrake@acm.org>.) + + * cvs.texinfo: Change the wording of some of the commit index entries + for consistency and clarity. + * stamp-vti: Regenerated. + * version.texi: Ditto. + +2002-09-24 Derek Price <derek@ximbiot.com> + + * Makefile.in: Regenerated using Automake 1.6.3. + +2002-09-24 Derek Price <derek@ximbiot.com> + + * Makefile.in: Regenerated. + +2002-09-20 Derek Price <derek@ximbiot.com> + + * stamp-vti: Regenerated. + * version.texi: Ditto. + +2002-08-16 Derek Price <derek@ximbiot.com> + + * cvs.texinfo (Error messages): Update CVS_BADROOT notes to specify + new configure option instead. + + * stamp-vti: Regenerated. + * version.texi: Ditto. + +2002-08-12 Derek Price <oberon@umich.edu> + + * stamp-vti: Regenerated. + * version.texi: Ditto. + +2002-08-06 Derek Price <oberon@umich.edu> + + * stamp-vti: Regenerated. + * version.texi: Ditto. + +2002-08-05 Derek Price <oberon@umich.edu> + + * cvs.texinfo: Correct typo. + (Thanks to Chandra Mouleeswaran <chandra@openharbor.com>.) + +2002-04-30 Derek Price <oberon@umich.edu> + + * Makefile.in: Regenerated with automake 1.6. + 2002-04-18 Derek Price <oberon@umich.edu> - * doc/Makefile.am: Add FIXME comment about an automake bug. - * doc/Makefile.in: Regenerated. - * doc/stamp-vti: Regenerated as a workaround for the above mentioned - automake bug. - * doc/version.texi: Ditto. + * Makefile.am: Add FIXME comment about an automake bug. + * Makefile.in: Regenerated. + +2002-04-18 Derek Price <oberon@umich.edu> + + * stamp-1: Regenerated for 1.11.2.1 version update. + * stamp-vti: Ditto. + * version-client.texi: Ditto. + * version.texi: Ditto. 2002-04-17 Derek Price <oberon@umich.edu> diff --git a/contrib/cvs/doc/HACKING.DOCS b/contrib/cvs/doc/HACKING.DOCS new file mode 100644 index 0000000..079522e --- /dev/null +++ b/contrib/cvs/doc/HACKING.DOCS @@ -0,0 +1,37 @@ +Here's some of the texinfo conventions the CVS documentation uses: + +@code{ ... } command usage & command snippets, including + command names. +@var{ ... } variables - text which the user is expected to + replace with some meaningful text of their own + in actual usage. +@file{ ... } file names +@samp{ ... } for most anything else you need quotes around + (often still misused for command snippets) +@example ... @end example example command usage and output, etc. +@emph{ ... } emphasis - warnings, stress, etc. This will be + bracketed by underline characters in info files + (_ ... _) and in italics in PDF & probably in + postscript & HTML. +@noindent Suppresses indentation of the following + paragraph. This can ocassionally be useful + after examples and the like. +@cindex ... Add a tag to the index. +@pxref{ ... } Cross reference in parentheses. +@xref{ ... } Cross reference. + +Preformatted text should be marked as such (use @example... there may be other +ways) since many of the final output formats can use relational fonts otherwise +and marking it as formatted should restrict it to a fixed wiidth font. Keep +this sort of text to 80 characters or less per line since larger may not be +properly viewable for some info users. + +There are dictionary lists and function definition markers. Scan cvs.texinfo +for their usage. There may be table definitions as well but I haven't used +them. + +Use lots of index markers. Scan the index for the current style. Try to reuse +an existing entry if the meaning is similar. + +For more on using texinfo docs, see the `info texinfo' documentation or +http://www.gnu.org/manual/texinfo/texinfo.html . diff --git a/contrib/cvs/doc/Makefile.in b/contrib/cvs/doc/Makefile.in index 8d3814a..64855ea 100644 --- a/contrib/cvs/doc/Makefile.in +++ b/contrib/cvs/doc/Makefile.in @@ -1,6 +1,7 @@ -# Makefile.in generated automatically by automake 1.5 from Makefile.am. +# Makefile.in generated by automake 1.6.3 from Makefile.am. +# @configure_input@ -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 +# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 # Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -25,7 +26,6 @@ # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. - SHELL = @SHELL@ srcdir = @srcdir@ @@ -56,9 +56,13 @@ AUTOCONF = @AUTOCONF@ AUTOMAKE = @AUTOMAKE@ AUTOHEADER = @AUTOHEADER@ +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_DATA = @INSTALL_DATA@ +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_HEADER = $(INSTALL_DATA) transform = @program_transform_name@ @@ -68,22 +72,26 @@ POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : + +EXEEXT = @EXEEXT@ +OBJEXT = @OBJEXT@ +PATH_SEPARATOR = @PATH_SEPARATOR@ AMTAR = @AMTAR@ AWK = @AWK@ CC = @CC@ CSH = @CSH@ DEPDIR = @DEPDIR@ -EXEEXT = @EXEEXT@ +EDITOR = @EDITOR@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ KRB4 = @KRB4@ LN_S = @LN_S@ -OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PERL = @PERL@ PR = @PR@ PS2PDF = @PS2PDF@ RANLIB = @RANLIB@ ROFF = @ROFF@ +STRIP = @STRIP@ TEXI2DVI = @TEXI2DVI@ VERSION = @VERSION@ YACC = @YACC@ @@ -132,7 +140,7 @@ MAINTAINERCLEANFILES = \ SUFFIXES = .aux .txt .pdf subdir = doc mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -CONFIG_HEADER = $(top_builddir)/config.h $(top_builddir)/src/options.h +CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CFLAGS = @CFLAGS@ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -153,9 +161,7 @@ $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && \ $(AUTOMAKE) --gnu doc/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - cd $(top_builddir) && \ - CONFIG_HEADERS= CONFIG_LINKS= \ - CONFIG_FILES=$(subdir)/$@ $(SHELL) ./config.status + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) $(srcdir)/version.texi: $(srcdir)/stamp-vti @: @@ -210,7 +216,7 @@ cvsclient.dvi: cvsclient.texi $(srcdir)/version-client.texi `echo $< | sed 's,.*/,,'` .texi.dvi: - TEXINPUTS=$(srcdir):$$TEXINPUTS \ + TEXINPUTS="$(srcdir)$(PATH_SEPARATOR)$$TEXINPUTS" \ MAKEINFO='$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir)' \ $(TEXI2DVI) $< @@ -227,7 +233,7 @@ cvsclient.dvi: cvsclient.texi $(srcdir)/version-client.texi `echo $< | sed 's,.*/,,'` .texinfo.dvi: - TEXINPUTS=$(srcdir):$$TEXINPUTS \ + TEXINPUTS="$(srcdir)$(PATH_SEPARATOR)$$TEXINPUTS" \ MAKEINFO='$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir)' \ $(TEXI2DVI) $< @@ -238,7 +244,6 @@ cvsclient.dvi: cvsclient.texi $(srcdir)/version-client.texi `echo $< | sed 's,.*/,,'` MAKEINFO = @MAKEINFO@ -TEXI2DVI = texi2dvi DVIPS = dvips .dvi.ps: $(DVIPS) $< -o $@ @@ -266,22 +271,23 @@ dist-info: $(INFO_DEPS) list='$(INFO_DEPS)'; \ for base in $$list; do \ d=$(srcdir); \ - for file in `CDPATH=: && cd $$d && eval echo $$base*`; do \ - test -f $(distdir)/$$file \ - || cp -p $$d/$$file $(distdir)/$$file; \ + for file in $$d/$$base*; do \ + relfile=`expr "$$file" : "$$d/\(.*\)"`; \ + test -f $(distdir)/$$relfile || \ + cp -p $$file $(distdir)/$$relfile; \ done; \ done mostlyclean-aminfo: -rm -f cvs.aux cvs.cp cvs.cps cvs.dvi cvs.fn cvs.fns cvs.ky cvs.log cvs.pg \ - cvs.ps cvs.toc cvs.tp cvs.vr cvsclient.aux cvsclient.cp \ - cvsclient.dvi cvsclient.fn cvsclient.ky cvsclient.log \ - cvsclient.pg cvsclient.ps cvsclient.toc cvsclient.tp \ - cvsclient.vr + cvs.ps cvs.tmp cvs.toc cvs.tp cvs.vr cvsclient.aux \ + cvsclient.cp cvsclient.dvi cvsclient.fn cvsclient.ky \ + cvsclient.log cvsclient.pg cvsclient.ps cvsclient.tmp \ + cvsclient.toc cvsclient.tp cvsclient.vr maintainer-clean-aminfo: cd $(srcdir) && \ - for i in $(INFO_DEPS); do \ + list='$(INFO_DEPS)'; for i in $$list; do \ rm -f $$i; \ if test "`echo $$i-[0-9]*`" != "$$i-[0-9]*"; then \ rm -f $$i-[0-9]*; \ @@ -290,22 +296,26 @@ maintainer-clean-aminfo: tags: TAGS TAGS: - DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) top_distdir = .. distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) - @for file in $(DISTFILES); do \ - if test -f $$file; then d=.; else d=$(srcdir); fi; \ + @list='$(DISTFILES)'; for file in $$list; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - $(mkinstalldirs) "$(distdir)/$$dir"; \ + dir="/$$dir"; \ + $(mkinstalldirs) "$(distdir)$$dir"; \ + else \ + dir=''; \ fi; \ if test -d $$d/$$file; then \ - cp -pR $$d/$$file $(distdir) \ - || exit 1; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ + cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ else \ test -f $(distdir)/$$file \ || cp -p $$d/$$file $(distdir)/$$file \ @@ -333,6 +343,7 @@ install-am: all-am installcheck: installcheck-am install-strip: $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + INSTALL_STRIP_FLAG=-s \ `test -z '$(STRIP)' || \ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install mostlyclean-generic: @@ -341,7 +352,7 @@ clean-generic: -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: - -rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]* + -rm -f Makefile $(CONFIG_CLEAN_FILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" @@ -375,10 +386,11 @@ install-info-am: $(INFO_DEPS) @list='$(INFO_DEPS)'; \ for file in $$list; do \ d=$(srcdir); \ - for ifile in `CDPATH=: && cd $$d && echo $$file $$file-[0-9] $$file-[0-9][0-9]`; do \ - if test -f $$d/$$ifile; then \ - echo " $(INSTALL_DATA) $$d/$$ifile $(DESTDIR)$(infodir)/$$ifile"; \ - $(INSTALL_DATA) $$d/$$ifile $(DESTDIR)$(infodir)/$$ifile; \ + for ifile in echo $$d/$$file $$d/$$file-[0-9] $$d/$$file-[0-9][0-9]; do \ + if test -f $$ifile; then \ + relfile=`expr "$$ifile" : "$$d/\(.*\)"`; \ + echo " $(INSTALL_DATA) $$ifile $(DESTDIR)$(infodir)/$$relfile"; \ + $(INSTALL_DATA) $$ifile $(DESTDIR)$(infodir)/$$relfile; \ else : ; fi; \ done; \ done diff --git a/contrib/cvs/doc/cvs.texinfo b/contrib/cvs/doc/cvs.texinfo index 6e5b0a2..8fd12ce 100644 --- a/contrib/cvs/doc/cvs.texinfo +++ b/contrib/cvs/doc/cvs.texinfo @@ -526,7 +526,7 @@ you want to edit. @xref{Multiple developers}, for an explanation. @c - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @node Committing your changes @subsection Committing your changes -@cindex Committing changes +@cindex Committing changes to files @cindex Log message entry @cindex CVSEDITOR, environment variable @cindex EDITOR, environment variable @@ -2305,7 +2305,7 @@ command @code{cvs pserver} when it receives a connection on the right port. By default, the port number is 2401; it would be different if your client were compiled with @code{CVS_AUTH_PORT} defined to -something else, though. This can also be sepcified in the CVSROOT variable +something else, though. This can also be specified in the CVSROOT variable (@pxref{Remote repositories}) or overridden with the CVS_CLIENT_PORT environment variable (@pxref{Environment variables}). @@ -6773,7 +6773,7 @@ than one person is working in a repository. @node When to commit @section When to commit? @cindex When to commit -@cindex Commit, when to +@cindex Committing, when to @cindex Policy Your group should decide which policy to use regarding @@ -12393,7 +12393,7 @@ cvs import -I ! -W "*.exe -k 'b'" first-dir vendortag reltag @c - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @node commit files @appendixsec The commit support files -@cindex Commit files +@cindex Committing, administrative support files The @samp{-i} flag in the @file{modules} file can be used to run a certain program whenever files are @@ -12510,8 +12510,8 @@ is used as a file name or command-line as appropriate. @c - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @node commitinfo @appendixsubsec Commitinfo -@cindex Commitinfo -@cindex Checking commits +@cindex @file{commitinfo} +@cindex Commits, precommit verification of @cindex Precommit checking The @file{commitinfo} file defines programs to execute @@ -12549,10 +12549,24 @@ All occurrences of the name @samp{ALL} appearing as a regular expression are used in addition to the first matching regular expression or the name @samp{DEFAULT}. -Note: when @sc{cvs} is accessing a remote repository, -@file{commitinfo} will be run on the @emph{remote} -(i.e., server) side, not the client side (@pxref{Remote -repositories}). +@cindex @file{commitinfo}, working directory +@cindex @file{commitinfo}, command environment +The command will be run in the root of the workspace +containing the new versions of any files the user would like +to modify (commit), @emph{or in a copy of the workspace on +the server (@pxref{Remote repositories})}. If a file is +being removed, there will be no copy of the file under the +current directory. If a file is being added, there will be +no corresponding archive file in the repository unless the +file is being resurrected. + +Note that both the repository directory and the corresponding +Attic (@pxref{Attic}) directory may need to be checked to +locate the archive file corresponding to any given file being +committed. Much of the information about the specific commit +request being made, including the destination branch, commit +message, and command line options specified, is not available +to the command. @c FIXME: should discuss using commitinfo to control @c who has checkin access to what (e.g. Joe can check into @@ -14064,9 +14078,10 @@ who committed the change. If you are committing the change logged in as "root" (not under "su" or other root-priv giving program), @sc{cvs} cannot determine who is actually making the change. As such, by default, @sc{cvs} disallows changes to be committed by users -logged in as "root". (You can disable this option by commenting out -the definition of @code{CVS_BADROOT} in @file{options.h} before -building @sc{cvs}. +logged in as "root". (You can disable this option by passing the +@code{--enable-rootcommit} option to @file{configure} and recompiling @sc{cvs}. +On some systems this means editing the appropriate @file{config.h} file +before building @sc{cvs}.) @item Too many arguments! This message is typically printed by the @file{log.pl} diff --git a/contrib/cvs/doc/stamp-1 b/contrib/cvs/doc/stamp-1 index 6dd3bf8..574c293 100644 --- a/contrib/cvs/doc/stamp-1 +++ b/contrib/cvs/doc/stamp-1 @@ -1,4 +1,4 @@ @set UPDATED 5 September 2001 @set UPDATED-MONTH September 2001 -@set EDITION 1.11.2 -@set VERSION 1.11.2 +@set EDITION 1.11.2.1 +@set VERSION 1.11.2.1 diff --git a/contrib/cvs/doc/stamp-vti b/contrib/cvs/doc/stamp-vti index 2e25775..5ebdc85 100644 --- a/contrib/cvs/doc/stamp-vti +++ b/contrib/cvs/doc/stamp-vti @@ -1,4 +1,4 @@ -@set UPDATED 17 April 2002 -@set UPDATED-MONTH April 2002 -@set EDITION 1.11.2 -@set VERSION 1.11.2 +@set UPDATED 18 November 2002 +@set UPDATED-MONTH November 2002 +@set EDITION 1.11.2.1 +@set VERSION 1.11.2.1 diff --git a/contrib/cvs/doc/version-client.texi b/contrib/cvs/doc/version-client.texi index 6dd3bf8..574c293 100644 --- a/contrib/cvs/doc/version-client.texi +++ b/contrib/cvs/doc/version-client.texi @@ -1,4 +1,4 @@ @set UPDATED 5 September 2001 @set UPDATED-MONTH September 2001 -@set EDITION 1.11.2 -@set VERSION 1.11.2 +@set EDITION 1.11.2.1 +@set VERSION 1.11.2.1 diff --git a/contrib/cvs/doc/version.texi b/contrib/cvs/doc/version.texi index 2e25775..5ebdc85 100644 --- a/contrib/cvs/doc/version.texi +++ b/contrib/cvs/doc/version.texi @@ -1,4 +1,4 @@ -@set UPDATED 17 April 2002 -@set UPDATED-MONTH April 2002 -@set EDITION 1.11.2 -@set VERSION 1.11.2 +@set UPDATED 18 November 2002 +@set UPDATED-MONTH November 2002 +@set EDITION 1.11.2.1 +@set VERSION 1.11.2.1 |