5c5,6
< .Id $Id: ci.1,v 5.9 1991/10/07 17:32:46 eggert Exp $
---
> .Id $Id: ci.1,v 5.17 1995/06/16 06:19:24 eggert Exp $
> .ds i \&\s-1ISO\s0
6a8
> .ds u \&\s-1UTC\s0
44c46
< A lock held by someone else may be broken with the
---
> A lock held by someone else can be broken with the
107a110
> .BR \-i ,
108a112
> .BR \-j ,
117c121,129
< may be symbolic, numeric, or mixed.
---
> can be symbolic, numeric, or mixed.
> Symbolic names in
> .I rev
> must already be defined;
> see the
> .B \-n
> and
> .B \-N
> options for assigning names during checkin.
126a139,147
> begins with a period,
> then the default branch (normally the trunk) is prepended to it.
> If
> .I rev
> is a branch number followed by a period,
> then the latest revision on that branch is used.
> .PP
> If
> .I rev
175,180c196,201
< .BR \-r [\f2rev\fP]
< checks in a revision, releases the corresponding lock, and
< removes the working file. This is the default.
< .RS
< .PP
< The
---
> .BI \-r rev
> Check in revision
> .IR rev .
> .TP
> .BR \-r
> The bare
182c203
< option has an unusual meaning in
---
> option (without any revision) has an unusual meaning in
184c205
< In other \*r commands,
---
> With other \*r commands, a bare
186,190c207,215
< merely specifies a revision number,
< but in
< .B ci
< it also releases a lock and removes the working file.
< See
---
> option specifies the most recent revision on the default branch,
> but with
> .BR ci ,
> a bare
> .B \-r
> option reestablishes the default behavior of releasing a lock and
> removing the working file, and is used to override any default
> .B \-l
> or
192,193c217
< for a tricky example.
< .RE
---
> options established by shell aliases or scripts.
215a240
> bare
224c249
< because
---
> because bare
247c272
< The extracted keyword values and the default log message may be overridden
---
> The extracted keyword values and the default log message can be overridden
261a287,294
> .BR \-i [\f2rev\fP]
> initial checkin; report an error if the \*r file already exists.
> This avoids race conditions in certain applications.
> .TP
> .BR \-j [\f2rev\fP]
> just checkin and do not initialize;
> report an error if the \*r file does not already exist.
> .TP
298a332,343
> By convention, log messages that start with
> .B #
> are comments and are ignored by programs like GNU Emacs's
> .B vc
> package.
> Also, log messages that start with
> .BI { clumpname }
> (followed by white space) are meant to be clumped together if possible,
> even if they are associated with different files; the
> .BI { clumpname }
> label is used only for clumping,
> and is not considered to be part of the log message itself.
329c374
< may not begin with
---
> cannot begin with
358a404,438
> .B \-T
> Set the \*r file's modification time to the new revision's time
> if the former precedes the latter and there is a new revision;
> preserve the \*r file's modification time otherwise.
> If you have locked a revision,
> .B ci
> usually updates the \*r file's modification time to the current time,
> because the lock is stored in the \*r file
> and removing the lock requires changing the \*r file.
> This can create an \*r file newer than the working file in one of two ways:
> first,
> .B "ci\ \-M"
> can create a working file with a date before the current time;
> second, when reverting to the previous revision
> the \*r file can change while the working file remains unchanged.
> These two cases can cause excessive recompilation caused by a
> .BR make (1)
> dependency of the working file on the \*r file.
> The
> .B \-T
> option inhibits this recompilation by lying about the \*r file's date.
> Use this option with care; it can suppress recompilation even when
> a checkin of one working file should affect
> another working file associated with the same \*r file.
> For example, suppose the \*r file's time is 01:00,
> the (changed) working file's time is 02:00,
> some other copy of the working file has a time of 03:00,
> and the current time is 04:00.
> Then
> .B "ci\ \-d\ \-T"
> sets the \*r file's time to 02:00 instead of the usual 04:00;
> this causes
> .BR make (1)
> to think (incorrectly) that the other copy is newer than the \*r file.
> .TP
366a447,449
> .BI \-V
> Print \*r's version number.
> .TP
378c461
< .BI RCS/ file
---
> .BI RCS/ path
380c463
< .IB path /RCS/ file.
---
> .IB path1 /RCS/ path2.
401c484
< for hosts like Unix that permit commas in file names,
---
> for hosts like Unix that permit commas in filenames,
402a486,524
> .TP
> .BI \-z zone
> specifies the date output format in keyword substitution,
> and specifies the default time zone for
> .I date
> in the
> .BI \-d date
> option.
> The
> .I zone
> should be empty, a numeric \*u offset, or the special string
> .B LT
> for local time.
> The default is an empty
> .IR zone ,
> which uses the traditional \*r format of \*u without any time zone indication
> and with slashes separating the parts of the date;
> otherwise, times are output in \*i 8601 format with time zone indication.
> For example, if local time is January 11, 1990, 8pm Pacific Standard Time,
> eight hours west of \*u,
> then the time is output as follows:
> .RS
> .LP
> .RS
> .nf
> .ta \w'\f3\-z+05:30\fP 'u +\w'\f31990-01-11 09:30:00+05:30\fP 'u
> .ne 4
> \f2option\fP \f2time output\fP
> \f3\-z\fP \f31990/01/12 04:00:00\fP \f2(default)\fP
> \f3\-zLT\fP \f31990-01-11 20:00:00\-08\fP
> \f3\-z+05:30\fP \f31990-01-12 09:30:00+05:30\fP
> .ta 4n +4n +4n +4n
> .fi
> .RE
> .LP
> The
> .B \-z
> option does not affect dates stored in \*r files,
> which are always \*u.
404c526
< Pairs of \*r files and working files may be specified in three ways
---
> Pairs of \*r files and working files can be specified in three ways
426c548
< must be
---
> must start with
428c550
< or must end in
---
> or must contain
519c641
< Several temporary files may be created in the directory containing
---
> Temporary files are created in the directory containing
579,580c701,704
< .nr n \w'\(bu '+1n-1/1n
< .IP \(bu \nn
---
> .nr n \w'\(bu'+2n-1/1n
> .ds n \nn
> .if \n(.g .if r an-tag-sep .ds n \w'\(bu'u+\n[an-tag-sep]u
> .IP \(bu \*n
584c708
< .B seteuid()
---
> .B seteuid
590c714
< .B setuid()
---
> .B setuid
593c717
< this fails only if the real user is
---
> this fails only if the real or effective user is
602c726
< will be able to invoke the
---
> can invoke the
611c735
< Choose a path name
---
> Choose a pathname
613c737
< that will be a directory of files to be executed by the users.
---
> to be a directory of files to be executed by the users.
735a860
> .BR \-x ,
737c862
< .BR \-x .
---
> .BR \-z .
758c883
< Revision Number: \*(Rv; Release Date: \*(Dt.
---
> Manual Page Revision: \*(Rv; Release Date: \*(Dt.
760c885
< Copyright \(co 1982, 1988, 1989 by Walter F. Tichy.
---
> Copyright \(co 1982, 1988, 1989 Walter F. Tichy.
762c887
< Copyright \(co 1990, 1991 by Paul Eggert.
---
> Copyright \(co 1990, 1991, 1992, 1993, 1994, 1995 Paul Eggert.
764,765c889,892
< co(1), ident(1), make(1), rcs(1), rcsclean(1), rcsdiff(1),
< rcsintro(1), rcsmerge(1), rlog(1), rcsfile(5)
---
> co(1),
> emacs(1),
> ident(1), make(1), rcs(1), rcsclean(1), rcsdiff(1),
> rcsintro(1), rcsmerge(1), rlog(1), setuid(2), rcsfile(5)
< .Id $Id: ci.1,v 5.9 1991/10/07 17:32:46 eggert Exp $
---
> .Id $Id: ci.1,v 5.17 1995/06/16 06:19:24 eggert Exp $
> .ds i \&\s-1ISO\s0
6a8
> .ds u \&\s-1UTC\s0
44c46
< A lock held by someone else may be broken with the
---
> A lock held by someone else can be broken with the
107a110
> .BR \-i ,
108a112
> .BR \-j ,
117c121,129
< may be symbolic, numeric, or mixed.
---
> can be symbolic, numeric, or mixed.
> Symbolic names in
> .I rev
> must already be defined;
> see the
> .B \-n
> and
> .B \-N
> options for assigning names during checkin.
126a139,147
> begins with a period,
> then the default branch (normally the trunk) is prepended to it.
> If
> .I rev
> is a branch number followed by a period,
> then the latest revision on that branch is used.
> .PP
> If
> .I rev
175,180c196,201
< .BR \-r [\f2rev\fP]
< checks in a revision, releases the corresponding lock, and
< removes the working file. This is the default.
< .RS
< .PP
< The
---
> .BI \-r rev
> Check in revision
> .IR rev .
> .TP
> .BR \-r
> The bare
182c203
< option has an unusual meaning in
---
> option (without any revision) has an unusual meaning in
184c205
< In other \*r commands,
---
> With other \*r commands, a bare
186,190c207,215
< merely specifies a revision number,
< but in
< .B ci
< it also releases a lock and removes the working file.
< See
---
> option specifies the most recent revision on the default branch,
> but with
> .BR ci ,
> a bare
> .B \-r
> option reestablishes the default behavior of releasing a lock and
> removing the working file, and is used to override any default
> .B \-l
> or
192,193c217
< for a tricky example.
< .RE
---
> options established by shell aliases or scripts.
215a240
> bare
224c249
< because
---
> because bare
247c272
< The extracted keyword values and the default log message may be overridden
---
> The extracted keyword values and the default log message can be overridden
261a287,294
> .BR \-i [\f2rev\fP]
> initial checkin; report an error if the \*r file already exists.
> This avoids race conditions in certain applications.
> .TP
> .BR \-j [\f2rev\fP]
> just checkin and do not initialize;
> report an error if the \*r file does not already exist.
> .TP
298a332,343
> By convention, log messages that start with
> .B #
> are comments and are ignored by programs like GNU Emacs's
> .B vc
> package.
> Also, log messages that start with
> .BI { clumpname }
> (followed by white space) are meant to be clumped together if possible,
> even if they are associated with different files; the
> .BI { clumpname }
> label is used only for clumping,
> and is not considered to be part of the log message itself.
329c374
< may not begin with
---
> cannot begin with
358a404,438
> .B \-T
> Set the \*r file's modification time to the new revision's time
> if the former precedes the latter and there is a new revision;
> preserve the \*r file's modification time otherwise.
> If you have locked a revision,
> .B ci
> usually updates the \*r file's modification time to the current time,
> because the lock is stored in the \*r file
> and removing the lock requires changing the \*r file.
> This can create an \*r file newer than the working file in one of two ways:
> first,
> .B "ci\ \-M"
> can create a working file with a date before the current time;
> second, when reverting to the previous revision
> the \*r file can change while the working file remains unchanged.
> These two cases can cause excessive recompilation caused by a
> .BR make (1)
> dependency of the working file on the \*r file.
> The
> .B \-T
> option inhibits this recompilation by lying about the \*r file's date.
> Use this option with care; it can suppress recompilation even when
> a checkin of one working file should affect
> another working file associated with the same \*r file.
> For example, suppose the \*r file's time is 01:00,
> the (changed) working file's time is 02:00,
> some other copy of the working file has a time of 03:00,
> and the current time is 04:00.
> Then
> .B "ci\ \-d\ \-T"
> sets the \*r file's time to 02:00 instead of the usual 04:00;
> this causes
> .BR make (1)
> to think (incorrectly) that the other copy is newer than the \*r file.
> .TP
366a447,449
> .BI \-V
> Print \*r's version number.
> .TP
378c461
< .BI RCS/ file
---
> .BI RCS/ path
380c463
< .IB path /RCS/ file.
---
> .IB path1 /RCS/ path2.
401c484
< for hosts like Unix that permit commas in file names,
---
> for hosts like Unix that permit commas in filenames,
402a486,524
> .TP
> .BI \-z zone
> specifies the date output format in keyword substitution,
> and specifies the default time zone for
> .I date
> in the
> .BI \-d date
> option.
> The
> .I zone
> should be empty, a numeric \*u offset, or the special string
> .B LT
> for local time.
> The default is an empty
> .IR zone ,
> which uses the traditional \*r format of \*u without any time zone indication
> and with slashes separating the parts of the date;
> otherwise, times are output in \*i 8601 format with time zone indication.
> For example, if local time is January 11, 1990, 8pm Pacific Standard Time,
> eight hours west of \*u,
> then the time is output as follows:
> .RS
> .LP
> .RS
> .nf
> .ta \w'\f3\-z+05:30\fP 'u +\w'\f31990-01-11 09:30:00+05:30\fP 'u
> .ne 4
> \f2option\fP \f2time output\fP
> \f3\-z\fP \f31990/01/12 04:00:00\fP \f2(default)\fP
> \f3\-zLT\fP \f31990-01-11 20:00:00\-08\fP
> \f3\-z+05:30\fP \f31990-01-12 09:30:00+05:30\fP
> .ta 4n +4n +4n +4n
> .fi
> .RE
> .LP
> The
> .B \-z
> option does not affect dates stored in \*r files,
> which are always \*u.
404c526
< Pairs of \*r files and working files may be specified in three ways
---
> Pairs of \*r files and working files can be specified in three ways
426c548
< must be
---
> must start with
428c550
< or must end in
---
> or must contain
519c641
< Several temporary files may be created in the directory containing
---
> Temporary files are created in the directory containing
579,580c701,704
< .nr n \w'\(bu '+1n-1/1n
< .IP \(bu \nn
---
> .nr n \w'\(bu'+2n-1/1n
> .ds n \nn
> .if \n(.g .if r an-tag-sep .ds n \w'\(bu'u+\n[an-tag-sep]u
> .IP \(bu \*n
584c708
< .B seteuid()
---
> .B seteuid
590c714
< .B setuid()
---
> .B setuid
593c717
< this fails only if the real user is
---
> this fails only if the real or effective user is
602c726
< will be able to invoke the
---
> can invoke the
611c735
< Choose a path name
---
> Choose a pathname
613c737
< that will be a directory of files to be executed by the users.
---
> to be a directory of files to be executed by the users.
735a860
> .BR \-x ,
737c862
< .BR \-x .
---
> .BR \-z .
758c883
< Revision Number: \*(Rv; Release Date: \*(Dt.
---
> Manual Page Revision: \*(Rv; Release Date: \*(Dt.
760c885
< Copyright \(co 1982, 1988, 1989 by Walter F. Tichy.
---
> Copyright \(co 1982, 1988, 1989 Walter F. Tichy.
762c887
< Copyright \(co 1990, 1991 by Paul Eggert.
---
> Copyright \(co 1990, 1991, 1992, 1993, 1994, 1995 Paul Eggert.
764,765c889,892
< co(1), ident(1), make(1), rcs(1), rcsclean(1), rcsdiff(1),
< rcsintro(1), rcsmerge(1), rlog(1), rcsfile(5)
---
> co(1),
> emacs(1),
> ident(1), make(1), rcs(1), rcsclean(1), rcsdiff(1),
> rcsintro(1), rcsmerge(1), rlog(1), setuid(2), rcsfile(5)