Skip to content
Snippets Groups Projects
Commit b0769f65 authored by scjones's avatar scjones
Browse files

merge changes from cvs1-11-x-branch

parent 67ff8201
Branches
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
doc/ChangeLog
+ 6
− 0
View file @ b0769f65
2009-07-22 Larry Jones <lawrence.jones@siemens.com>
* cvs.texinfo (history output, history examples): New.
* mkman.pl (keyword_mode): Add asis.
* cvs.1, stamp-vti, version.texi: Regenerated.
2008-11-25 Larry Jones <lawrence.jones@siemens.com>
* Makefile.in: Regenerated with Autoconf 2.63.
......
doc/cvs.1
+ 78
− 0
View file @ b0769f65
......@@ -3094,6 +3094,84 @@ Show records for user \fIname\fR.
Show times in the selected records using the specified
time zone instead of UTC.
.SP
.SH "history output"
.SP
\fBhistory\fR prints a line for each selected history record.
Each line begins with a character indicating the record type
(see node `history options\(aq in the CVS manual),
followed by a timestamp (in the format \fBYYYY-MM-DD HH:MM ZZZZ\fR),
then the name of the user who performed the action.
The remainder of the line depends on the record type:
.SP
.SP
.IP "" 0
\fR\fBT\fR\fR
.IP "" 2
The relative path to the directory in the repository;
then the description of the tag in the format
\fB[\fIName\fB:\fIOpt\fB]\fR where \fIName\fR is the tag name and
\fIOpt\fR is \fBD\fR for \fBtag -d\fR, the specified revision for
\fBtag -r\fR, the specified date for \fBtag -D\fR, or \fBA\fR for a
plain \fBtag\fR.
.SP
.IP "" 0
\fR\fBF\fR, \fBE\fR, \fBO\fR\fR
.IP "" 2
The tag/revision/date checked out, if any, enclosed in \fB[\fR and \fB]\fR;
the relative path to the directory in the repository, if any;
the associated module name, enclosed in \fB=\fR and \fB=\fR;
then the absolute path to the local working directory or \fB<remote>\fR.
.SP
.IP "" 0
\fR\fBW\fR, \fBU\fR, \fBP\fR, \fBC\fR, \fBG\fR, \fBM\fR, \fBA\fR, \fBR\fR, \fBX\fR\fR
.IP "" 2
The revision checked out;
the file name;
the relative path to the directory in the repository, if any;
the associated module name, enclosed in \fB=\fR and \fB=\fR;
then the absolute path to the local working directory or \fB<remote>\fR.
.SP
.SP
\fB~\fR at the beginning of a working directory means the
user\(aqs home directory.
\fB*\fR at the end of a repository or working directory
means the associated module name.
.SP
.SH "history examples"
.SP
.PD 0
.SP
.IP "" 2
$ cvs history -e
.SP
.IP "" 2
A 2009-07-21 20:21 +0000 bach 1.1 tc.1 yoyodyne/tc/man == ~/tc/man
.IP "" 2
M 2009-07-21 20:22 +0000 bach 1.2 backend.c yoyodyne/tc == ~/tc
.IP "" 2
M 2009-07-21 20:27 +0000 bach 1.5 frontend.c yoyodyne/tc == ~/tc
.IP "" 2
T 2009-07-21 20:27 +0000 bach yoyodyne/tc [rel_0_3:A]
.IP "" 2
O 2009-07-21 20:28 +0000 cedar [rel_0_1] yoyodyne/* =tc= <remote>/*
.IP "" 2
C 2009-07-21 20:29 +0000 cedar 1.3 driver.c yoyodyne/tc == <remote>
.IP "" 2
U 2009-07-21 20:29 +0000 cedar 1.5 frontend.c yoyodyne/tc == <remote>
.IP "" 2
F 2009-07-21 20:31 +0000 bach =yoyodyne= ~/*
.IP "" 2
E 2009-07-21 20:33 +0000 bach [rel_0_3] yoyodyne/tc =.= /foo/*
.IP "" 2
O 2009-07-21 20:37 +0000 bach yoyodyne/* =tc= ~/*
.IP "" 2
R 2009-07-21 20:37 +0000 bach 1.2 test2.t yoyodyne/tc/testing == ~/tc/testing
.IP "" 2
E 2009-07-21 20:38 +0000 bach [2009.07.21.20.38.48] yoyodyne/* =tc= /foo
.PD
.IP "" 0
.SP
.SH "import"
.SS "Import sources into CVS, using vendor branches"
.IX "import (subcommand)"
......
doc/cvs.texinfo
+ 60
− 5
View file @ b0769f65
......@@ -10885,6 +10885,8 @@ normal use inside @sc{cvs} (@pxref{Common options}).}
 
@menu
* history options:: history options
* history output:: history output
* history examples:: history examples
@end menu
 
@c . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .
......@@ -11038,14 +11040,67 @@ Show times in the selected records using the specified
time zone instead of UTC.
@end table
 
@ignore
@c . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .
@c @node history examples
@node history output
@appendixsubsec history output
@code{history} prints a line for each selected history record.
Each line begins with a character indicating the record type
(@pxref{history options}),
followed by a timestamp (in the format @samp{YYYY-MM-DD HH:MM ZZZZ}),
then the name of the user who performed the action.
The remainder of the line depends on the record type:
@table @asis
@item @code{T}
The relative path to the directory in the repository;
then the description of the tag in the format
@code{[@var{Name}:@var{Opt}]} where @var{Name} is the tag name and
@var{Opt} is @code{D} for @samp{tag -d}, the specified revision for
@samp{tag -r}, the specified date for @samp{tag -D}, or @code{A} for a
plain @samp{tag}.
@item @code{F}, @code{E}, @code{O}
The tag/revision/date checked out, if any, enclosed in @code{[} and @code{]};
the relative path to the directory in the repository, if any;
the associated module name, enclosed in @code{=} and @code{=};
then the absolute path to the local working directory or @samp{<remote>}.
@item @code{W}, @code{U}, @code{P}, @code{C}, @code{G}, @code{M}, @code{A}, @code{R}, @code{X}
The revision checked out;
the file name;
the relative path to the directory in the repository, if any;
the associated module name, enclosed in @code{=} and @code{=};
then the absolute path to the local working directory or @samp{<remote>}.
@end table
@code{~} at the beginning of a working directory means the
user's home directory.
@code{*} at the end of a repository or working directory
means the associated module name.
@c . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .
@node history examples
@appendixsubsec history examples
 
Contributed examples will gratefully be accepted.
@c -- Examples here!
@end ignore
@example
$ cvs history -e
A 2009-07-21 20:21 +0000 bach 1.1 tc.1 yoyodyne/tc/man == ~/tc/man
M 2009-07-21 20:22 +0000 bach 1.2 backend.c yoyodyne/tc == ~/tc
M 2009-07-21 20:27 +0000 bach 1.5 frontend.c yoyodyne/tc == ~/tc
T 2009-07-21 20:27 +0000 bach yoyodyne/tc [rel_0_3:A]
O 2009-07-21 20:28 +0000 cedar [rel_0_1] yoyodyne/* =tc= <remote>/*
C 2009-07-21 20:29 +0000 cedar 1.3 driver.c yoyodyne/tc == <remote>
U 2009-07-21 20:29 +0000 cedar 1.5 frontend.c yoyodyne/tc == <remote>
F 2009-07-21 20:31 +0000 bach =yoyodyne= ~/*
E 2009-07-21 20:33 +0000 bach [rel_0_3] yoyodyne/tc =.= /foo/*
O 2009-07-21 20:37 +0000 bach yoyodyne/* =tc= ~/*
R 2009-07-21 20:37 +0000 bach 1.2 test2.t yoyodyne/tc/testing == ~/tc/testing
E 2009-07-21 20:38 +0000 bach [2009.07.21.20.38.48] yoyodyne/* =tc= /foo
@end example
 
@c - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
@node import
......
doc/mkman.pl
+ 1
− 1
View file @ b0769f65
......@@ -58,7 +58,7 @@ sub keyword_mode
my ($keyword, $file) = @_;
return "\\fR"
if $keyword =~ /^(|r|t)$/;
if $keyword =~ /^(|r|t|asis)$/;
return "\\fB"
if $keyword =~ /^(strong|sc|code|file|samp)$/;
return "\\fI"
......
doc/stamp-vti
+ 2
− 2
View file @ b0769f65
@set UPDATED 26 September 2008
@set UPDATED-MONTH September 2008
@set UPDATED 22 July 2009
@set UPDATED-MONTH July 2009
@set EDITION 1.12.13.1
@set VERSION 1.12.13.1
doc/version.texi
+ 2
− 2
View file @ b0769f65
@set UPDATED 26 September 2008
@set UPDATED-MONTH September 2008
@set UPDATED 22 July 2009
@set UPDATED-MONTH July 2009
@set EDITION 1.12.13.1
@set VERSION 1.12.13.1
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment