[Cvs-cvs] ccvs/doc ChangeLog cvs.1 cvs.texinfo stamp-vti ...

[Larry Jones]

CVSROOT:        /cvsroot/cvs
Module name:    ccvs
Changes by:     Larry Jones <scjones>   08/03/29 23:10:41

Modified files:
        doc            : ChangeLog cvs.1 cvs.texinfo stamp-vti 
                         version.texi 

Log message:
        Merge changes from cvs1-11-x-branch.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/ccvs/doc/ChangeLog?cvsroot=cvs&r1=1.987&r2=1.988
http://cvs.savannah.gnu.org/viewcvs/ccvs/doc/cvs.1?cvsroot=cvs&r1=1.55&r2=1.56
http://cvs.savannah.gnu.org/viewcvs/ccvs/doc/cvs.texinfo?cvsroot=cvs&r1=1.707&r2=1.708
http://cvs.savannah.gnu.org/viewcvs/ccvs/doc/stamp-vti?cvsroot=cvs&r1=1.210&r2=1.211
http://cvs.savannah.gnu.org/viewcvs/ccvs/doc/version.texi?cvsroot=cvs&r1=1.212&r2=1.213

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/cvs/ccvs/doc/ChangeLog,v
retrieving revision 1.987
retrieving revision 1.988
diff -u -b -r1.987 -r1.988
--- ChangeLog   26 Mar 2008 20:02:08 -0000      1.987
+++ ChangeLog   29 Mar 2008 23:10:40 -0000      1.988
@@ -1,3 +1,8 @@
+2008-03-29  Larry Jones  <address@hidden>
+
+       * cvs.texinfo (import options): Add -d.
+       * cvs.1, stamp-vti, version.texi: Regenerated.
+
 2008-03-26  Larry Jones  <address@hidden>
 
        * cvs.texinfo (Password authentication server): Add example

Index: cvs.1
===================================================================
RCS file: /cvsroot/cvs/ccvs/doc/cvs.1,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -b -r1.55 -r1.56
--- cvs.1       25 Jan 2008 07:17:30 -0000      1.55
+++ cvs.1       29 Mar 2008 23:10:40 -0000      1.56
@@ -3178,6 +3178,12 @@
 See `Multiple vendor branches\(aq in the CVS manual.
 .SP
 .IP "" 0
+\fB-d\fR
+.IP "" 2
+Use each file\(aqs modification time as the time of import
+rather than the current time.
+.SP
+.IP "" 0
 \fB-k \fIsubst\fB\fR
 .IP "" 2
 Indicate the keyword expansion mode desired.  This

Index: cvs.texinfo
===================================================================
RCS file: /cvsroot/cvs/ccvs/doc/cvs.texinfo,v
retrieving revision 1.707
retrieving revision 1.708
diff -u -b -r1.707 -r1.708
--- cvs.texinfo 26 Mar 2008 20:02:08 -0000      1.707
+++ cvs.texinfo 29 Mar 2008 23:10:41 -0000      1.708
@@ -11145,6 +11145,10 @@
 @item -b @var{branch}
 See @ref{Multiple vendor branches}.
 
address@hidden -d
+Use each file's modification time as the time of import
+rather than the current time.
+
 @item -k @var{subst}
 Indicate the keyword expansion mode desired.  This
 setting will apply to all files created during the

Index: stamp-vti
===================================================================
RCS file: /cvsroot/cvs/ccvs/doc/stamp-vti,v
retrieving revision 1.210
retrieving revision 1.211
diff -u -b -r1.210 -r1.211
--- stamp-vti   26 Mar 2008 20:02:08 -0000      1.210
+++ stamp-vti   29 Mar 2008 23:10:41 -0000      1.211
@@ -1,4 +1,4 @@
address@hidden UPDATED 26 March 2008
address@hidden UPDATED 29 March 2008
 @set UPDATED-MONTH March 2008
 @set EDITION 1.12.13.1
 @set VERSION 1.12.13.1

Index: version.texi
===================================================================
RCS file: /cvsroot/cvs/ccvs/doc/version.texi,v
retrieving revision 1.212
retrieving revision 1.213
diff -u -b -r1.212 -r1.213
--- version.texi        26 Mar 2008 20:02:09 -0000      1.212
+++ version.texi        29 Mar 2008 23:10:41 -0000      1.213
@@ -1,4 +1,4 @@
address@hidden UPDATED 26 March 2008
address@hidden UPDATED 29 March 2008
 @set UPDATED-MONTH March 2008
 @set EDITION 1.12.13.1
 @set VERSION 1.12.13.1