diff options
author | peter <peter@FreeBSD.org> | 2000-10-02 06:33:59 +0000 |
---|---|---|
committer | peter <peter@FreeBSD.org> | 2000-10-02 06:33:59 +0000 |
commit | 590c411955d6975551ffeaf41d7faf4b26f836d1 (patch) | |
tree | c2ec0b150478a3cab9fb18e60d02dedbdc1cfd15 /contrib/cvs/man | |
parent | 784ea5066cbea73d04e8ce5783dd0eb842e3ac1f (diff) | |
download | FreeBSD-src-590c411955d6975551ffeaf41d7faf4b26f836d1.zip FreeBSD-src-590c411955d6975551ffeaf41d7faf4b26f836d1.tar.gz |
Import cvs-1.11 onto vendor branch.
Diffstat (limited to 'contrib/cvs/man')
-rw-r--r-- | contrib/cvs/man/ChangeLog | 34 | ||||
-rw-r--r-- | contrib/cvs/man/Makefile.in | 2 | ||||
-rw-r--r-- | contrib/cvs/man/cvs.1 | 37 | ||||
-rw-r--r-- | contrib/cvs/man/cvsbug.8 | 2 |
4 files changed, 58 insertions, 17 deletions
diff --git a/contrib/cvs/man/ChangeLog b/contrib/cvs/man/ChangeLog index 38cc91b..adb8e2d 100644 --- a/contrib/cvs/man/ChangeLog +++ b/contrib/cvs/man/ChangeLog @@ -1,3 +1,37 @@ +2000-09-07 Larry Jones <larry.jones@sdrc.com> + + * Makefile.in: Use @bindir@, @libdir@, @infodir@, and @mandir@ + from autoconf. + +2000-05-03 Larry Jones <larry.jones@sdrc.com> + + * cvs.1: Correct CVSEDITOR/VISUAL/EDITOR documentation. + Correct KJ's botched patch application. + +2000-01-02 John P Cavanaugh <cavanaug@sr.hp.com> + + * cvs.texinfo: document new -C option to update, now that it works + both remotely and locally. + (Re-applied by Karl Fogel <kfogel@red-bean.com>.) + +1999-12-11 Karl Fogel <kfogel@red-bean.com> + + * Revert previous change -- it doesn't work remotely yet. + +1999-12-10 John P Cavanaugh <cavanaug@sr.hp.com> + + * cvs.1: document new -C option to update. + (Applied by Karl Fogel <kfogel@red-bean.com>.) + +1999-11-29 Larry Jones <larry.jones@sdrc.com> + + * cvsbug.8: Change .TH from section 1 to section 8. + +1999-11-10 Jim Kingdon <http://developer.redhat.com/> + + * cvs.1: Don't document -H as a command option; it has been a + while since that worked. + 1999-01-19 Vitaly V Fedrushkov <willy@snowyowl.csu.ac.ru> * Makefile.in (INSTALL_DATA): Wrong manpage permissions fixed. diff --git a/contrib/cvs/man/Makefile.in b/contrib/cvs/man/Makefile.in index d92d494..f9b5665 100644 --- a/contrib/cvs/man/Makefile.in +++ b/contrib/cvs/man/Makefile.in @@ -27,7 +27,7 @@ DISTFILES = .cvsignore ChangeLog Makefile.in $(MANFILES) INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ prefix = @prefix@ -mandir = $(prefix)/man +mandir = @mandir@ man1dir = $(mandir)/man1 man5dir = $(mandir)/man5 man8dir = $(mandir)/man8 diff --git a/contrib/cvs/man/cvs.1 b/contrib/cvs/man/cvs.1 index 8cbe2be..b29b71f 100644 --- a/contrib/cvs/man/cvs.1 +++ b/contrib/cvs/man/cvs.1 @@ -192,8 +192,10 @@ Use .I editor to enter revision log information. Overrides the setting of the -.SM CVSEDITOR -and the +.SM CVSEDITOR\c +, +.SM VISUAL\c +, and .SM EDITOR environment variables. .TP @@ -358,6 +360,11 @@ file; see Incorporate a set of updates from off-site into the source repository, as a ``vendor branch''. (Changes repository.) .TP +.B init +Initialize a repository by adding the CVSROOT subdirectory and some default +control files. You must use this command or initialize the repository in +some other way before you can use it. +.TP .B log Display log information. @@ -473,13 +480,6 @@ is available with these commands: .BR checkout ", " export ", " .BR rdiff ", " rtag ", and " update . .TP -.B \-H -Help; describe the options available for this command. This is the -only option supported for -.I all -.B cvs -commands. -.TP \fB\-k\fP \fIkflag\fP Alter the default processing of keywords. @@ -1684,7 +1684,7 @@ executes recursively through subdirectories; you can prevent this by using the standard \fB\-l\fP option, or specify the recursion explicitly by using \fB\-R\fP. .TP -\fBupdate\fP [\fB\-Adf\|lPpQqR\fP] [\fB\-d\fP] [\fB\-r\fP \fItag\fP|\fB\-D\fP \fIdate\fP] \fIfiles\|.\|.\|.\fP +\fBupdate\fP [\fB\-ACdf\|lPpQqR\fP] [\fB\-d\fP] [\fB\-r\fP \fItag\fP|\fB\-D\fP \fIdate\fP] \fIfiles\|.\|.\|.\fP .I Requires: repository, working directory. .br @@ -1841,6 +1841,12 @@ Use .` "\-I !" to avoid ignoring any files at all. .SP +Use the +.` "\-C" +option to overwrite locally modified files with clean copies from +the repository (the modified file is saved in +`\fB.#\fP\fIfile\fP\fB.\fP\fIrevision\fP', however). +.SP The standard \fBcvs\fP command options \fB\-f\fP, \fB\-k\fP, \fB\-l\fP, \fB\-P\fP, \fB\-p\fP, and \fB\-r\fP are also available with \fBupdate\fP. @@ -2035,12 +2041,13 @@ and Specifies the program to use for recording log messages during .BR commit . If not set, the +.SM VISUAL +and .SM EDITOR -environment variable is used instead. -If -.SM EDITOR -is not set either, the default is -.BR /usr/ucb/vi . +environment variables are tried (in that order). +If neither is set, a system-dependent default editor (e.g., +.BR vi ) +is used. .TP .SM CVS_IGNORE_REMOTE_ROOT If this variable is set then diff --git a/contrib/cvs/man/cvsbug.8 b/contrib/cvs/man/cvsbug.8 index 63574d4..ecf2eb8 100644 --- a/contrib/cvs/man/cvsbug.8 +++ b/contrib/cvs/man/cvsbug.8 @@ -18,7 +18,7 @@ .\" .\" --------------------------------------------------------------------------- .nh -.TH CVSBUG 1 xVERSIONx "February 1993" +.TH CVSBUG 8 xVERSIONx "February 1993" .SH NAME cvsbug \- send problem report (PR) about CVS to a central support site .SH SYNOPSIS |