diff options
Diffstat (limited to 'gnu')
| -rw-r--r-- | gnu/usr.bin/cvs/doc/CVSvn.texi | 2 | ||||
| -rw-r--r-- | gnu/usr.bin/cvs/doc/cvs.aux | 277 | ||||
| -rw-r--r-- | gnu/usr.bin/cvs/doc/cvs.info | 319 | ||||
| -rw-r--r-- | gnu/usr.bin/cvs/doc/cvs.info-1 | 102 | ||||
| -rw-r--r-- | gnu/usr.bin/cvs/doc/cvs.info-2 | 145 | ||||
| -rw-r--r-- | gnu/usr.bin/cvs/doc/cvs.info-6 | 120 | ||||
| -rw-r--r-- | gnu/usr.bin/cvs/doc/cvs.ps | 6935 | ||||
| -rw-r--r-- | gnu/usr.bin/cvs/doc/cvsclient.info | 45 | ||||
| -rw-r--r-- | gnu/usr.bin/cvs/doc/cvsclient.ps | 14 |
9 files changed, 4061 insertions, 3898 deletions
diff --git a/gnu/usr.bin/cvs/doc/CVSvn.texi b/gnu/usr.bin/cvs/doc/CVSvn.texi index 5b9a2668dd9..fea8d138c70 100644 --- a/gnu/usr.bin/cvs/doc/CVSvn.texi +++ b/gnu/usr.bin/cvs/doc/CVSvn.texi @@ -1 +1 @@ -@set CVSVN 1.9.2 +@set CVSVN 1.9.4 diff --git a/gnu/usr.bin/cvs/doc/cvs.aux b/gnu/usr.bin/cvs/doc/cvs.aux index 4d17c99855c..bf4e4291c92 100644 --- a/gnu/usr.bin/cvs/doc/cvs.aux +++ b/gnu/usr.bin/cvs/doc/cvs.aux @@ -64,405 +64,408 @@ 'xrdef {Remote repositories-title}{Remote repositories} 'xrdef {Remote repositories-pg}{21} 'xrdef {Remote repositories-snt}{Section'tie4.6} +'xrdef {Server requirements-title}{Server requirements} +'xrdef {Server requirements-pg}{22} +'xrdef {Server requirements-snt}{Section'tie4.6.1} 'xrdef {Connecting via rsh-title}{Connecting with rsh} -'xrdef {Connecting via rsh-pg}{21} -'xrdef {Connecting via rsh-snt}{Section'tie4.6.1} +'xrdef {Connecting via rsh-pg}{22} +'xrdef {Connecting via rsh-snt}{Section'tie4.6.2} 'xrdef {Password authenticated-title}{Direct connection with password authentication} 'xrdef {Password authenticated-pg}{23} -'xrdef {Password authenticated-snt}{Section'tie4.6.2} +'xrdef {Password authenticated-snt}{Section'tie4.6.3} 'xrdef {Password authentication server-title}{Setting up the server for password authentication} 'xrdef {Password authentication server-pg}{23} -'xrdef {Password authentication server-snt}{Section'tie4.6.2.1} +'xrdef {Password authentication server-snt}{Section'tie4.6.3.1} 'xrdef {Password authentication client-title}{Using the client with password authentication} 'xrdef {Password authentication client-pg}{25} -'xrdef {Password authentication client-snt}{Section'tie4.6.2.2} +'xrdef {Password authentication client-snt}{Section'tie4.6.3.2} 'xrdef {Password authentication security-title}{Security considerations with password authentication} 'xrdef {Password authentication security-pg}{26} -'xrdef {Password authentication security-snt}{Section'tie4.6.2.3} +'xrdef {Password authentication security-snt}{Section'tie4.6.3.3} 'xrdef {Kerberos authenticated-title}{Direct connection with kerberos} -'xrdef {Kerberos authenticated-pg}{26} -'xrdef {Kerberos authenticated-snt}{Section'tie4.6.3} +'xrdef {Kerberos authenticated-pg}{27} +'xrdef {Kerberos authenticated-snt}{Section'tie4.6.4} 'xrdef {Read-only access-title}{Read-only repository access} -'xrdef {Read-only access-pg}{27} +'xrdef {Read-only access-pg}{28} 'xrdef {Read-only access-snt}{Section'tie4.7} 'xrdef {Starting a new project-title}{Starting a project with CVS} -'xrdef {Starting a new project-pg}{29} +'xrdef {Starting a new project-pg}{31} 'xrdef {Starting a new project-snt}{Chapter'tie5} 'xrdef {Setting up the files-title}{Setting up the files} -'xrdef {Setting up the files-pg}{29} +'xrdef {Setting up the files-pg}{31} 'xrdef {Setting up the files-snt}{Section'tie5.1} 'xrdef {From files-title}{Creating a directory tree from a number of files} -'xrdef {From files-pg}{29} +'xrdef {From files-pg}{31} 'xrdef {From files-snt}{Section'tie5.1.1} 'xrdef {From other version control systems-title}{Creating Files From Other Version Control Systems} -'xrdef {From other version control systems-pg}{30} +'xrdef {From other version control systems-pg}{32} 'xrdef {From other version control systems-snt}{Section'tie5.1.2} 'xrdef {From scratch-title}{Creating a directory tree from scratch} -'xrdef {From scratch-pg}{31} +'xrdef {From scratch-pg}{33} 'xrdef {From scratch-snt}{Section'tie5.1.3} 'xrdef {Defining the module-title}{Defining the module} -'xrdef {Defining the module-pg}{31} +'xrdef {Defining the module-pg}{33} 'xrdef {Defining the module-snt}{Section'tie5.2} 'xrdef {Multiple developers-title}{Multiple developers} -'xrdef {Multiple developers-pg}{33} +'xrdef {Multiple developers-pg}{35} 'xrdef {Multiple developers-snt}{Chapter'tie6} 'xrdef {File status-title}{File status} -'xrdef {File status-pg}{33} +'xrdef {File status-pg}{35} 'xrdef {File status-snt}{Section'tie6.1} 'xrdef {Updating a file-title}{Bringing a file up to date} -'xrdef {Updating a file-pg}{34} +'xrdef {Updating a file-pg}{36} 'xrdef {Updating a file-snt}{Section'tie6.2} 'xrdef {Conflicts example-title}{Conflicts example} -'xrdef {Conflicts example-pg}{35} +'xrdef {Conflicts example-pg}{37} 'xrdef {Conflicts example-snt}{Section'tie6.3} 'xrdef {Informing others-title}{Informing others about commits} -'xrdef {Informing others-pg}{38} +'xrdef {Informing others-pg}{40} 'xrdef {Informing others-snt}{Section'tie6.4} 'xrdef {Concurrency-title}{Several developers simultaneously attempting to run CVS} -'xrdef {Concurrency-pg}{38} +'xrdef {Concurrency-pg}{40} 'xrdef {Concurrency-snt}{Section'tie6.5} 'xrdef {Watches-title}{Mechanisms to track who is editing files} -'xrdef {Watches-pg}{39} +'xrdef {Watches-pg}{41} 'xrdef {Watches-snt}{Section'tie6.6} 'xrdef {Setting a watch-title}{Telling CVS to watch certain files} -'xrdef {Setting a watch-pg}{40} +'xrdef {Setting a watch-pg}{42} 'xrdef {Setting a watch-snt}{Section'tie6.6.1} 'xrdef {Getting Notified-title}{Telling CVS to notify you} -'xrdef {Getting Notified-pg}{40} +'xrdef {Getting Notified-pg}{42} 'xrdef {Getting Notified-snt}{Section'tie6.6.2} 'xrdef {Editing files-title}{How to edit a file which is being watched} -'xrdef {Editing files-pg}{42} +'xrdef {Editing files-pg}{44} 'xrdef {Editing files-snt}{Section'tie6.6.3} 'xrdef {Watch information-title}{Information about who is watching and editing} -'xrdef {Watch information-pg}{43} +'xrdef {Watch information-pg}{45} 'xrdef {Watch information-snt}{Section'tie6.6.4} 'xrdef {Watches Compatibility-title}{Using watches with old versions of CVS} -'xrdef {Watches Compatibility-pg}{43} +'xrdef {Watches Compatibility-pg}{45} 'xrdef {Watches Compatibility-snt}{Section'tie6.6.5} 'xrdef {Choosing a model-title}{Choosing between reserved or unreserved checkouts} -'xrdef {Choosing a model-pg}{44} +'xrdef {Choosing a model-pg}{46} 'xrdef {Choosing a model-snt}{Section'tie6.7} 'xrdef {Branches-title}{Branches} -'xrdef {Branches-pg}{45} +'xrdef {Branches-pg}{47} 'xrdef {Branches-snt}{Chapter'tie7} 'xrdef {Tags-title}{Tags--Symbolic revisions} -'xrdef {Tags-pg}{45} +'xrdef {Tags-pg}{47} 'xrdef {Tags-snt}{Section'tie7.1} 'xrdef {Branches motivation-title}{What branches are good for} -'xrdef {Branches motivation-pg}{47} +'xrdef {Branches motivation-pg}{49} 'xrdef {Branches motivation-snt}{Section'tie7.2} 'xrdef {Creating a branch-title}{Creating a branch} -'xrdef {Creating a branch-pg}{48} +'xrdef {Creating a branch-pg}{50} 'xrdef {Creating a branch-snt}{Section'tie7.3} 'xrdef {Sticky tags-title}{Sticky tags} -'xrdef {Sticky tags-pg}{49} +'xrdef {Sticky tags-pg}{51} 'xrdef {Sticky tags-snt}{Section'tie7.4} 'xrdef {Merging-title}{Merging} -'xrdef {Merging-pg}{51} +'xrdef {Merging-pg}{53} 'xrdef {Merging-snt}{Chapter'tie8} 'xrdef {Merging a branch-title}{Merging an entire branch} -'xrdef {Merging a branch-pg}{51} +'xrdef {Merging a branch-pg}{53} 'xrdef {Merging a branch-snt}{Section'tie8.1} 'xrdef {Merging more than once-title}{Merging from a branch several times} -'xrdef {Merging more than once-pg}{52} +'xrdef {Merging more than once-pg}{54} 'xrdef {Merging more than once-snt}{Section'tie8.2} 'xrdef {Merging two revisions-title}{Merging differences between any two revisions} -'xrdef {Merging two revisions-pg}{53} +'xrdef {Merging two revisions-pg}{55} 'xrdef {Merging two revisions-snt}{Section'tie8.3} 'xrdef {Merging adds and removals-title}{Merging can add or remove files} -'xrdef {Merging adds and removals-pg}{53} +'xrdef {Merging adds and removals-pg}{55} 'xrdef {Merging adds and removals-snt}{Section'tie8.4} 'xrdef {Recursive behavior-title}{Recursive behavior} -'xrdef {Recursive behavior-pg}{55} +'xrdef {Recursive behavior-pg}{57} 'xrdef {Recursive behavior-snt}{Chapter'tie9} 'xrdef {Adding files-title}{Adding files to a directory} -'xrdef {Adding files-pg}{57} +'xrdef {Adding files-pg}{59} 'xrdef {Adding files-snt}{Chapter'tie10} 'xrdef {Removing files-title}{Removing files} -'xrdef {Removing files-pg}{59} +'xrdef {Removing files-pg}{61} 'xrdef {Removing files-snt}{Chapter'tie11} 'xrdef {Removing directories-title}{Removing directories} -'xrdef {Removing directories-pg}{61} +'xrdef {Removing directories-pg}{63} 'xrdef {Removing directories-snt}{Chapter'tie12} 'xrdef {Tracking sources-title}{Tracking third-party sources} -'xrdef {Tracking sources-pg}{63} +'xrdef {Tracking sources-pg}{65} 'xrdef {Tracking sources-snt}{Chapter'tie13} 'xrdef {First import-title}{Importing a module for the first time} -'xrdef {First import-pg}{63} +'xrdef {First import-pg}{65} 'xrdef {First import-snt}{Section'tie13.1} 'xrdef {Update imports-title}{Updating a module with the import command} -'xrdef {Update imports-pg}{64} +'xrdef {Update imports-pg}{66} 'xrdef {Update imports-snt}{Section'tie13.2} 'xrdef {Reverting local changes-title}{Reverting to the latest vendor release} -'xrdef {Reverting local changes-pg}{64} +'xrdef {Reverting local changes-pg}{66} 'xrdef {Reverting local changes-snt}{Section'tie13.3} 'xrdef {Binary files in imports-title}{How to handle binary files with cvs import} -'xrdef {Binary files in imports-pg}{65} +'xrdef {Binary files in imports-pg}{67} 'xrdef {Binary files in imports-snt}{Section'tie13.4} 'xrdef {Moving files-title}{Moving and renaming files} -'xrdef {Moving files-pg}{67} +'xrdef {Moving files-pg}{69} 'xrdef {Moving files-snt}{Chapter'tie14} 'xrdef {Outside-title}{The Normal way to Rename} -'xrdef {Outside-pg}{67} +'xrdef {Outside-pg}{69} 'xrdef {Outside-snt}{Section'tie14.1} 'xrdef {Inside-title}{Moving the history file} -'xrdef {Inside-pg}{67} +'xrdef {Inside-pg}{69} 'xrdef {Inside-snt}{Section'tie14.2} 'xrdef {Rename by copying-title}{Copying the history file} -'xrdef {Rename by copying-pg}{68} +'xrdef {Rename by copying-pg}{70} 'xrdef {Rename by copying-snt}{Section'tie14.3} 'xrdef {Moving directories-title}{Moving and renaming directories} -'xrdef {Moving directories-pg}{71} +'xrdef {Moving directories-pg}{73} 'xrdef {Moving directories-snt}{Chapter'tie15} 'xrdef {History browsing-title}{History browsing} -'xrdef {History browsing-pg}{73} +'xrdef {History browsing-pg}{75} 'xrdef {History browsing-snt}{Chapter'tie16} 'xrdef {log messages-title}{Log messages} -'xrdef {log messages-pg}{73} +'xrdef {log messages-pg}{75} 'xrdef {log messages-snt}{Section'tie16.1} 'xrdef {history database-title}{The history database} -'xrdef {history database-pg}{73} +'xrdef {history database-pg}{75} 'xrdef {history database-snt}{Section'tie16.2} 'xrdef {user-defined logging-title}{User-defined logging} -'xrdef {user-defined logging-pg}{73} +'xrdef {user-defined logging-pg}{75} 'xrdef {user-defined logging-snt}{Section'tie16.3} 'xrdef {annotate-title}{Annotate command} -'xrdef {annotate-pg}{74} +'xrdef {annotate-pg}{76} 'xrdef {annotate-snt}{Section'tie16.4} 'xrdef {Keyword substitution-title}{Keyword substitution} -'xrdef {Keyword substitution-pg}{75} +'xrdef {Keyword substitution-pg}{77} 'xrdef {Keyword substitution-snt}{Chapter'tie17} 'xrdef {Keyword list-title}{RCS Keywords} -'xrdef {Keyword list-pg}{75} +'xrdef {Keyword list-pg}{77} 'xrdef {Keyword list-snt}{Section'tie17.1} 'xrdef {Using keywords-title}{Using keywords} -'xrdef {Using keywords-pg}{76} +'xrdef {Using keywords-pg}{78} 'xrdef {Using keywords-snt}{Section'tie17.2} 'xrdef {Avoiding substitution-title}{Avoiding substitution} -'xrdef {Avoiding substitution-pg}{77} +'xrdef {Avoiding substitution-pg}{79} 'xrdef {Avoiding substitution-snt}{Section'tie17.3} 'xrdef {Substitution modes-title}{Substitution modes} -'xrdef {Substitution modes-pg}{77} +'xrdef {Substitution modes-pg}{79} 'xrdef {Substitution modes-snt}{Section'tie17.4} 'xrdef {Log keyword-title}{Problems with the $Log: cvs.aux,v $ -'xrdef {Log keyword-title}{Problems with the Revision 1.1.1.6 1997/02/21 06:47:15 tholo -'xrdef {Log keyword-title}{Problems with the Missed files from new release from Cyclic Software +'xrdef {Log keyword-title}{Problems with the Revision 1.1.1.7 1997/03/18 02:05:45 tholo +'xrdef {Log keyword-title}{Problems with the Files missed from previous import 'xrdef {Log keyword-title}{Problems with the keyword.} -'xrdef {Log keyword-pg}{78} +'xrdef {Log keyword-pg}{80} 'xrdef {Log keyword-snt}{Section'tie17.5} 'xrdef {Binary files-title}{Handling binary files} -'xrdef {Binary files-pg}{79} +'xrdef {Binary files-pg}{81} 'xrdef {Binary files-snt}{Chapter'tie18} 'xrdef {Builds-title}{How your build system interacts with CVS} -'xrdef {Builds-pg}{81} +'xrdef {Builds-pg}{83} 'xrdef {Builds-snt}{Chapter'tie19} 'xrdef {Compatibility-title}{Compatibility between CVS Versions} -'xrdef {Compatibility-pg}{83} +'xrdef {Compatibility-pg}{85} 'xrdef {Compatibility-snt}{Chapter'tie20} 'xrdef {Revision management-title}{Revision management} -'xrdef {Revision management-pg}{85} +'xrdef {Revision management-pg}{87} 'xrdef {Revision management-snt}{Chapter'tie21} 'xrdef {When to commit-title}{When to commit?} -'xrdef {When to commit-pg}{85} +'xrdef {When to commit-pg}{87} 'xrdef {When to commit-snt}{Section'tie21.1} 'xrdef {CVS commands-title}{Guide to CVS commands} -'xrdef {CVS commands-pg}{87} +'xrdef {CVS commands-pg}{89} 'xrdef {CVS commands-snt}{Appendix'tie'char65{}} 'xrdef {Structure-title}{Overall structure of CVS commands} -'xrdef {Structure-pg}{87} +'xrdef {Structure-pg}{89} 'xrdef {Structure-snt}{Section'tie'char65.1} 'xrdef {~/.cvsrc-title}{Default options and the ~/.cvsrc file} -'xrdef {~/.cvsrc-pg}{87} +'xrdef {~/.cvsrc-pg}{89} 'xrdef {~/.cvsrc-snt}{Section'tie'char65.2} 'xrdef {Global options-title}{Global options} -'xrdef {Global options-pg}{89} +'xrdef {Global options-pg}{91} 'xrdef {Global options-snt}{Section'tie'char65.3} 'xrdef {Common options-title}{Common command options} -'xrdef {Common options-pg}{90} +'xrdef {Common options-pg}{92} 'xrdef {Common options-snt}{Section'tie'char65.4} 'xrdef {admin-title}{admin---Administration front end for rcs} -'xrdef {admin-pg}{93} +'xrdef {admin-pg}{95} 'xrdef {admin-snt}{Section'tie'char65.5} 'xrdef {admin options-title}{admin options} -'xrdef {admin options-pg}{93} +'xrdef {admin options-pg}{95} 'xrdef {admin options-snt}{Section'tie'char65.5.1} 'xrdef {admin examples-title}{admin examples} -'xrdef {admin examples-pg}{96} +'xrdef {admin examples-pg}{98} 'xrdef {admin examples-snt}{Section'tie'char65.5.2} 'xrdef {checkout-title}{checkout---Check out sources for editing} -'xrdef {checkout-pg}{97} +'xrdef {checkout-pg}{99} 'xrdef {checkout-snt}{Section'tie'char65.6} 'xrdef {checkout options-title}{checkout options} -'xrdef {checkout options-pg}{98} +'xrdef {checkout options-pg}{100} 'xrdef {checkout options-snt}{Section'tie'char65.6.1} 'xrdef {checkout examples-title}{checkout examples} -'xrdef {checkout examples-pg}{99} +'xrdef {checkout examples-pg}{101} 'xrdef {checkout examples-snt}{Section'tie'char65.6.2} 'xrdef {commit-title}{commit---Check files into the repository} -'xrdef {commit-pg}{99} +'xrdef {commit-pg}{101} 'xrdef {commit-snt}{Section'tie'char65.7} 'xrdef {commit options-title}{commit options} -'xrdef {commit options-pg}{100} +'xrdef {commit options-pg}{102} 'xrdef {commit options-snt}{Section'tie'char65.7.1} 'xrdef {commit examples-title}{commit examples} -'xrdef {commit examples-pg}{101} +'xrdef {commit examples-pg}{103} 'xrdef {commit examples-snt}{Section'tie'char65.7.2} 'xrdef {diff-title}{diff---Run diffs between revisions} -'xrdef {diff-pg}{103} +'xrdef {diff-pg}{105} 'xrdef {diff-snt}{Section'tie'char65.8} 'xrdef {diff options-title}{diff options} -'xrdef {diff options-pg}{103} +'xrdef {diff options-pg}{105} 'xrdef {diff options-snt}{Section'tie'char65.8.1} 'xrdef {diff examples-title}{diff examples} -'xrdef {diff examples-pg}{104} +'xrdef {diff examples-pg}{106} 'xrdef {diff examples-snt}{Section'tie'char65.8.2} 'xrdef {export-title}{export---Export sources from CVS, similar to checkout} -'xrdef {export-pg}{105} +'xrdef {export-pg}{107} 'xrdef {export-snt}{Section'tie'char65.9} 'xrdef {export options-title}{export options} -'xrdef {export options-pg}{105} +'xrdef {export options-pg}{107} 'xrdef {export options-snt}{Section'tie'char65.9.1} 'xrdef {history-title}{history---Show status of files and users} -'xrdef {history-pg}{106} +'xrdef {history-pg}{108} 'xrdef {history-snt}{Section'tie'char65.10} 'xrdef {history options-title}{history options} -'xrdef {history options-pg}{106} +'xrdef {history options-pg}{108} 'xrdef {history options-snt}{Section'tie'char65.10.1} 'xrdef {import-title}{import---Import sources into CVS, using vendor branches} -'xrdef {import-pg}{108} +'xrdef {import-pg}{110} 'xrdef {import-snt}{Section'tie'char65.11} 'xrdef {import options-title}{import options} -'xrdef {import options-pg}{109} +'xrdef {import options-pg}{111} 'xrdef {import options-snt}{Section'tie'char65.11.1} 'xrdef {import output-title}{import output} -'xrdef {import output-pg}{110} +'xrdef {import output-pg}{112} 'xrdef {import output-snt}{Section'tie'char65.11.2} 'xrdef {import examples-title}{import examples} -'xrdef {import examples-pg}{110} +'xrdef {import examples-pg}{112} 'xrdef {import examples-snt}{Section'tie'char65.11.3} 'xrdef {log-title}{log---Print out log information for files} -'xrdef {log-pg}{110} +'xrdef {log-pg}{113} 'xrdef {log-snt}{Section'tie'char65.12} 'xrdef {log options-title}{log options} -'xrdef {log options-pg}{111} +'xrdef {log options-pg}{113} 'xrdef {log options-snt}{Section'tie'char65.12.1} 'xrdef {log examples-title}{log examples} -'xrdef {log examples-pg}{112} +'xrdef {log examples-pg}{114} 'xrdef {log examples-snt}{Section'tie'char65.12.2} 'xrdef {rdiff-title}{rdiff---'patch' format diffs between releases} -'xrdef {rdiff-pg}{112} +'xrdef {rdiff-pg}{115} 'xrdef {rdiff-snt}{Section'tie'char65.13} 'xrdef {rdiff options-title}{rdiff options} -'xrdef {rdiff options-pg}{113} +'xrdef {rdiff options-pg}{115} 'xrdef {rdiff options-snt}{Section'tie'char65.13.1} 'xrdef {rdiff examples-title}{rdiff examples} -'xrdef {rdiff examples-pg}{114} +'xrdef {rdiff examples-pg}{116} 'xrdef {rdiff examples-snt}{Section'tie'char65.13.2} 'xrdef {release-title}{release---Indicate that a Module is no longer in use} -'xrdef {release-pg}{114} +'xrdef {release-pg}{116} 'xrdef {release-snt}{Section'tie'char65.14} 'xrdef {release options-title}{release options} -'xrdef {release options-pg}{115} +'xrdef {release options-pg}{117} 'xrdef {release options-snt}{Section'tie'char65.14.1} 'xrdef {release output-title}{release output} -'xrdef {release output-pg}{115} +'xrdef {release output-pg}{117} 'xrdef {release output-snt}{Section'tie'char65.14.2} 'xrdef {release examples-title}{release examples} -'xrdef {release examples-pg}{116} +'xrdef {release examples-pg}{118} 'xrdef {release examples-snt}{Section'tie'char65.14.3} 'xrdef {rtag-title}{rtag---Add a symbolic tag to a module} -'xrdef {rtag-pg}{116} +'xrdef {rtag-pg}{118} 'xrdef {rtag-snt}{Section'tie'char65.15} 'xrdef {rtag options-title}{rtag options} -'xrdef {rtag options-pg}{117} +'xrdef {rtag options-pg}{119} 'xrdef {rtag options-snt}{Section'tie'char65.15.1} 'xrdef {status-title}{status---Display status information on checked out files} -'xrdef {status-pg}{117} +'xrdef {status-pg}{119} 'xrdef {status-snt}{Section'tie'char65.16} 'xrdef {status options-title}{status options} -'xrdef {status options-pg}{118} +'xrdef {status options-pg}{120} 'xrdef {status options-snt}{Section'tie'char65.16.1} 'xrdef {tag-title}{tag---Add a symbolic tag to checked out versions of files} -'xrdef {tag-pg}{118} +'xrdef {tag-pg}{120} 'xrdef {tag-snt}{Section'tie'char65.17} 'xrdef {tag options-title}{tag options} -'xrdef {tag options-pg}{119} +'xrdef {tag options-pg}{121} 'xrdef {tag options-snt}{Section'tie'char65.17.1} 'xrdef {update-title}{update---Bring work tree in sync with repository} -'xrdef {update-pg}{120} +'xrdef {update-pg}{122} 'xrdef {update-snt}{Section'tie'char65.18} 'xrdef {update options-title}{update options} -'xrdef {update options-pg}{120} +'xrdef {update options-pg}{122} 'xrdef {update options-snt}{Section'tie'char65.18.1} 'xrdef {update output-title}{update output} -'xrdef {update output-pg}{122} +'xrdef {update output-pg}{124} 'xrdef {update output-snt}{Section'tie'char65.18.2} 'xrdef {update examples-title}{update examples} -'xrdef {update examples-pg}{123} +'xrdef {update examples-pg}{125} 'xrdef {update examples-snt}{Section'tie'char65.18.3} 'xrdef {Invoking CVS-title}{Quick reference to CVS commands} -'xrdef {Invoking CVS-pg}{125} +'xrdef {Invoking CVS-pg}{127} 'xrdef {Invoking CVS-snt}{Appendix'tie'char66{}} 'xrdef {Administrative files-title}{Reference manual for the Administrative files} -'xrdef {Administrative files-pg}{135} +'xrdef {Administrative files-pg}{137} 'xrdef {Administrative files-snt}{Appendix'tie'char67{}} 'xrdef {modules-title}{The modules file} -'xrdef {modules-pg}{135} +'xrdef {modules-pg}{137} 'xrdef {modules-snt}{Section'tie'char67.1} 'xrdef {Wrappers-title}{The cvswrappers file} -'xrdef {Wrappers-pg}{137} +'xrdef {Wrappers-pg}{139} 'xrdef {Wrappers-snt}{Section'tie'char67.2} 'xrdef {commit files-title}{The commit support files} -'xrdef {commit files-pg}{138} +'xrdef {commit files-pg}{140} 'xrdef {commit files-snt}{Section'tie'char67.3} 'xrdef {syntax-title}{The common syntax} -'xrdef {syntax-pg}{139} +'xrdef {syntax-pg}{141} 'xrdef {syntax-snt}{Section'tie'char67.3.1} 'xrdef {commitinfo-title}{Commitinfo} -'xrdef {commitinfo-pg}{139} +'xrdef {commitinfo-pg}{141} 'xrdef {commitinfo-snt}{Section'tie'char67.4} 'xrdef {verifymsg-title}{Verifying log messages} -'xrdef {verifymsg-pg}{140} +'xrdef {verifymsg-pg}{142} 'xrdef {verifymsg-snt}{Section'tie'char67.5} 'xrdef {editinfo-title}{Editinfo} -'xrdef {editinfo-pg}{141} +'xrdef {editinfo-pg}{143} 'xrdef {editinfo-snt}{Section'tie'char67.6} 'xrdef {editinfo example-title}{Editinfo example} -'xrdef {editinfo example-pg}{142} +'xrdef {editinfo example-pg}{144} 'xrdef {editinfo example-snt}{Section'tie'char67.6.1} 'xrdef {loginfo-title}{Loginfo} -'xrdef {loginfo-pg}{143} +'xrdef {loginfo-pg}{145} 'xrdef {loginfo-snt}{Section'tie'char67.7} 'xrdef {loginfo example-title}{Loginfo example} -'xrdef {loginfo example-pg}{144} +'xrdef {loginfo example-pg}{147} 'xrdef {loginfo example-snt}{Section'tie'char67.7.1} 'xrdef {Keeping a checked out copy-title}{Keeping a checked out copy} -'xrdef {Keeping a checked out copy-pg}{145} +'xrdef {Keeping a checked out copy-pg}{147} 'xrdef {Keeping a checked out copy-snt}{Section'tie'char67.7.2} 'xrdef {rcsinfo-title}{Rcsinfo} -'xrdef {rcsinfo-pg}{145} +'xrdef {rcsinfo-pg}{148} 'xrdef {rcsinfo-snt}{Section'tie'char67.8} 'xrdef {cvsignore-title}{Ignoring files via cvsignore} -'xrdef {cvsignore-pg}{146} +'xrdef {cvsignore-pg}{148} 'xrdef {cvsignore-snt}{Section'tie'char67.9} 'xrdef {history file-title}{The history file} -'xrdef {history file-pg}{147} +'xrdef {history file-pg}{149} 'xrdef {history file-snt}{Section'tie'char67.10} 'xrdef {Variables-title}{Expansions in administrative files} -'xrdef {Variables-pg}{147} +'xrdef {Variables-pg}{150} 'xrdef {Variables-snt}{Section'tie'char67.11} 'xrdef {Environment variables-title}{All environment variables which affect CVS} -'xrdef {Environment variables-pg}{149} +'xrdef {Environment variables-pg}{151} 'xrdef {Environment variables-snt}{Appendix'tie'char68{}} 'xrdef {Troubleshooting-title}{Troubleshooting} -'xrdef {Troubleshooting-pg}{153} +'xrdef {Troubleshooting-pg}{155} 'xrdef {Troubleshooting-snt}{Appendix'tie'char69{}} 'xrdef {Magic branch numbers-title}{Magic branch numbers} -'xrdef {Magic branch numbers-pg}{153} +'xrdef {Magic branch numbers-pg}{155} 'xrdef {Magic branch numbers-snt}{Section'tie'char69.1} 'xrdef {Copying-title}{GNU GENERAL PUBLIC LICENSE} -'xrdef {Copying-pg}{155} +'xrdef {Copying-pg}{157} 'xrdef {Copying-snt}{Appendix'tie'char70{}} 'xrdef {Index-title}{Index} -'xrdef {Index-pg}{163} +'xrdef {Index-pg}{165} 'xrdef {Index-snt}{} diff --git a/gnu/usr.bin/cvs/doc/cvs.info b/gnu/usr.bin/cvs/doc/cvs.info index 68819150bb3..83651c5baec 100644 --- a/gnu/usr.bin/cvs/doc/cvs.info +++ b/gnu/usr.bin/cvs/doc/cvs.info @@ -24,170 +24,171 @@ the Free Software Foundation instead of in the original English. Indirect: cvs.info-1: 1088 -cvs.info-2: 51022 -cvs.info-3: 100936 -cvs.info-4: 149952 -cvs.info-5: 199272 -cvs.info-6: 249055 -cvs.info-7: 280355 +cvs.info-2: 50652 +cvs.info-3: 99757 +cvs.info-4: 149195 +cvs.info-5: 197528 +cvs.info-6: 247090 +cvs.info-7: 283427 Tag Table: (Indirect) Node: Top1088 Node: Preface3013 Node: Checklist4959 -Node: Credits6020 -Node: BUGS7205 -Node: What is CVS?8221 -Node: Basic concepts16776 -Node: Revision numbers17372 -Node: Versions revisions releases20422 -Node: A sample session20981 -Node: Getting the source21693 -Node: Committing your changes22570 -Node: Cleaning up23497 -Node: Viewing differences25197 -Node: Repository26090 -Node: Specifying a repository28404 -Node: Repository storage29815 -Node: Repository files30692 -Node: File permissions33469 -Node: Intro administrative files35344 -Node: Multiple repositories37045 -Node: Creating a repository38217 -Node: Remote repositories40357 -Node: Connecting via rsh41515 -Node: Password authenticated44078 -Node: Password authentication server44833 -Node: Password authentication client48839 -Node: Password authentication security51022 -Node: Kerberos authenticated52488 -Node: Read-only access53905 -Node: Starting a new project56597 -Node: Setting up the files57351 -Node: From files57975 -Node: From other version control systems59981 -Node: From scratch61870 -Node: Defining the module62606 -Node: Multiple developers63587 -Node: File status65643 -Node: Updating a file67771 -Node: Conflicts example69078 -Node: Informing others73130 -Node: Concurrency73670 -Node: Watches75428 -Node: Setting a watch76818 -Node: Getting Notified77985 -Node: Editing files81361 -Node: Watch information83881 -Node: Watches Compatibility84731 -Node: Choosing a model85566 -Node: Branches88241 -Node: Tags88952 -Node: Branches motivation94085 -Node: Creating a branch95097 -Node: Sticky tags97665 -Node: Merging100936 -Node: Merging a branch101514 -Node: Merging more than once103290 -Node: Merging two revisions105763 -Node: Merging adds and removals106555 -Node: Recursive behavior107131 -Node: Adding files108815 -Node: Removing files111486 -Node: Removing directories114445 -Node: Tracking sources115491 -Node: First import116892 -Node: Update imports118241 -Node: Reverting local changes119734 -Node: Binary files in imports120426 -Node: Moving files120707 -Node: Outside121334 -Node: Inside122285 -Node: Rename by copying123150 -Node: Moving directories124310 -Node: History browsing125741 -Node: log messages126300 -Node: history database126622 -Node: user-defined logging126968 -Node: annotate128488 -Node: Keyword substitution129628 -Node: Keyword list130616 -Node: Using keywords132396 -Node: Avoiding substitution134343 -Node: Substitution modes135243 -Node: Log keyword137745 -Node: Binary files138885 -Node: Builds141736 -Node: Compatibility144414 -Node: Revision management145406 -Node: When to commit145995 -Node: CVS commands147103 -Node: Structure148684 -Node: ~/.cvsrc149952 -Node: Global options151951 -Node: Common options155526 -Node: admin162387 -Node: admin options163263 -Node: admin examples171001 -Node: checkout172518 -Node: checkout options174966 -Node: checkout examples178135 -Node: commit178412 -Node: commit options180538 -Node: commit examples182124 -Node: diff185464 -Node: diff options186353 -Node: diff examples188087 -Node: export189047 -Node: export options190306 -Node: history191498 -Node: history options192279 -Node: import195111 -Node: import options197722 -Node: import output199272 -Node: import examples200218 -Node: log200382 -Node: log options201417 -Node: log examples204643 -Node: rdiff204789 -Node: rdiff options206091 -Node: rdiff examples207640 -Node: release208598 -Node: release options209893 -Node: release output210572 -Node: release examples212087 -Node: rtag212547 -Node: rtag options213382 -Node: status215272 -Node: status options216169 -Node: tag216757 -Node: tag options218311 -Node: update219548 -Node: update options220402 -Node: update output224005 -Node: update examples226868 -Node: Invoking CVS227200 -Node: Administrative files243094 -Node: modules244427 -Node: Wrappers249055 -Node: commit files252151 -Node: syntax253859 -Node: commitinfo254739 -Node: verifymsg256252 -Node: editinfo258692 -Node: editinfo example260968 -Node: loginfo262262 -Node: loginfo example264596 -Node: Keeping a checked out copy265366 -Node: rcsinfo266374 -Node: cvsignore267680 -Node: history file270562 -Node: Variables271214 -Node: Environment variables273745 -Node: Troubleshooting278999 -Node: Magic branch numbers279193 -Node: Copying280355 -Node: Index299542 +Node: Credits6021 +Node: BUGS7209 +Node: What is CVS?8225 +Node: Basic concepts16780 +Node: Revision numbers17376 +Node: Versions revisions releases20426 +Node: A sample session20985 +Node: Getting the source21697 +Node: Committing your changes22574 +Node: Cleaning up23501 +Node: Viewing differences25201 +Node: Repository26094 +Node: Specifying a repository28408 +Node: Repository storage29819 +Node: Repository files30696 +Node: File permissions33473 +Node: Intro administrative files35784 +Node: Multiple repositories37485 +Node: Creating a repository38657 +Node: Remote repositories40797 +Node: Server requirements42026 +Node: Connecting via rsh43297 +Node: Password authenticated45891 +Node: Password authentication server46646 +Node: Password authentication client50652 +Node: Password authentication security52968 +Node: Kerberos authenticated54434 +Node: Read-only access55851 +Node: Starting a new project58543 +Node: Setting up the files59297 +Node: From files59921 +Node: From other version control systems61927 +Node: From scratch63816 +Node: Defining the module64552 +Node: Multiple developers65533 +Node: File status67689 +Node: Updating a file69863 +Node: Conflicts example71170 +Node: Informing others75222 +Node: Concurrency75762 +Node: Watches77520 +Node: Setting a watch78910 +Node: Getting Notified80077 +Node: Editing files83453 +Node: Watch information85973 +Node: Watches Compatibility86823 +Node: Choosing a model87658 +Node: Branches90333 +Node: Tags91044 +Node: Branches motivation96177 +Node: Creating a branch97189 +Node: Sticky tags99757 +Node: Merging103028 +Node: Merging a branch103606 +Node: Merging more than once105382 +Node: Merging two revisions107855 +Node: Merging adds and removals108647 +Node: Recursive behavior109223 +Node: Adding files110907 +Node: Removing files113578 +Node: Removing directories116537 +Node: Tracking sources117583 +Node: First import118984 +Node: Update imports120333 +Node: Reverting local changes121826 +Node: Binary files in imports122518 +Node: Moving files122799 +Node: Outside123426 +Node: Inside124377 +Node: Rename by copying125242 +Node: Moving directories126402 +Node: History browsing127833 +Node: log messages128392 +Node: history database128714 +Node: user-defined logging129060 +Node: annotate130580 +Node: Keyword substitution131720 +Node: Keyword list132708 +Node: Using keywords134488 +Node: Avoiding substitution136435 +Node: Substitution modes137335 +Node: Log keyword139837 +Node: Binary files140977 +Node: Builds143828 +Node: Compatibility146506 +Node: Revision management147498 +Node: When to commit148087 +Node: CVS commands149195 +Node: Structure150776 +Node: ~/.cvsrc152044 +Node: Global options154043 +Node: Common options157618 +Node: admin164479 +Node: admin options165355 +Node: admin examples173093 +Node: checkout174610 +Node: checkout options177058 +Node: checkout examples180227 +Node: commit180504 +Node: commit options182630 +Node: commit examples183999 +Node: diff187339 +Node: diff options188228 +Node: diff examples190504 +Node: export191464 +Node: export options192723 +Node: history193915 +Node: history options194696 +Node: import197528 +Node: import options200139 +Node: import output201689 +Node: import examples202766 +Node: log202930 +Node: log options203965 +Node: log examples207191 +Node: rdiff207337 +Node: rdiff options208639 +Node: rdiff examples210188 +Node: release211146 +Node: release options212441 +Node: release output213120 +Node: release examples214635 +Node: rtag215095 +Node: rtag options215930 +Node: status217820 +Node: status options218717 +Node: tag219305 +Node: tag options220859 +Node: update222096 +Node: update options222950 +Node: update output226553 +Node: update examples229416 +Node: Invoking CVS229748 +Node: Administrative files245757 +Node: modules247090 +Node: Wrappers251718 +Node: commit files255316 +Node: syntax257024 +Node: commitinfo257904 +Node: verifymsg259417 +Node: editinfo261857 +Node: editinfo example264133 +Node: loginfo265427 +Node: loginfo example267761 +Node: Keeping a checked out copy268531 +Node: rcsinfo269539 +Node: cvsignore270845 +Node: history file273727 +Node: Variables274379 +Node: Environment variables276910 +Node: Troubleshooting282071 +Node: Magic branch numbers282265 +Node: Copying283427 +Node: Index302614 End Tag Table diff --git a/gnu/usr.bin/cvs/doc/cvs.info-1 b/gnu/usr.bin/cvs/doc/cvs.info-1 index 8552545985d..e657bc7206a 100644 --- a/gnu/usr.bin/cvs/doc/cvs.info-1 +++ b/gnu/usr.bin/cvs/doc/cvs.info-1 @@ -27,7 +27,7 @@ File: cvs.info, Node: Top, Next: Preface, Up: (dir) This info manual describes how to use and administer CVS version -1.9.2. +1.9.4. * Menu: @@ -135,7 +135,7 @@ Binary files (release 1.15 and later are OK). You must also configure both RCS and CVS to handle binary files when you install them. - Keword substitution can be a source of trouble with binary files. + Keyword substitution can be a source of trouble with binary files. *Note Keyword substitution::, for solutions. The `admin' command @@ -160,9 +160,9 @@ G. Grubbs <dgg@think.com>. Some text has been extracted from the man pages for RCS. The CVS FAQ by David G. Grubbs has provided useful material. The -FAQ is no longer maintained, however, and this manual about the closest -thing there is to a successor (with respect to documenting how to use -CVS, at least). +FAQ is no longer maintained, however, and this manual is about the +closest thing there is to a successor (with respect to documenting how +to use CVS, at least). In addition, the following persons have helped by telling me about mistakes I've made: Roxanne Brunskill <rbrunski@datap.ca>, Kathy Dyer @@ -844,6 +844,14 @@ creates them read-only (see the sections on watches, *Note Setting a watch::; -r, *Note Global options::; or CVSREAD, *Note Environment variables::). + Note that using the client/server CVS (*note Remote +repositories::.), there is no good way to set `CVSUMASK'; the setting +on the client machine has no effect. If you are connecting with `rsh', +you can set `CVSUMASK' in `.bashrc' or `.cshrc', as described in the +documentation for your operating system. This behavior might change in +future versions of CVS; do not rely on the setting of `CVSUMASK' on the +client having no effect. + Since CVS was not written to be run setuid, it is unsafe to try to run it setuid. You cannot use the setuid features of RCS together with CVS. @@ -982,12 +990,41 @@ are described in *Note Connecting via rsh::. * Menu: +* Server requirements:: Memory and other resources for servers * Connecting via rsh:: Using the `rsh' program to connect * Password authenticated:: Direct connections using passwords * Kerberos authenticated:: Direct connections with kerberos -File: cvs.info, Node: Connecting via rsh, Next: Password authenticated, Up: Remote repositories +File: cvs.info, Node: Server requirements, Next: Connecting via rsh, Up: Remote repositories + +Server requirements +------------------- + + The quick answer to what sort of machine is suitable as a server is +that requirements are modest--a server with 32M of memory or even less +can handle a fairly large source tree with a fair amount of activity. + + The real answer, of course, is more complicated. The CVS server +consists of two processes for each client that it is serving. Memory +consumption on the child process should remain fairly small. Memory +consumption on the parent process, particularly if the network +connection to the client is slow, can be expected to grow to slightly +more than the size of the sources in a single directory, or two +megabytes, whichever is larger. + + Multiplying the size of each CVS server by the number of servers +which you expect to have active at one time should give an idea of +memory requirements for the server. For the most part, the memory +consumed by the parent process probably can be swap space rather than +physical memory. + + Resource consumption for the client or the non-client/server CVS is +even more modest--any machine with enough capacity to run the operating +system in question should have little trouble. + + +File: cvs.info, Node: Connecting via rsh, Next: Password authenticated, Prev: Server requirements, Up: Remote repositories Connecting with rsh ------------------- @@ -1027,11 +1064,11 @@ program which can transmit data to and from the server without modifying it; for example the Windows NT `rsh' is not suitable since it by default translates between CRLF and LF. The OS/2 CVS port has a hack to pass `-b' to `rsh' to get around this, but since this could -potentially cause programs for programs other than the standard `rsh', +potentially cause problems for programs other than the standard `rsh', it may change in the future. If you set `CVS_RSH' to `SSH' or some other rsh replacement, the instructions in the rest of this section -concerning `.rhosts' and so on are likely to be incorrect; consult the -documentation for your rsh replacement. +concerning `.rhosts' and so on are likely to be inapplicable; consult +the documentation for your rsh replacement. Continuing our example, supposing you want to access the module `foo' in the repository `/usr/local/cvsroot/', on machine @@ -1152,50 +1189,3 @@ as well. is to paste it there from somewhere else. Someday, there may be a `cvs passwd' command. - -File: cvs.info, Node: Password authentication client, Next: Password authentication security, Prev: Password authentication server, Up: Password authenticated - -Using the client with password authentication -............................................. - - Before connecting to the server, the client must "log in" with the -command `cvs login'. Logging in verifies a password with the server, -and also records the password for later transactions with the server. -The `cvs login' command needs to know the username, server hostname, -and full repository path, and it gets this information from the -repository argument or the `CVSROOT' environment variable. - - `cvs login' is interactive -- it prompts for a password: - - cvs -d :pserver:bach@chainsaw.brickyard.com:/usr/local/cvsroot login - CVS password: - - The password is checked with the server; if it is correct, the -`login' succeeds, else it fails, complaining that the password was -incorrect. - - Once you have logged in, you can force CVS to connect directly to -the server and authenticate with the stored password: - - cvs -d :pserver:bach@chainsaw.brickyard.com:/usr/local/cvsroot checkout foo - - The `:pserver:' is necessary because without it, CVS will assume it -should use `rsh' to connect with the server (*note Connecting via -rsh::.). (Once you have a working copy checked out and are running CVS -commands from within it, there is no longer any need to specify the -repository explicitly, because CVS records it in the working copy's -`CVS' subdirectory.) - - Passwords are stored by default in the file `$HOME/.cvspass'. Its -format is human-readable, but don't edit it unless you know what you -are doing. The passwords are not stored in cleartext, but are -trivially encoded to protect them from "innocent" compromise (i.e., -inadvertently being seen by a system administrator who happens to look -at that file). - - The `CVS_PASSFILE' environment variable overrides this default. If -you use this variable, make sure you set it *before* `cvs login' is -run. If you were to set it after running `cvs login', then later CVS -commands would be unable to look up the password for transmission to -the server. - diff --git a/gnu/usr.bin/cvs/doc/cvs.info-2 b/gnu/usr.bin/cvs/doc/cvs.info-2 index 4fd007ea3f9..ff76ea67a22 100644 --- a/gnu/usr.bin/cvs/doc/cvs.info-2 +++ b/gnu/usr.bin/cvs/doc/cvs.info-2 @@ -22,6 +22,56 @@ and this permission notice may be included in translations approved by the Free Software Foundation instead of in the original English. +File: cvs.info, Node: Password authentication client, Next: Password authentication security, Prev: Password authentication server, Up: Password authenticated + +Using the client with password authentication +............................................. + + Before connecting to the server, the client must "log in" with the +command `cvs login'. Logging in verifies a password with the server, +and also records the password for later transactions with the server. +The `cvs login' command needs to know the username, server hostname, +and full repository path, and it gets this information from the +repository argument or the `CVSROOT' environment variable. + + `cvs login' is interactive -- it prompts for a password: + + cvs -d :pserver:bach@chainsaw.brickyard.com:/usr/local/cvsroot login + CVS password: + + The password is checked with the server; if it is correct, the +`login' succeeds, else it fails, complaining that the password was +incorrect. + + Once you have logged in, you can force CVS to connect directly to +the server and authenticate with the stored password: + + cvs -d :pserver:bach@chainsaw.brickyard.com:/usr/local/cvsroot checkout foo + + The `:pserver:' is necessary because without it, CVS will assume it +should use `rsh' to connect with the server (*note Connecting via +rsh::.). (Once you have a working copy checked out and are running CVS +commands from within it, there is no longer any need to specify the +repository explicitly, because CVS records it in the working copy's +`CVS' subdirectory.) + + Passwords are stored by default in the file `$HOME/.cvspass'. Its +format is human-readable, but don't edit it unless you know what you +are doing. The passwords are not stored in cleartext, but are +trivially encoded to protect them from "innocent" compromise (i.e., +inadvertently being seen by a system administrator who happens to look +at that file). + + The password for the currently choosen remote repository can be +removed from the CVS_PASSFILE by using the `cvs logout' command. + + The `CVS_PASSFILE' environment variable overrides this default. If +you use this variable, make sure you set it *before* `cvs login' is +run. If you were to set it after running `cvs login', then later CVS +commands would be unable to look up the password for transmission to +the server. + + File: cvs.info, Node: Password authentication security, Prev: Password authentication client, Up: Password authenticated Security considerations with password authentication @@ -335,12 +385,13 @@ get complicated. Often, two people try to edit the same file simultaneously. One solution, known as "file locking" or "reserved checkouts", is to allow only one person to edit each file at a time. This is the only solution with some version control systems, including -RCS and SCCS. CVS doesn't have a very nice implementation of reserved -checkouts (yet) but there are ways to get it working (for example, see -the `cvs admin -l' command in *Note admin options::). It also may be -possible to use the watches features described below, together with -suitable procedures (not enforced by software), to avoid having two -people edit at the same time. +RCS and SCCS. Currently the usual way to get reserved checkouts with +CVS is the `cvs admin -l' command (*note admin options::.). This is +not as nicely integrated into CVS as the watch features, described +below, but it seems that most people with a need for reserved checkouts +find it adequate. It also may be possible to use the watches features +described below, together with suitable procedures (not enforced by +software), to avoid having two people edit at the same time. The default model with CVS is known as "unreserved checkouts". In this model, developers can edit their own "working copy" of a file @@ -407,10 +458,11 @@ Needs Merge Someone else has committed a newer revision to the repository, and you have also made modifications to the file. -Unresolved Conflict +File had conflicts on merge This is like Locally Modified, except that a previous `update' - command gave a conflict. You need to resolve the conflict as - described in *Note Conflicts example::. + command gave a conflict. If you have not already done so, you + need to resolve the conflict as described in *Note Conflicts + example::. Unknown CVS doesn't know anything about this file. For example, you have @@ -1178,78 +1230,3 @@ based on. (If `release-1-0' corresponds to revision 1.4, the branch's revision number will be 1.4.2. For obscure reasons CVS always gives branches even numbers, starting at 2. *Note Revision numbers::.). - -File: cvs.info, Node: Sticky tags, Prev: Creating a branch, Up: Branches - -Sticky tags -=========== - - The `-r release-1-0-patches' flag that was given to `checkout' in -the previous example is "sticky", that is, it will apply to subsequent -commands in this directory. If you commit any modifications, they are -committed on the branch. You can later merge the modifications into -the main trunk. *Note Merging::. - - You can use the `status' command to see what sticky tags or dates -are set: - - $ vi driver.c # Fix the bugs - $ cvs commit -m "Fixed initialization bug" driver.c - Checking in driver.c; - /usr/local/cvsroot/yoyodyne/tc/driver.c,v <-- driver.c - new revision: 1.7.2.1; previous revision: 1.7 - done - $ cvs status -v driver.c - =================================================================== - File: driver.c Status: Up-to-date - - Version: 1.7.2.1 Sat Dec 5 19:35:03 1992 - RCS Version: 1.7.2.1 /usr/local/cvsroot/yoyodyne/tc/driver.c,v - Sticky Tag: release-1-0-patches (branch: 1.7.2) - Sticky Date: (none) - Sticky Options: (none) - - Existing Tags: - release-1-0-patches (branch: 1.7.2) - release-1-0 (revision: 1.7) - - The sticky tags will remain on your working files until you delete -them with `cvs update -A'. The `-A' option retrieves the version of -the file from the head of the trunk, and forgets any sticky tags, -dates, or options. - - Sticky tags are not just for branches. For example, suppose that -you want to avoid updating your working directory, to isolate yourself -from possibly destabilizing changes other people are making. You can, -of course, just refrain from running `cvs update'. But if you want to -avoid updating only a portion of a larger tree, then sticky tags can -help. If you check out a certain revision (such as 1.4) it will become -sticky. Subsequent `cvs update' will not retrieve the latest revision -until you reset the tag with `cvs update -A'. Likewise, use of the -`-D' option to `update' or `checkout' sets a "sticky date", which, -similarly, causes that date to be used for future retrievals. - - Many times you will want to retrieve an old version of a file -without setting a sticky tag. The way to do that is with the `-p' -option to `checkout' or `update', which sends the contents of the file -to standard output. For example, suppose you have a file named `file1' -which existed as revision 1.1, and you then removed it (thus adding a -dead revision 1.2). Now suppose you want to add it again, with the same -contents it had previously. Here is how to do it: - - $ cvs update -p -r 1.1 file1 >file1 - =================================================================== - Checking out file1 - RCS: /tmp/cvs-sanity/cvsroot/first-dir/Attic/file1,v - VERS: 1.1 - *************** - $ cvs add file1 - cvs add: re-adding file file1 (in place of dead revision 1.2) - cvs add: use 'cvs commit' to add this file permanently - $ cvs commit -m test - Checking in file1; - /tmp/cvs-sanity/cvsroot/first-dir/file1,v <-- file1 - new revision: 1.3; previous revision: 1.2 - done - $ - diff --git a/gnu/usr.bin/cvs/doc/cvs.info-6 b/gnu/usr.bin/cvs/doc/cvs.info-6 index cd0a59931b4..34c06796543 100644 --- a/gnu/usr.bin/cvs/doc/cvs.info-6 +++ b/gnu/usr.bin/cvs/doc/cvs.info-6 @@ -22,21 +22,123 @@ and this permission notice may be included in translations approved by the Free Software Foundation instead of in the original English. +File: cvs.info, Node: modules, Next: Wrappers, Up: Administrative files + +The modules file +================ + + The `modules' file records your definitions of names for collections +of source code. CVS will use these definitions if you use CVS to +update the modules file (use normal commands like `add', `commit', etc). + + The `modules' file may contain blank lines and comments (lines +beginning with `#') as well as module definitions. Long lines can be +continued on the next line by specifying a backslash (`\') as the last +character on the line. + + A module definition is a single line of the `modules' file, in +either of two formats. In both cases, MNAME represents the symbolic +module name, and the remainder of the line is its definition. + +`MNAME -a ALIASES...' + This represents the simplest way of defining a module MNAME. The + `-a' flags the definition as a simple alias: CVS will treat any + use of MNAME (as a command argument) as if the list of names + ALIASES had been specified instead. ALIASES may contain either + other module names or paths. When you use paths in aliases, + `checkout' creates all intermediate directories in the working + directory, just as if the path had been specified explicitly in + the CVS arguments. + +`MNAME [ options ] DIR [ FILES... ] [ &MODULE... ]' + In the simplest case, this form of module definition reduces to + `MNAME DIR'. This defines all the files in directory DIR as + module mname. DIR is a relative path (from `$CVSROOT') to a + directory of source in the source repository. In this case, on + checkout, a single directory called MNAME is created as a working + directory; no intermediate directory levels are used by default, + even if DIR was a path involving several directory levels. + + By explicitly specifying files in the module definition after DIR, + you can select particular files from directory DIR. The sample + definition for `modules' is an example of a module defined with a + single file from a particular directory. Here is another example: + + m4test unsupported/gnu/m4 foreach.m4 forloop.m4 + + With this definition, executing `cvs checkout m4test' will create + a single working directory `m4test' containing the two files + listed, which both come from a common directory several levels deep + in the CVS source repository. + + A module definition can refer to other modules by including + `&MODULE' in its definition. `checkout' creates a subdirectory + for each such module, in the directory containing the module. For + example, if modules contains + + m4test &unsupported + + then a checkout will create an `m4test' directory which contains a + directory called `unsupported', which in turns contains all the + directories and files which live there. + + `-d NAME' + Name the working directory something other than the module + name. + + `-e PROG' + Specify a program PROG to run whenever files in a module are + exported. PROG runs with a single argument, the module name. + + `-i PROG' + Specify a program PROG to run whenever files in a module are + committed. PROG runs with a single argument, the full + pathname of the affected directory in a source repository. + The `commitinfo', `loginfo', and `verifymsg' files provide + other ways to call a program on commit. + + `-o PROG' + Specify a program PROG to run whenever files in a module are + checked out. PROG runs with a single argument, the module + name. + + `-s STATUS' + Assign a status to the module. When the module file is + printed with `cvs checkout -s' the modules are sorted + according to primarily module status, and secondarily + according to the module name. This option has no other + meaning. You can use this option for several things besides + status: for instance, list the person that is responsible for + this module. + + `-t PROG' + Specify a program PROG to run whenever files in a module are + tagged with `rtag'. PROG runs with two arguments: the module + name and the symbolic tag specified to `rtag'. There is no + way to specify a program to run when `tag' is executed. + + `-u PROG' + Specify a program PROG to run whenever `cvs update' is + executed from the top-level directory of the checked-out + module. PROG runs with a single argument, the full path to + the source repository for this module. + + File: cvs.info, Node: Wrappers, Next: commit files, Prev: modules, Up: Administrative files The cvswrappers file ==================== Wrappers allow you to set a hook which transforms files on their way -in and out of CVS. Most or all of the wrappers features do not work -with client/server CVS. +in and out of CVS. The file `cvswrappers' defines the script that will be run on a file when its name matches a regular expresion. There are two scripts that can be run on a file or directory. One script is executed on the file/directory before being checked into the repository (this is denoted with the `-t' flag) and the other when the file is checked out of the -repository (this is denoted with the `-f' flag) +repository (this is denoted with the `-f' flag). The `-t'/`-f' feature +does not work with client/server CVS. The `cvswrappers' also has a `-m' option to specify the merge methodology that should be used when the file is updated. `MERGE' @@ -84,6 +186,15 @@ The `-f' filter is called with one argument, which is the name of the file to filter from. The end result of this filter will be a file in the users directory that they can work on as they normally would. + Note that the `-t'/`-f' features do not conveniently handle one +portion of CVS's operation: determining when files are modified. CVS +will still want a file (or directory) to exist, and it will use its +modification time to determine whether a file is modified. If CVS +erroneously thinks a file is unmodified (for example, a directory is +unchanged but one of the files within it is changed), you can force it +to check in the file anyway by specifying the `-f' option to `cvs +commit' (*note commit options::.). + For another example, the following command imports a directory, treating files whose name ends in `.exe' as binary: @@ -681,8 +792,7 @@ All environment variables which affect CVS `$CVSEDITOR' Specifies the program to use for recording log messages during commit. If not set, the default is `/usr/ucb/vi'. `$CVSEDITOR' - overrides `$EDITOR'. `$CVSEDITOR' does not exist in CVS 1.3, but - the next release will probably include it. + overrides `$EDITOR'. `$PATH' If `$RCSBIN' is not set, and no path is compiled into CVS, it will diff --git a/gnu/usr.bin/cvs/doc/cvs.ps b/gnu/usr.bin/cvs/doc/cvs.ps index 6280c6f38ba..7ebbfcc112d 100644 --- a/gnu/usr.bin/cvs/doc/cvs.ps +++ b/gnu/usr.bin/cvs/doc/cvs.ps @@ -1,14 +1,14 @@ %!PS-Adobe-2.0 %%Creator: dvipsk 5.58f Copyright 1986, 1994 Radical Eye Software %%Title: cvs.dvi -%%Pages: 178 +%%Pages: 180 %%PageOrder: Ascend %%BoundingBox: 0 0 596 842 %%DocumentPaperSizes: a4 %%EndComments %DVIPSCommandLine: dvips cvs.dvi -o cvs.ps %DVIPSParameters: dpi=600, compressed, comments removed -%DVIPSSource: TeX output 1997.01.16:0008 +%DVIPSSource: TeX output 1997.03.16:1620 %%BeginProcSet: texc.pro /TeXDict 250 dict def TeXDict begin /N{def}def /B{bind def}N /S{exch}N /X{S N}B /TR{translate}N /isls false N /vsize 11 72 mul N /hsize 8.5 72 @@ -557,7 +557,7 @@ A26E5AA26E5A352C7DAB3C>I<B5D8FE1FB539801FFFF0A500039027C0007FF0C7EAFE00 ED800F011F91B55C16F9DAFF01ECC01F6D02F092C7FC03816E5A6D0183153EEEE07F03C7 ECF07E6DDAC03F137C03E7ECF8FC6D01EF5DEE801F03FF14FD6DDA000F5B18FF6E486D5B A36E486D5BA26E486D5BA2020F93C8FC4B7FA26E48147E6E48143C4C2C7DAB53>I -E /Fk 53 122 df<922607FFE0EB1FFC92B5D8FC01B5FC0207DAFF0F1480021F039F14C0 +E /Fk 54 122 df<922607FFE0EB1FFC92B5D8FC01B5FC0207DAFF0F1480021F039F14C0 913D7FFE007FFFF83FE0902601FFF0011F9038E07FF049018049903880FFF84990C7485B D90FFC4A5A495A60495AF27FF0017F4CEB3FE04A027FEC1FC0053FEC0F80051F91C7FCAC BB12E0A526007FF0C7D81FFCC8FCB3B3A3007FB5D8F01FB512FEA54D4D7ECC48>11 @@ -726,125 +726,129 @@ FFF0A2001F17E0A26C6C4A13C0A26C6C4A13806C6D4913006C5E6C01E0EB1FFC6D6C495A C007FFB5017F13E002C1B512FC02C714FF9126CFF80F7F9126DFC0037F000301FFC77F6C 496E7E02F8814A6E7E717E4A81831980A28319C0A37113E0AC19C05FA319805F19005F60 6E143F6E5D4D5A6E4A5A02FF495BDBC0075B9126EFF01F5B02E7B548C7FC02E114F8DAE0 -7F13E0DB0FFEC8FC92CAFCAFB612C0A53B477CB144>I<9039FF803FE0B5EBFFF8028113 -FE02837FDA87E11380EC8F830003D99F0713C06C139E14BCA214F8A24A6C13806F13006F -5A4A90C7FCA45CB3A8B612E0A52A327CB132>114 D<903907FF8070017FEBF1F048B6FC -1207380FFC01391FE0003F4848130F491307127F90C71203A2481401A27FA27F01F090C7 -FC13FCEBFFC06C13FEECFFE06C14FC6C806CECFF806C15C06C15E06C15F06C7E011F14F8 -010114FCEB000FEC007FED1FFE0078140F00F8140715037E1501A27E16FC7E15036D14F8 -6D13076D14F001F8EB1FE001FFEBFFC04890B51280486C1400D8F81F13FCD8E00313C027 -347CB230>I<14F8A51301A41303A21307A2130FA2131F133F137F13FF1203000F90B512 -F0B7FCA426007FF8C7FCB3A7167CAA013F14F880A290391FFE01F0010F1303903907FF87 -E06DEBFFC06D14806D6C1300EC0FFC26467EC430>I<D97FE0EC3FF0B5EC7FFFA5000315 -016C81B3AC5EA25EA25E7E6EEB0F7F017F021E7F6E017CEBFFE090393FFE01F86DB512F0 -010714E0010114C09027003FFE00EBC0003B337BB144>I<B600C090387FFFF0A5C601F0 -C73803F8006E5D017F5E801707013F5E6E140F011F5E6E141F6D93C7FC6F5B6D153E8117 -7E6D157C6F13FC6D5DEDF0016D5DEDF803027F5CA2EDFC07023F5CEDFE0F021F5CEDFF1F -6E91C8FC169F16BF6E13BE16FE6E5BA26E5BA26E5BA36F5AA26F5AA26F5AA23C327EB041 ->I<B60081B500FC90387FFFF0A500019026E0000390C73801FC006E6F5C6C6F5E6E6F13 -03017F61A26E6F1307013F4A5E846E49150F011F616E6F131F6D4A93C7FC179F03806E5B -6D021F153EEF0FFE6DD9C03F5DEE3E0703E06E13FC6D027E5DEE7C0303F015816D4A6C5C -03F815C3DA7FF95E4C7E03FD15E7DA3FFF5E4C137F19FF6E496D5BA26E94C8FC4C7FA26E -5E93C7120FA26E486E5AA202015E4B1403A26E486E5A54327EB059>I<B6D88007B512C0 -A526007FF8C7387F80006D6C92C7FC6E14FE6D6C495A6D6D485A6D01C05B6D4A5A6F485A -6DEBF01F6D6D485A6E6C48C8FC023F137E6F5A6E6C5A806E5B6E5BA26E7F6E7F6F7E15FF -4A7F4A7F4A8003E77FEC0FC3DA1F837FDA3F817F4AC67F02FE6D7E4948133F4A8049486D -7E01076E7F49486D7F49487F494881017F6E7FB500F8011FEBFFF0A53C317EB041>I<00 -7FB500C090387FFFE0A5C601F0C73803F8006E5D017F5E6E1407013F5E80170F011F5E6E -141F6D93C7FC6F5B6D153E6F137E6D157C6F13FCA26D6D5B16016D5DEDF803027F5CEDFC -07023F5CEDFE0F021F5C15FF161F6E91C8FC16BF6E13BE16FE6E5BA26E5BA36E5BA26F5A -A26F5AA26F5AA393C9FC5D153E157E157CD81F8013FC486C5B387FE001D8FFF05B14035D -14074A5A49485A007F133F4948CAFC383F81FE381FFFF86C5B6C13C0C648CBFC3B477EB0 -41>I E /Fl 1 59 df<120FEA3FC0EA7FE0EAFFF0A6EA7FE0EA3FC0EA0F000C0C768B21> -58 D E /Fm 73 125 df<922601FFFC903801FFE0033F9026FF801F13F84AB6D8E07F13 -FE020F03F9B6FC023FD9C00FB500C0138091277FFC0003D9FE0113C0902601FFE049495A -494949494813E04990C714F049484A13E0495A19C0495A7413C0017F17804A6E6E138071 -9138007E007192C7FCAEBCFCA526007FF8C7000301C0C8FCB3B3A7007FB5D8F803B612F0 -A553547DD34E>11 D<EEFFFC031FEBFF804AB612E0020781021F9038C00FF8913A7FFE00 -03FCDAFFF0EB00FE4949EB03FF4901805B4990C7487F49485CA2495A4D7F013F6F5B5CA3 -7190C7FC715AEF01F894C9FCA90403B512C0BAFCA526003FFCC7120783B3B3A6003FB5D8 -FC03B612C0A542547DD34B>I<EEFFFE031F9038FFCFC04AB7FC1407021FEBC00791387F -FC00DAFFF05B4901C05B495B4990C7FC495AA2495A83133F4A8083AFBAFCA526003FFCC7 -1203B3B3A7003FB5D8FC03B612C0A542547DD34B>I<15F8A691380FFF8091B512F80107 -14FF011F15C049819026FFF8F813F84801C0EB0FFC2603FE00EB03FE4848EC00FF49153F -4848ED1F804848ED0FC0A24848ED07E0A24848157FEFFFF05EA200FF5DA37FA27F7013E0 -6D6E13C06DED7F806DED1E006CB492C7FC14C014F86C13FF81EDFFC06C15F86C15FE826C -16C06C826C826C826D816D81130F01038101001680141F020115C08003F814E0163F160F -82040113F0D81FE080487E486C157FA2486C153FA2171FA44916E05B6C5A1380007EC7EC -3FC0A26C1780177F6C6CEDFF007F6C6C4A5AD807F84A5A6C6CEC0FF82601FF80EB3FF06C -9039F8F9FFE06DB65A011F92C7FC010714FC010114F0D9001F90C8FCEC00F8A6346179D9 -43>36 D<EA07F0EA1FF8EA3FFE487EA2B5128014C0A314E0A37EA27EEA1FFDEA07F1EA00 -01A2130314C0A313071480130FA214005B133EA25B5B485A1203485A485A485A90C7FC12 -0C132876D225>39 D<EA07F0EA1FF8487E487E7FB5FC1480A314C0A37EA27E7EEA07F3EA -0003A213071480A3130F1400A25B131E133E133C137C5BA2485A485A485A485A48C7FC12 -1E120C1228769025>44 D<B712F0AB240B7F9F2D>I<EA07F0487E487E487E487EB51280 -A76C13006C5A6C5A6C5A6C5A1111769025>I<EF01E01703EF07F0A2170FA2EF1FE0A218 -C0173FA2EF7F80A218005FA24C5AA25F1603A24C5AA25F160FA24C5AA25F163FA24C5AA2 -94C7FC5EA24B5AA25E1503A24B5AA25E150FA24B5AA25E153FA24B5AA293C8FC5DA24A5A -A25D1403A25D1407A24A5AA25D141FA24A5AA25D147FA24AC9FCA25C1301A2495AA25C13 -07A2495AA25C131FA2495AA25C137FA249CAFCA25B1201A2485AA25B1207A2485AA25B12 -1FA2485AA25B127FA248CBFCA25AA2127CA2347879D943>I<913803FFC0023F13FC91B6 -FC010315C0010F018113F0903A1FFC003FF849486D7E49486D7E49486D7E48496D138048 -496D13C0A24817E04890C813F0A34817F8A24817FC49157FA3007F17FEA600FF17FFB3A5 -007F17FEA6003F17FCA26D15FFA26C17F8A36C17F0A26C6D4913E0A26C6D4913C06C1780 -6E5B6C6D4913006D6C495AD91FFCEB3FF8903A0FFF81FFF06D90B55A01011580D9003F01 -FCC7FC020313C0384F7BCD43>I<157815FC14031407141F14FF130F0007B5FCB6FCA214 -7F13F0EAF800C7FCB3B3B3A6007FB712FEA52F4E76CD43>I<EC3FFE0103B512E0010F14 -FC013F14FF90B712C048D9C07F7F2703FE000F13F8D807F801037FD80FE06D7F48486D7F -48488001F01680486C6E13C07F486C6E13E07FA27013F0A56C5AA26C5AEA0FF0EA03C0C9 -14E05EA218C05E1880A24C13005F4C5A4B5B5F4B5B5F4B5B4B90C7FC4B5A5E4B5AED7FE0 -4B5A4A5B4A48C8FC4A5A5D4A48EB01F04A5AEC3F804AC7FC02FEEC03E0495A495A495A49 -5AD91F80140749C8FC013E150F017FB7FC90B812C05A5A5A5A5A5A5AB9FC1880A4344E79 -CD43>I<91380FFFC091B512FC0107ECFF80011F15E090263FF8077F9026FF800113FC48 -48C76C7ED803F86E7E491680D807FC8048B416C080486D15E0A4805CA36C17C06C5B6C90 -C75AD801FC1680C9FC4C13005FA24C5A4B5B4B5B4B13C04B5BDBFFFEC7FC91B512F816E0 -16FCEEFF80DA000713E0030113F89238007FFE707E7013807013C018E07013F0A218F8A2 -7013FCA218FEA2EA03E0EA0FF8487E487E487EB57EA318FCA25E18F891C7FC6C17F0495C -6C4816E001F04A13C06C484A1380D80FF84A13006CB44A5A6CD9F0075BC690B612F06D5D -011F1580010302FCC7FCD9001F1380374F7ACD43>I<177C17FEA2160116031607160FA2 -161F163F167FA216FF5D5DA25D5DED1FBFED3F3F153E157C15FCEC01F815F0EC03E01407 -EC0FC01580EC1F005C147E147C5C1301495A495A5C495A131F49C7FC133E5B13FC485A5B -485A1207485A485A90C8FC123E127E5ABA12C0A5C96C48C7FCAF020FB712C0A53A4F7CCE -43>I<D80380150ED807E0157E01FEEC03FED9FFF0137F91B65A5F5F5F5F5F94C7FC5E5E -16F016C093C8FC15F801E190C9FC01E0CAFCABEC0FFF027F13F001E3B512FE01E76E7E90 -26FFF8077FDAC0017F49C713F8496E7E49143F4981496E7E6C481680C9FC18C08218E0A4 -18F0A3EA0FE0487E487E487E487EA418E0A35B6C484A13C05B491680003EC85A003F1700 -6C6C4A5A6D5D6C6C4A5AD807F8495BD803FE01075B2701FFC03F5B6C90B65A013F4AC7FC -6D14F8010314C09026007FF8C8FC344F79CD43>I<ED0FFF92B512E0020780021F14FC91 -397FFE03FE903A01FFF0007F4901C0EB3F804990C7121F4948EC7FC0494814FF49484913 -E049485B01FF5C485BA2485B5AA2486F13C04A6D1380486F1300177E94C7FC5AA291CAFC -5AA21508913801FFF8020713FFB54814C04A14F04AC66C7E023C6D7E4A6D7E4A6D7E7013 -804A15C0A24A15E07013F05C18F8A491C714FCA37EA67EA46C17F880A27E18F06C5D18E0 -6C6D15C07E6E4913806C6D15006D6C495A6D6CEB7FFC6DB448485A6D90B55A010315C001 -0092C7FC023F13FC020713C0364F7ACD43>I<121F7F7FEBFF8091B81280A45A19006060 -60A2606060485F0180C86CC7FC007EC95A4C5A007C4B5A5F4C5A160F4C5A484B5A4C5A94 -C8FC16FEC812014B5A5E4B5A150F4B5AA24B5AA24B5A15FFA24A90C9FCA25C5D1407A214 -0FA25D141FA2143FA4147F5DA314FFA55BAC6D5BA2EC3FC06E5A395279D043>I<913807 -FFC0027F13FC0103B67E010F15E090261FFC0113F8903A3FE0003FFCD97F80EB0FFE49C7 -6C7E48488048486E1380000717C04980120F18E0177FA2121F7FA27F7F6E14FF02E015C0 -14F802FE4913806C7FDBC00313009238F007FE6C02F85B9238FE1FF86C9138FFBFF06CED -FFE017806C4BC7FC6D806D81010F15E06D81010115FC010781011F81491680EBFFE74801 -8115C048D9007F14E04848011F14F048487F48481303030014F8484880161F4848020713 -FC1601824848157F173FA2171FA2170FA218F8A27F007F17F06D151FA26C6CED3FE0001F -17C06D157F6C6CEDFF806C6C6C010313006C01E0EB0FFE6C01FCEBFFFC6C6CB612F06D5D -010F1580010102FCC7FCD9000F13C0364F7ACD43>I<91380FFF8091B512F8010314FE01 -0F6E7E4901037F90267FF8007F4948EB3FF048496D7E484980486F7E484980824817805A -91C714C05A7013E0A218F0B5FCA318F8A618FCA46C5DA37EA25E6C7F6C5DA26C5D6C7F6C -6D137B6C6D13F390387FF803011FB512E36D14C30103028313F89039007FFE03EC004015 -00A218F05EA3D801F816E0487E486C16C0487E486D491380A218005E5F4C5A91C7FC6C48 -4A5A494A5A49495B6C48495BD803FC010F5B9027FF807FFEC7FC6C90B55A6C6C14F06D14 -C0010F49C8FC010013F0364F7ACD43>I<EA07F0487E487E487E487EB51280A76C13006C -5A6C5A6C5A6C5AC8FCB3EA07F0487E487E487E487EB51280A76C13006C5A6C5A6C5A6C5A -113576B425>I<007FBD1280A2BE12C0A36C1C806C1C00D1FCB3A3003FBDFC481C80BE12 -C0A36C1C80A25A2379AE69>61 D<91B5FC010F14F8017F14FF90B712C00003D9C00F7F27 -07FC00017FD80FE06D7F48486E7E48C87FD87FE06E7E7F7F486C1680A66C5A18006C485C -6C5AC9485A5F4B5B4B5B4B5B4B5B4B90C7FC16FC4B5A4B5A16C04B5A93C8FC4A5A5D1403 -5D5D14075DA25D140FA25DAB91CAFCAAEC1FC04A7EECFFF8497FA2497FA76D5BA26D5BEC -3FE06E5A315479D340>63 D<171F4D7E4D7EA24D7EA34C7FA24C7FA34C7FA34C7FA24C7F -A34C8083047F80167E8304FE804C7E03018116F8830303814C7E03078116E083030F814C -7E031F81168083033F8293C77E4B82157E8403FE824B800201835D840203834B80020783 -5D844AB87EA24A83A3DA3F80C88092C97E4A84A2027E8202FE844A82010185A24A820103 -854A82010785A24A82010F855C011F717FEBFFFCB600F8020FB712E0A55B547BD366>65 +7F13E0DB0FFEC8FC92CAFCAFB612C0A53B477CB144>I<DA0FFE14F091B5EAC0010103EC +F003010F14F8013F903801FC0790397FFC007ED9FFF0EB1F0F4849EB0F9F4849EB07DF48 +4914FF488191C7FC48815B003F815B127F177FA25B12FFAC6C7EA3123F6D15FFA2001F5D +7F6C5D6C6D5B6C7F6C151F6C6D5BD97FF813FE90393FFE03FC6DB55A010714E001001480 +91381FFC0091C8FCAF047FEBFFE0A53B477CB141>I<9039FF803FE0B5EBFFF8028113FE +02837FDA87E11380EC8F830003D99F0713C06C139E14BCA214F8A24A6C13806F13006F5A +4A90C7FCA45CB3A8B612E0A52A327CB132>I<903907FF8070017FEBF1F048B6FC120738 +0FFC01391FE0003F4848130F491307127F90C71203A2481401A27FA27F01F090C7FC13FC +EBFFC06C13FEECFFE06C14FC6C806CECFF806C15C06C15E06C15F06C7E011F14F8010114 +FCEB000FEC007FED1FFE0078140F00F8140715037E1501A27E16FC7E15036D14F86D1307 +6D14F001F8EB1FE001FFEBFFC04890B51280486C1400D8F81F13FCD8E00313C027347CB2 +30>I<14F8A51301A41303A21307A2130FA2131F133F137F13FF1203000F90B512F0B7FC +A426007FF8C7FCB3A7167CAA013F14F880A290391FFE01F0010F1303903907FF87E06DEB +FFC06D14806D6C1300EC0FFC26467EC430>I<D97FE0EC3FF0B5EC7FFFA5000315016C81 +B3AC5EA25EA25E7E6EEB0F7F017F021E7F6E017CEBFFE090393FFE01F86DB512F0010714 +E0010114C09027003FFE00EBC0003B337BB144>I<B600C090387FFFF0A5C601F0C73803 +F8006E5D017F5E801707013F5E6E140F011F5E6E141F6D93C7FC6F5B6D153E81177E6D15 +7C6F13FC6D5DEDF0016D5DEDF803027F5CA2EDFC07023F5CEDFE0F021F5CEDFF1F6E91C8 +FC169F16BF6E13BE16FE6E5BA26E5BA26E5BA36F5AA26F5AA26F5AA23C327EB041>I<B6 +0081B500FC90387FFFF0A500019026E0000390C73801FC006E6F5C6C6F5E6E6F1303017F +61A26E6F1307013F4A5E846E49150F011F616E6F131F6D4A93C7FC179F03806E5B6D021F +153EEF0FFE6DD9C03F5DEE3E0703E06E13FC6D027E5DEE7C0303F015816D4A6C5C03F815 +C3DA7FF95E4C7E03FD15E7DA3FFF5E4C137F19FF6E496D5BA26E94C8FC4C7FA26E5E93C7 +120FA26E486E5AA202015E4B1403A26E486E5A54327EB059>I<B6D88007B512C0A52600 +7FF8C7387F80006D6C92C7FC6E14FE6D6C495A6D6D485A6D01C05B6D4A5A6F485A6DEBF0 +1F6D6D485A6E6C48C8FC023F137E6F5A6E6C5A806E5B6E5BA26E7F6E7F6F7E15FF4A7F4A +7F4A8003E77FEC0FC3DA1F837FDA3F817F4AC67F02FE6D7E4948133F4A8049486D7E0107 +6E7F49486D7F49487F494881017F6E7FB500F8011FEBFFF0A53C317EB041>I<007FB500 +C090387FFFE0A5C601F0C73803F8006E5D017F5E6E1407013F5E80170F011F5E6E141F6D +93C7FC6F5B6D153E6F137E6D157C6F13FCA26D6D5B16016D5DEDF803027F5CEDFC07023F +5CEDFE0F021F5C15FF161F6E91C8FC16BF6E13BE16FE6E5BA26E5BA36E5BA26F5AA26F5A +A26F5AA393C9FC5D153E157E157CD81F8013FC486C5B387FE001D8FFF05B14035D14074A +5A49485A007F133F4948CAFC383F81FE381FFFF86C5B6C13C0C648CBFC3B477EB041>I +E /Fl 1 59 df<120FEA3FC0EA7FE0EAFFF0A6EA7FE0EA3FC0EA0F000C0C768B21>58 +D E /Fm 73 125 df<922601FFFC903801FFE0033F9026FF801F13F84AB6D8E07F13FE02 +0F03F9B6FC023FD9C00FB500C0138091277FFC0003D9FE0113C0902601FFE049495A4949 +49494813E04990C714F049484A13E0495A19C0495A7413C0017F17804A6E6E1380719138 +007E007192C7FCAEBCFCA526007FF8C7000301C0C8FCB3B3A7007FB5D8F803B612F0A553 +547DD34E>11 D<EEFFFC031FEBFF804AB612E0020781021F9038C00FF8913A7FFE0003FC +DAFFF0EB00FE4949EB03FF4901805B4990C7487F49485CA2495A4D7F013F6F5B5CA37190 +C7FC715AEF01F894C9FCA90403B512C0BAFCA526003FFCC7120783B3B3A6003FB5D8FC03 +B612C0A542547DD34B>I<EEFFFE031F9038FFCFC04AB7FC1407021FEBC00791387FFC00 +DAFFF05B4901C05B495B4990C7FC495AA2495A83133F4A8083AFBAFCA526003FFCC71203 +B3B3A7003FB5D8FC03B612C0A542547DD34B>I<15F8A691380FFF8091B512F8010714FF +011F15C049819026FFF8F813F84801C0EB0FFC2603FE00EB03FE4848EC00FF49153F4848 +ED1F804848ED0FC0A24848ED07E0A24848157FEFFFF05EA200FF5DA37FA27F7013E06D6E +13C06DED7F806DED1E006CB492C7FC14C014F86C13FF81EDFFC06C15F86C15FE826C16C0 +6C826C826C826D816D81130F01038101001680141F020115C08003F814E0163F160F8204 +0113F0D81FE080487E486C157FA2486C153FA2171FA44916E05B6C5A1380007EC7EC3FC0 +A26C1780177F6C6CEDFF007F6C6C4A5AD807F84A5A6C6CEC0FF82601FF80EB3FF06C9039 +F8F9FFE06DB65A011F92C7FC010714FC010114F0D9001F90C8FCEC00F8A6346179D943> +36 D<EA07F0EA1FF8EA3FFE487EA2B5128014C0A314E0A37EA27EEA1FFDEA07F1EA0001 +A2130314C0A313071480130FA214005B133EA25B5B485A1203485A485A485A90C7FC120C +132876D225>39 D<EA07F0EA1FF8487E487E7FB5FC1480A314C0A37EA27E7EEA07F3EA00 +03A213071480A3130F1400A25B131E133E133C137C5BA2485A485A485A485A48C7FC121E +120C1228769025>44 D<B712F0AB240B7F9F2D>I<EA07F0487E487E487E487EB51280A7 +6C13006C5A6C5A6C5A6C5A1111769025>I<EF01E01703EF07F0A2170FA2EF1FE0A218C0 +173FA2EF7F80A218005FA24C5AA25F1603A24C5AA25F160FA24C5AA25F163FA24C5AA294 +C7FC5EA24B5AA25E1503A24B5AA25E150FA24B5AA25E153FA24B5AA293C8FC5DA24A5AA2 +5D1403A25D1407A24A5AA25D141FA24A5AA25D147FA24AC9FCA25C1301A2495AA25C1307 +A2495AA25C131FA2495AA25C137FA249CAFCA25B1201A2485AA25B1207A2485AA25B121F +A2485AA25B127FA248CBFCA25AA2127CA2347879D943>I<913803FFC0023F13FC91B6FC +010315C0010F018113F0903A1FFC003FF849486D7E49486D7E49486D7E48496D13804849 +6D13C0A24817E04890C813F0A34817F8A24817FC49157FA3007F17FEA600FF17FFB3A500 +7F17FEA6003F17FCA26D15FFA26C17F8A36C17F0A26C6D4913E0A26C6D4913C06C17806E +5B6C6D4913006D6C495AD91FFCEB3FF8903A0FFF81FFF06D90B55A01011580D9003F01FC +C7FC020313C0384F7BCD43>I<157815FC14031407141F14FF130F0007B5FCB6FCA2147F +13F0EAF800C7FCB3B3B3A6007FB712FEA52F4E76CD43>I<EC3FFE0103B512E0010F14FC +013F14FF90B712C048D9C07F7F2703FE000F13F8D807F801037FD80FE06D7F48486D7F48 +488001F01680486C6E13C07F486C6E13E07FA27013F0A56C5AA26C5AEA0FF0EA03C0C914 +E05EA218C05E1880A24C13005F4C5A4B5B5F4B5B5F4B5B4B90C7FC4B5A5E4B5AED7FE04B +5A4A5B4A48C8FC4A5A5D4A48EB01F04A5AEC3F804AC7FC02FEEC03E0495A495A495A495A +D91F80140749C8FC013E150F017FB7FC90B812C05A5A5A5A5A5A5AB9FC1880A4344E79CD +43>I<91380FFFC091B512FC0107ECFF80011F15E090263FF8077F9026FF800113FC4848 +C76C7ED803F86E7E491680D807FC8048B416C080486D15E0A4805CA36C17C06C5B6C90C7 +5AD801FC1680C9FC4C13005FA24C5A4B5B4B5B4B13C04B5BDBFFFEC7FC91B512F816E016 +FCEEFF80DA000713E0030113F89238007FFE707E7013807013C018E07013F0A218F8A270 +13FCA218FEA2EA03E0EA0FF8487E487E487EB57EA318FCA25E18F891C7FC6C17F0495C6C +4816E001F04A13C06C484A1380D80FF84A13006CB44A5A6CD9F0075BC690B612F06D5D01 +1F1580010302FCC7FCD9001F1380374F7ACD43>I<177C17FEA2160116031607160FA216 +1F163F167FA216FF5D5DA25D5DED1FBFED3F3F153E157C15FCEC01F815F0EC03E01407EC +0FC01580EC1F005C147E147C5C1301495A495A5C495A131F49C7FC133E5B13FC485A5B48 +5A1207485A485A90C8FC123E127E5ABA12C0A5C96C48C7FCAF020FB712C0A53A4F7CCE43 +>I<D80380150ED807E0157E01FEEC03FED9FFF0137F91B65A5F5F5F5F5F94C7FC5E5E16 +F016C093C8FC15F801E190C9FC01E0CAFCABEC0FFF027F13F001E3B512FE01E76E7E9026 +FFF8077FDAC0017F49C713F8496E7E49143F4981496E7E6C481680C9FC18C08218E0A418 +F0A3EA0FE0487E487E487E487EA418E0A35B6C484A13C05B491680003EC85A003F17006C +6C4A5A6D5D6C6C4A5AD807F8495BD803FE01075B2701FFC03F5B6C90B65A013F4AC7FC6D +14F8010314C09026007FF8C8FC344F79CD43>I<ED0FFF92B512E0020780021F14FC9139 +7FFE03FE903A01FFF0007F4901C0EB3F804990C7121F4948EC7FC0494814FF49484913E0 +49485B01FF5C485BA2485B5AA2486F13C04A6D1380486F1300177E94C7FC5AA291CAFC5A +A21508913801FFF8020713FFB54814C04A14F04AC66C7E023C6D7E4A6D7E4A6D7E701380 +4A15C0A24A15E07013F05C18F8A491C714FCA37EA67EA46C17F880A27E18F06C5D18E06C +6D15C07E6E4913806C6D15006D6C495A6D6CEB7FFC6DB448485A6D90B55A010315C00100 +92C7FC023F13FC020713C0364F7ACD43>I<121F7F7FEBFF8091B81280A45A1900606060 +A2606060485F0180C86CC7FC007EC95A4C5A007C4B5A5F4C5A160F4C5A484B5A4C5A94C8 +FC16FEC812014B5A5E4B5A150F4B5AA24B5AA24B5A15FFA24A90C9FCA25C5D1407A2140F +A25D141FA2143FA4147F5DA314FFA55BAC6D5BA2EC3FC06E5A395279D043>I<913807FF +C0027F13FC0103B67E010F15E090261FFC0113F8903A3FE0003FFCD97F80EB0FFE49C76C +7E48488048486E1380000717C04980120F18E0177FA2121F7FA27F7F6E14FF02E015C014 +F802FE4913806C7FDBC00313009238F007FE6C02F85B9238FE1FF86C9138FFBFF06CEDFF +E017806C4BC7FC6D806D81010F15E06D81010115FC010781011F81491680EBFFE7480181 +15C048D9007F14E04848011F14F048487F48481303030014F8484880161F4848020713FC +1601824848157F173FA2171FA2170FA218F8A27F007F17F06D151FA26C6CED3FE0001F17 +C06D157F6C6CEDFF806C6C6C010313006C01E0EB0FFE6C01FCEBFFFC6C6CB612F06D5D01 +0F1580010102FCC7FCD9000F13C0364F7ACD43>I<91380FFF8091B512F8010314FE010F +6E7E4901037F90267FF8007F4948EB3FF048496D7E484980486F7E484980824817805A91 +C714C05A7013E0A218F0B5FCA318F8A618FCA46C5DA37EA25E6C7F6C5DA26C5D6C7F6C6D +137B6C6D13F390387FF803011FB512E36D14C30103028313F89039007FFE03EC00401500 +A218F05EA3D801F816E0487E486C16C0487E486D491380A218005E5F4C5A91C7FC6C484A +5A494A5A49495B6C48495BD803FC010F5B9027FF807FFEC7FC6C90B55A6C6C14F06D14C0 +010F49C8FC010013F0364F7ACD43>I<EA07F0487E487E487E487EB51280A76C13006C5A +6C5A6C5A6C5AC8FCB3EA07F0487E487E487E487EB51280A76C13006C5A6C5A6C5A6C5A11 +3576B425>I<007FBD1280A2BE12C0A36C1C806C1C00D1FCB3A3003FBDFC481C80BE12C0 +A36C1C80A25A2379AE69>61 D<91B5FC010F14F8017F14FF90B712C00003D9C00F7F2707 +FC00017FD80FE06D7F48486E7E48C87FD87FE06E7E7F7F486C1680A66C5A18006C485C6C +5AC9485A5F4B5B4B5B4B5B4B5B4B90C7FC16FC4B5A4B5A16C04B5A93C8FC4A5A5D14035D +5D14075DA25D140FA25DAB91CAFCAAEC1FC04A7EECFFF8497FA2497FA76D5BA26D5BEC3F +E06E5A315479D340>63 D<171F4D7E4D7EA24D7EA34C7FA24C7FA34C7FA34C7FA24C7FA3 +4C8083047F80167E8304FE804C7E03018116F8830303814C7E03078116E083030F814C7E +031F81168083033F8293C77E4B82157E8403FE824B800201835D840203834B800207835D +844AB87EA24A83A3DA3F80C88092C97E4A84A2027E8202FE844A82010185A24A82010385 +4A82010785A24A82010F855C011F717FEBFFFCB600F8020FB712E0A55B547BD366>65 D<BA12C019FEF1FFC01AF01AFCD8000701F0C7000313FFDE007F7F737F070F7F737F8785 87858785A287A84F5BA263616361634F5B4F5B077F90C7FC4E485A060713F892B812E097 C8FC861AF003F0C7000313FE9539003FFF80070F13E0737F07017F87737F747E1C807413 @@ -1769,172 +1773,166 @@ F0A248CD12F8A2001E1A78003E1A7CA2003C1A3C007C1A3EA200781A1EA300F81A1FA248 E0EC07FCDA0FFCEC3FF0913B03FFC003FFC0020090B6C8FC033F14FC030714E09226007F FEC9FC50557BC05B>13 D<EB0FFCEB3FFF90B512C0000314F04880488048804880A24815 80A3B712C0AA6C1580A36C1500A26C5C6C5C6C5C6C5CC614C0013F90C7FCEB0FFC22227B -A72D>15 D E /Fr 25 121 df<121EEA7F80A2EAFFC0A4EA7F80A2EA1E000A0A77891D> +A72D>15 D E /Fr 24 121 df<121EEA7F80A2EAFFC0A4EA7F80A2EA1E000A0A77891D> 46 D<DB1FF8EB01804AB5EA8003020FECE007913A3FF803F80F9139FF80007C4948C7EA 1E1FD907FCEC0FBFD90FF0EC07FF49488049488049488049C9127F4848163F120349161F 12074848160FA2485A1807123F5B1803127FA34993C7FC12FFAC127F7FF00380A2123FA2 7F001F170719006C7EA26C6C5E0003170E6D161E0001171C6C6C163C6D6C5D6D6C5D6D6C 4A5A6D6C4A5AD907FC4A5AD901FE021FC7FC902600FFC0137E91393FF803F8020FB512E0 -020114809126001FFCC8FC39427ABF47>67 D<DB1FF8EB01804AB5EA8003020FECE00791 -3A3FF803F80F9139FF80007C4948C7EA1E1FD907FCEC0FBFD90FF0EC07FF494880494880 -49488049C9127F4848163F120349161F12074848160FA2485A1807123F5B1803127FA349 -93C7FC12FFAB0407B512FE127F7FDC000113C09438007F80123FA27F121FA26C7EA26C7E -12037F6C7E7E6D6C15FF6D7E6D6C5C6D7ED907FCEC03DFD901FFEC0F8F6D01C0EB3F0791 -3A3FF801FC03020FB5EAF001020102C0C7FC9126001FFCC8FC3F427ABF4D>71 -D<B712E016FE707E00019039C0007FF06C6C48EB0FF8EE03FE707E707F717E717EA28417 -1F84A760173F60604D5A4DC8FC4C5A4C5AEE0FF0EE7FC091B500FEC9FC16F891388000FE -EE3F80EE0FE0707E707E83160183160083A384A484A4725AF10380A2177F18F0053FEB07 -002601FFE015F8B600C0011F5B94380FFC0E943803FE1CCBEAFFF8F01FE041407BBD49> -82 D<D903FE130690391FFFC00E017FEBF81E3901FE01FC3A03F0003F3E4848EB0FFE48 -4813074848130390C71201003E1400007E157EA2007C153E12FCA2161EA36C150EA27E7F -007F92C7FC7F13F0EA3FFCEBFFC06C13FC6CEBFFC06C14FC6C14FF6C15C06C6C80011F80 -010380D9003F7F02037F9138003FFF15070301138081167F17C0163F00E0151FA3160FA2 -7EA36C1680161F7E17006C5D6C153E6D5C6D14FCD8FDF0495AD8F8FC495A3AF07FC01FC0 -011FB55AD8E00349C7FC39C0003FF02A427ABF38>I<B64AB512C0A3000301E09139003F -FC00C60180ED0FF0725A017F5F616D7E96C7FC6E5D011F160EA26D6C5DA26E153C010716 -38A26E1578010316706E15F001015EA26E14016D5E81027F4A5AA26F1307023F92C8FC81 -021F140EA26F131E020F141C8102075CA26F137802031470A26E6C5BA2EDFF016E5CA292 -387F8380A216C7033F90C9FCA216EFED1FEE16FE6F5AA36F5AA26F5AA36F5AA242407DBD -4A>86 D<EC01E0A24A7EA34A7EA34A7EA24A7E141CA2EC3CFFEC387FA24A6C7EA34A6C7E -A2010180ECC00FA249486C7EA349486C7EA24980010E1301010FB5FC4980A2011CC7FC49 -147FA20178810170143FA201F08149141F1201486C811207486CEC3FF8D8FFFE49B512C0 -A332317DB038>97 D<DA0FF81330DA7FFF13700103B5EAC0F090390FFC03F190391FE000 -F9D97F80133F01FEC7121F4848140F48481407485A000F1503491401121F491400123F5B -127F1770A248C9FC1700AA6C6C1570A3123F6D15F0121F6D15E0000F15016D15C0000715 -036C6C15806C6C14076C6CEC0F00D97F80133ED91FE05B90390FFC03F00103B55AD9007F -1380DA0FF8C7FC2C317BAF36>99 D<B612FEEDFFE016F83A03FE0007FC6C48EB00FFEE3F -80707E707E707E707E160183160083A2177FA41880AA1800A317FEA34C5A5F16034C5A5F -EE1FC04C5A04FFC7FC486CEB07FEB712F816E093C8FC312F7DAE39>I<B81280A3D803FE -C7FC6C48EC1FC0160F16071603A21601A317E0ED0E00A31700A2151E153E157E90B512FE -A39038FC007E153E151E150EA21738A392C71270A417F0A2EE01E0A216031607161F486C -14FFB812C0A32D2F7DAE33>I<B8FCA33903FE00016C489038003F80161F160F1607A216 -03A317C01601150EA293C7FCA3151E153E157E90B512FEA39038FC007E153E151E150EA5 -92C8FCAA487EB512FCA32A2F7DAE31>I<DA0FF81360DAFFFE13E00103EBFF8190390FF8 -07E390393FC000F34948137F01FEC7123F4848141F4848140F48481407120F491403485A -003F1501A25B007F1500A348C9FC1700A8031FB5FCA26C7E9238001FF0EE0FE0123F7FA2 -6C7E120F7F12076C7E6C7E6C6C141FD97F80133FD93FE0137B90390FFC03F10103B512E0 -0100EC8060DA0FFCC7FC30317BAF3A>I<B5D8F807B512C0A3D803FEC7381FF0006C486E -5AB190B7FCA301FCC7120FB3486C4A7EB5D8F807B512C0A3322F7DAE38>I<B512F8A338 -03FE006C5AB3B3A3487EB512F8A3152F7DAE1B>I<B500F890381FFFC0A3D803FEC7380F -FE006C4815F017C04C5A041EC7FC5E16F84B5A4B5A4B5A4B5A4BC8FC153C5D5DEC03E04A -7E4A7E141F4A7EEC7DFEECF0FFEBFDE09039FFC07F804A6C7E4A6C7E5B496D7E6F7E6F7E -A26F7E6F7EA2707E707E707EA2707E83486CEC1FFEB500F890387FFFE0A3332F7DAE3A> -107 D<D8FFFE923807FFF0A3D803FF92380FFC006C5FD9DF80141DA3D9CFC01439A2D9C7 -E01471A3D9C3F014E1A2D9C1F8EB01C1A3D9C0FCEB0381A2027EEB0701A36E130EA29138 -1F801CA391380FC038A2913807E070A3913803F0E0A3913801F9C0A2913800FF80A3486C -EB7F00487E486C013E497EB5008091B512F0A2151C3C2F7CAE44>109 -D<D8FFFC91387FFFC07F7F0001923807FC006E6D5A6E6D5AD9DFE06D5AA2EBCFF0EBC7F8 -EBC3FCA2EBC1FEEBC0FF6E7EA26E7E6E7EA26E7E6E7E6E7EA26E7E6E7EED7F80A2ED3FC0 -ED1FE0ED0FF0A2ED07F8ED03FCA2ED01FEED00FF167FA2163F161F160F487E486C140748 -6C1403B56C1301A21600322F7DAE38>I<B612FEEDFFC016F03A03FE0007FC6C48EB01FE -ED007FEE3F80A2EE1FC0A217E0A617C0A2EE3F80A2EE7F00ED01FCED07F890B612E01680 -01FCC9FCB2487EB512F8A32B2F7DAE33>112 D<EC1FF891B5FC903907F00FE090390FC0 -03F0013FC712FC017E147E49804848EC1F804848EC0FC0000716E04848EC07F0A24848EC -03F8A24848EC01FCA2007F16FEA290C9FCA24816FFAA6C16FE6D1401A2003F16FCA26D14 -03001F16F8000F16F09039E003C0070007D90FF013E03B03F01C3C0FC03B01F8380C1F80 -3B00FC300E3F00017EEB077E013F5C90390FF803F0903907FC0FE00100B5EAC003EC1FFB -91380001E01707EEF00FEEF81FEEFFFE81A2EE7FFCA2EE3FF8EE1FF0EE07C0303D7BAF3A ->I<B612F015FF16C03A03FE001FF06C48EB03FCED00FE167FA283163F83A55F167F94C7 -FC16FE4B5A4B5AED1FE090B6C8FC5D9039FC003F80ED0FC06F7E826F7EA26F7EA582A418 -E082A281486CED01C0B500F8EB7F8193381FC38093380FFF00C9EA01FC33307DAE37>I< -90383FC00C9038FFF81C0003EBFE3C390FE03FFC381F8007EB0003003E1301481300157C -5A153CA36C141CA27E6C14006C7E13E013FE383FFFE06C13FE6CEBFF806C14E0000114F0 -6C6C13F8010F13FC1300EC07FE14011400157F153F12E0151FA37EA2151E6C143E6C143C -6C147C6C14F89038C001F039FBF807E000F1B512C0D8E07F130038C007FC20317BAF2A> -I<007FB712F8A39039801FF0073A7E000FE00000781678A20070163800F0163CA348161C -A5C71500B3A8EC3FF8011FB512F0A32E2E7CAD36>I<B500F890387FFFC0A3D803FEC738 -07FC006C486E5A705A705AB3AB000015016D5D1603017E5D017F14076D6C49C7FC131F6D -6C133ED907F05B903903FC03F00100B55A023F1380DA07FCC8FC32307DAE38>I<B500E0 -903807FFF0A3000790C7000113806C48913800FE000001167C0000167817706D15F06D5D -A26D6C495AA26E1303011F5DA26D6C49C7FCA26E5B0107140EA26D6C5BA26E133C010114 -388001005CA26E13F06E5B1581023F5BA215C3021F5B15E7020F90C8FCA2EC07FEA36E5A -A26E5AA36E5AA234307EAE38>I<3B7FFFF001FFFEA30003D9C00013E0C649EB7F80017F -027EC7FC167C6D6C13786D6C5B6D6C5B15016D6C485AD903FC5B15076D6C48C8FC903800 -FF1EEC7F9C15BCEC3FF86E5AA2140F6E7E14034A7E4A7EEC1EFF141C91383C7F804A6C7E -14709138F01FE049486C7E49486C7E148001076D7E49486C7E130E011E6D7E496E7E017C -6E7E13FC000382D80FFEEC7FF8B549B512C0A3322F7DAE38>120 -D E /Fs 85 125 df<4AB4EB0FE0021F9038E03FFC913A7F00F8FC1ED901FC90383FF03F -D907F090397FE07F80494801FF13FF4948485BD93F805C137F0200ED7F00EF003E01FE6D -91C7FC82ADB97EA3C648C76CC8FCB3AE486C4A7E007FD9FC3FEBFF80A339407FBF35>11 -D<4AB4FC021F13C091387F01F0903901FC0078D907F0131C4948133E494813FF49485A13 -7F1400A213FE6F5A163893C7FCAA167FB8FCA33900FE00018182B3AC486CECFF80007FD9 -FC3F13FEA32F407FBF33>I<4AB47E021F13F791387F00FFEB01F8903807F001EB0FE0EB -1FC0EB3F80137F14008101FE80AEB8FCA3C648C77EB3AE486CECFF80007FD9FC3F13FEA3 -2F407FBF33>I<4AB4ECFF80021FD9C00F13E0913B7F01F03F80F8903C01F80078FE003C -D907F0D93FF8130E49484948131F49484948EB7F804948484913FF137F02005CA201FE92 -C7FC6FED7F0070141C96C7FCAAF13F80BBFCA3C648C76CC7FC197F193FB3AC486C4A6CEB -7FC0007FD9FC3FD9FE1FB5FCA348407FBF4C>I<121EEA7F80EAFFC0A9EA7F80ACEA3F00 -AC121EAB120CC7FCA8121EEA7F80A2EAFFC0A4EA7F80A2EA1E000A4179C019>33 -D<001E130F397F803FC000FF137F01C013E0A201E013F0A3007F133F391E600F30000013 -00A401E01370491360A3000114E04913C00003130101001380481303000EEB070048130E -0018130C0038131C003013181C1C7DBE2D>I<14E0A4EB07FC90383FFF8090B512E03901 -F8E3F03903E0E0FCD807C0133CD80F807FD81F007F003E80003C1580007C140316C00078 -141F00F8143F157FA47EED3F806CEC0E0092C7FC127F138013C0EA3FF013FEEA1FFF6C13 -FC6C13FF6C14C06C806C6C13F8011F7F130301007FECE7FF14E102E01380157F153FED1F -C0A2003E140F127FD8FF801307A5130000FC158000F0140F1270007815005D6C141E153E -6C5C6C5C3907C0E1F03903F8EFE0C6B51280D93FFEC7FCEB0FF8EB00E0A422497BC32D> -36 D<121EEA7F8012FF13C0A213E0A3127FEA1E601200A413E013C0A312011380120313 -005A120E5A1218123812300B1C79BE19>39 D<1430147014E0EB01C0EB03801307EB0F00 -131E133E133C5B13F85B12015B1203A2485AA2120F5BA2121F90C7FCA25AA3123E127EA6 -127C12FCB2127C127EA6123E123FA37EA27F120FA27F1207A26C7EA212017F12007F1378 -7F133E131E7FEB07801303EB01C0EB00E014701430145A77C323>I<12C07E12707E7E12 -1E7E6C7E7F12036C7E7F12007F1378137CA27FA2133F7FA21480130FA214C0A3130714E0 -A6130314F0B214E01307A614C0130FA31480A2131F1400A25B133EA25BA2137813F85B12 -015B485A12075B48C7FC121E121C5A5A5A5A145A7BC323>I<121EEA7F8012FF13C0A213 -E0A3127FEA1E601200A413E013C0A312011380120313005A120E5A1218123812300B1C79 -8919>44 D<B512FEA617067F961E>I<121EEA7F80A2EAFFC0A4EA7F80A2EA1E000A0A79 -8919>I<ED0180ED03C01507A21680150FA216005DA2151E153EA2153C157CA2157815F8 -A25D1401A25D1403A25D1407A25D140FA24AC7FCA2141E143EA2143C147CA2147814F8A2 -5C1301A25C1303A25C1307A25C130FA291C8FC5BA2131E133EA25BA2137813F8A25B1201 -A25B1203A25B1207A25B120FA290C9FC5AA2121E123EA2123C127CA2127812F8A25A1260 -225B7BC32D>I<EB01FE90380FFFC090383F03F090387C00F849137C48487F48487F4848 -EB0F80A2000F15C04848EB07E0A3003F15F0A290C712034815F8A64815FCB3A26C15F8A5 -6C6CEB07F0A3001F15E0A36C6CEB0FC0A26C6CEB1F80000315006C6C133E6C6C5B017C5B -90383F03F090380FFFC0D901FEC7FC263F7DBC2D>I<EB01C013031307131F137FEA07FF -B5FC139FEAF81F1200B3B3ACEB7FF0B612F8A31D3D78BC2D>I<EB07FC90383FFF8090B5 -12E03903F01FF83907C007FC390F0001FE001E6D7E001C1580003CEC7FC05AED3FE01270 -B4FC6DEB1FF07FA56C5A6CC7FC120CC813E0153FA216C0157F168015FF16004A5A5D4A5A -4A5A5D4A5A4A5A4AC7FC147E147C5C495A495A495A495A49C71270133E133C5B4914E048 -5A485A485A48C7120148B6FCA25A4815C0B7FCA3243D7CBC2D>I<EB07FC90383FFF8090 -38F80FE03901E003F839078001FCD80F007F000E6D7E001E1580D81F80137F486C14C07F -A27F5BA2121F6C5AC8138015FF1600A24A5AA24A5A5DEC07E04A5A023FC7FCEB1FFCECFF -809038000FE0EC07F86E7E6E7E6E7E1680ED7FC0A216E0153FA216F0A2120C123F487E48 -7EA316E0A249137F6CC713C01278EDFF807E6C4913006C495A3907C007FC3903F80FF0C6 -B55A013F1380D907F8C7FC243F7CBC2D>I<150E151E153EA2157EA215FE1401A21403EC -077E1406140E141CA214381470A214E0EB01C0A2EB0380EB0700A2130E5BA25B5BA25B5B -1201485A90C7FC5A120E120C121C5AA25A5AB8FCA3C8EAFE00AC4A7E49B6FCA3283E7EBD -2D>I<00061403D80780131F01F813FE90B5FC5D5D5D15C092C7FC14FCEB3FE090C9FCAC -EB01FE90380FFF8090383E03E090387001F8496C7E49137E497F90C713800006141FC813 -C0A216E0150FA316F0A3120C127F7F12FFA416E090C7121F12FC007015C012780038EC3F -80123C6CEC7F00001F14FE6C6C485A6C6C485A3903F80FE0C6B55A013F90C7FCEB07F824 -3F7CBC2D>I<EC1FE0ECFFF8903803F03E90380FC00F90391F000780133E017EEB1FC049 -133F4848137F12035B12074848EB3F80ED1F00001F91C7FC5BA2123FA3485AA214FE9038 -87FF8039FF8F07E090389C01F09038B800FC01B0137E13F0497F16804914C0A2ED1FE0A3 -4914F0A5127FA6123F6D14E0A2121FED3FC0A26C6C1480A20007EC7F006C6C137E6C6C5B -6C6C485A90387E07F06DB45A010F1380D903FCC7FC243F7CBC2D>I<1238123C123F90B6 -12FCA316F85A16F016E00078C712010070EC03C0ED078016005D48141E151C153C5DC812 -7015F04A5A5D14034A5A92C7FC5C141EA25CA2147C147814F8A213015C1303A31307A313 -0F5CA2131FA6133FAA6D5A0107C8FC26407BBD2D>I<EB03FC90381FFF8090387C07E090 -38F001F83901E0007C48487F48487F48C7FCED0F80121E16C0003E1407A4123FA26DEB0F -807F6C6C131F6D140001FC133E6C6C5B9038FF80786C6D5A6CEBF3E06CEBFF806C91C7FC -133F6D13C06D7F013F13F801787F48486C7E3903E01FFF48486C1380260F800313C04848 -7E489038007FE0003E143F007E141F007CEC0FF01507481403A31501A46C15E0007C1403 -A2007E15C06C14076CEC0F806DEB1F006C6C133ED807F05B3901FC03F86CB512E0011F13 -80D903FCC7FC243F7CBC2D>I<EB03FCEB1FFF90387E07C09038FC03F048486C7E48486C -7E4848137C000F147E4848137F81003F15805B007F15C0A2151F12FF16E0A516F0A5127F -153FA36C7EA2001F147F120F6C6C13FF6D13DF000313013900F8039F90387E0F1FD91FFE -13E0EB07F090C7FCA2ED3FC0A41680157FD80F801400487E486C13FEA24A5A5D49485AEB -8007391E000FE0001F495A260FC07FC7FC3803FFFE6C13F838003FC0243F7CBC2D>I<12 -1EEA7F80A2EAFFC0A4EA7F80A2EA1E00C7FCB3121EEA7F80A2EAFFC0A4EA7F80A2EA1E00 -0A2779A619>I<121EEA7F80A2EAFFC0A4EA7F80A2EA1E00C7FCB3121E127FEAFF80A213 -C0A4127F121E1200A412011380A3120313005A1206120E120C121C5A1230A20A3979A619 ->I<EB1FF890B5FC3903E01FC0390F0007F0001EEB03F848EB01FC4814FE140000FE14FF -7E7FA46CC7FC123EC7EA01FEA2EC03FCEC07F815F0EC0FC0EC1F80EC3F00143E5C147814 -F85C13015CA2495AA25CAB91C7FC90C8FCA8EB0780EB1FE0A2497EA46D5AA2EB07802040 -7BBF2B>63 D<15074B7EA34B7EA34B7EA34B7EA34B7E15E7A2913801C7FC15C3A2913803 -81FEA34AC67EA3020E6D7EA34A6D7EA34A6D7EA34A6D7EA34A6D7EA349486D7E91B6FCA2 -49819138800001A249C87EA24982010E157FA2011E82011C153FA2013C820138151FA201 -7882170F13FC00034C7ED80FFF4B7EB500F0010FB512F8A33D417DC044>65 +020114809126001FFCC8FC39427ABF47>67 D<B712E016FE707E00019039C0007FF06C6C +48EB0FF8EE03FE707E707F717E717EA284171F84A760173F60604D5A4DC8FC4C5A4C5AEE +0FF0EE7FC091B500FEC9FC16F891388000FEEE3F80EE0FE0707E707E83160183160083A3 +84A484A4725AF10380A2177F18F0053FEB07002601FFE015F8B600C0011F5B94380FFC0E +943803FE1CCBEAFFF8F01FE041407BBD49>82 D<D903FE130690391FFFC00E017FEBF81E +3901FE01FC3A03F0003F3E4848EB0FFE484813074848130390C71201003E1400007E157E +A2007C153E12FCA2161EA36C150EA27E7F007F92C7FC7F13F0EA3FFCEBFFC06C13FC6CEB +FFC06C14FC6C14FF6C15C06C6C80011F80010380D9003F7F02037F9138003FFF15070301 +138081167F17C0163F00E0151FA3160FA27EA36C1680161F7E17006C5D6C153E6D5C6D14 +FCD8FDF0495AD8F8FC495A3AF07FC01FC0011FB55AD8E00349C7FC39C0003FF02A427ABF +38>I<B64AB512C0A3000301E09139003FFC00C60180ED0FF0725A017F5F616D7E96C7FC +6E5D011F160EA26D6C5DA26E153C01071638A26E1578010316706E15F001015EA26E1401 +6D5E81027F4A5AA26F1307023F92C8FC81021F140EA26F131E020F141C8102075CA26F13 +7802031470A26E6C5BA2EDFF016E5CA292387F8380A216C7033F90C9FCA216EFED1FEE16 +FE6F5AA36F5AA26F5AA36F5AA242407DBD4A>86 D<EC01E0A24A7EA34A7EA34A7EA24A7E +141CA2EC3CFFEC387FA24A6C7EA34A6C7EA2010180ECC00FA249486C7EA349486C7EA249 +80010E1301010FB5FC4980A2011CC7FC49147FA20178810170143FA201F08149141F1201 +486C811207486CEC3FF8D8FFFE49B512C0A332317DB038>97 D<DA0FF81330DA7FFF1370 +0103B5EAC0F090390FFC03F190391FE000F9D97F80133F01FEC7121F4848140F48481407 +485A000F1503491401121F491400123F5B127F1770A248C9FC1700AA6C6C1570A3123F6D +15F0121F6D15E0000F15016D15C0000715036C6C15806C6C14076C6CEC0F00D97F80133E +D91FE05B90390FFC03F00103B55AD9007F1380DA0FF8C7FC2C317BAF36>99 +D<B612FEEDFFE016F83A03FE0007FC6C48EB00FFEE3F80707E707E707E707E1601831600 +83A2177FA41880AA1800A317FEA34C5A5F16034C5A5FEE1FC04C5A04FFC7FC486CEB07FE +B712F816E093C8FC312F7DAE39>I<B81280A3D803FEC7FC6C48EC1FC0160F16071603A2 +1601A317E0ED0E00A31700A2151E153E157E90B512FEA39038FC007E153E151E150EA217 +38A392C71270A417F0A2EE01E0A216031607161F486C14FFB812C0A32D2F7DAE33>I<B8 +FCA33903FE00016C489038003F80161F160F1607A21603A317C01601150EA293C7FCA315 +1E153E157E90B512FEA39038FC007E153E151E150EA592C8FCAA487EB512FCA32A2F7DAE +31>I<DA0FF81360DAFFFE13E00103EBFF8190390FF807E390393FC000F34948137F01FE +C7123F4848141F4848140F48481407120F491403485A003F1501A25B007F1500A348C9FC +1700A8031FB5FCA26C7E9238001FF0EE0FE0123F7FA26C7E120F7F12076C7E6C7E6C6C14 +1FD97F80133FD93FE0137B90390FFC03F10103B512E00100EC8060DA0FFCC7FC30317BAF +3A>I<B5D8F807B512C0A3D803FEC7381FF0006C486E5AB190B7FCA301FCC7120FB3486C +4A7EB5D8F807B512C0A3322F7DAE38>I<B512F8A33803FE006C5AB3B3A3487EB512F8A3 +152F7DAE1B>I<B500F890381FFFC0A3D803FEC7380FFE006C4815F017C04C5A041EC7FC +5E16F84B5A4B5A4B5A4B5A4BC8FC153C5D5DEC03E04A7E4A7E141F4A7EEC7DFEECF0FFEB +FDE09039FFC07F804A6C7E4A6C7E5B496D7E6F7E6F7EA26F7E6F7EA2707E707E707EA270 +7E83486CEC1FFEB500F890387FFFE0A3332F7DAE3A>107 D<D8FFFE923807FFF0A3D803 +FF92380FFC006C5FD9DF80141DA3D9CFC01439A2D9C7E01471A3D9C3F014E1A2D9C1F8EB +01C1A3D9C0FCEB0381A2027EEB0701A36E130EA291381F801CA391380FC038A2913807E0 +70A3913803F0E0A3913801F9C0A2913800FF80A3486CEB7F00487E486C013E497EB50080 +91B512F0A2151C3C2F7CAE44>109 D<D8FFFC91387FFFC07F7F0001923807FC006E6D5A +6E6D5AD9DFE06D5AA2EBCFF0EBC7F8EBC3FCA2EBC1FEEBC0FF6E7EA26E7E6E7EA26E7E6E +7E6E7EA26E7E6E7EED7F80A2ED3FC0ED1FE0ED0FF0A2ED07F8ED03FCA2ED01FEED00FF16 +7FA2163F161F160F487E486C1407486C1403B56C1301A21600322F7DAE38>I<B612FEED +FFC016F03A03FE0007FC6C48EB01FEED007FEE3F80A2EE1FC0A217E0A617C0A2EE3F80A2 +EE7F00ED01FCED07F890B612E0168001FCC9FCB2487EB512F8A32B2F7DAE33>112 +D<EC1FF891B5FC903907F00FE090390FC003F0013FC712FC017E147E49804848EC1F8048 +48EC0FC0000716E04848EC07F0A24848EC03F8A24848EC01FCA2007F16FEA290C9FCA248 +16FFAA6C16FE6D1401A2003F16FCA26D1403001F16F8000F16F09039E003C0070007D90F +F013E03B03F01C3C0FC03B01F8380C1F803B00FC300E3F00017EEB077E013F5C90390FF8 +03F0903907FC0FE00100B5EAC003EC1FFB91380001E01707EEF00FEEF81FEEFFFE81A2EE +7FFCA2EE3FF8EE1FF0EE07C0303D7BAF3A>I<B612F015FF16C03A03FE001FF06C48EB03 +FCED00FE167FA283163F83A55F167F94C7FC16FE4B5A4B5AED1FE090B6C8FC5D9039FC00 +3F80ED0FC06F7E826F7EA26F7EA582A418E082A281486CED01C0B500F8EB7F8193381FC3 +8093380FFF00C9EA01FC33307DAE37>I<90383FC00C9038FFF81C0003EBFE3C390FE03F +FC381F8007EB0003003E1301481300157C5A153CA36C141CA27E6C14006C7E13E013FE38 +3FFFE06C13FE6CEBFF806C14E0000114F06C6C13F8010F13FC1300EC07FE14011400157F +153F12E0151FA37EA2151E6C143E6C143C6C147C6C14F89038C001F039FBF807E000F1B5 +12C0D8E07F130038C007FC20317BAF2A>I<007FB712F8A39039801FF0073A7E000FE000 +00781678A20070163800F0163CA348161CA5C71500B3A8EC3FF8011FB512F0A32E2E7CAD +36>I<B500F890387FFFC0A3D803FEC73807FC006C486E5A705A705AB3AB000015016D5D +1603017E5D017F14076D6C49C7FC131F6D6C133ED907F05B903903FC03F00100B55A023F +1380DA07FCC8FC32307DAE38>I<B500E0903807FFF0A3000790C7000113806C48913800 +FE000001167C0000167817706D15F06D5DA26D6C495AA26E1303011F5DA26D6C49C7FCA2 +6E5B0107140EA26D6C5BA26E133C010114388001005CA26E13F06E5B1581023F5BA215C3 +021F5B15E7020F90C8FCA2EC07FEA36E5AA26E5AA36E5AA234307EAE38>I<3B7FFFF001 +FFFEA30003D9C00013E0C649EB7F80017F027EC7FC167C6D6C13786D6C5B6D6C5B15016D +6C485AD903FC5B15076D6C48C8FC903800FF1EEC7F9C15BCEC3FF86E5AA2140F6E7E1403 +4A7E4A7EEC1EFF141C91383C7F804A6C7E14709138F01FE049486C7E49486C7E14800107 +6D7E49486C7E130E011E6D7E496E7E017C6E7E13FC000382D80FFEEC7FF8B549B512C0A3 +322F7DAE38>120 D E /Fs 85 125 df<4AB4EB0FE0021F9038E03FFC913A7F00F8FC1E +D901FC90383FF03FD907F090397FE07F80494801FF13FF4948485BD93F805C137F0200ED +7F00EF003E01FE6D91C7FC82ADB97EA3C648C76CC8FCB3AE486C4A7E007FD9FC3FEBFF80 +A339407FBF35>11 D<4AB4FC021F13C091387F01F0903901FC0078D907F0131C4948133E +494813FF49485A137F1400A213FE6F5A163893C7FCAA167FB8FCA33900FE00018182B3AC +486CECFF80007FD9FC3F13FEA32F407FBF33>I<4AB47E021F13F791387F00FFEB01F890 +3807F001EB0FE0EB1FC0EB3F80137F14008101FE80AEB8FCA3C648C77EB3AE486CECFF80 +007FD9FC3F13FEA32F407FBF33>I<4AB4ECFF80021FD9C00F13E0913B7F01F03F80F890 +3C01F80078FE003CD907F0D93FF8130E49484948131F49484948EB7F804948484913FF13 +7F02005CA201FE92C7FC6FED7F0070141C96C7FCAAF13F80BBFCA3C648C76CC7FC197F19 +3FB3AC486C4A6CEB7FC0007FD9FC3FD9FE1FB5FCA348407FBF4C>I<121EEA7F80EAFFC0 +A9EA7F80ACEA3F00AC121EAB120CC7FCA8121EEA7F80A2EAFFC0A4EA7F80A2EA1E000A41 +79C019>33 D<001E130F397F803FC000FF137F01C013E0A201E013F0A3007F133F391E60 +0F3000001300A401E01370491360A3000114E04913C00003130101001380481303000EEB +070048130E0018130C0038131C003013181C1C7DBE2D>I<14E0A4EB07FC90383FFF8090 +B512E03901F8E3F03903E0E0FCD807C0133CD80F807FD81F007F003E80003C1580007C14 +0316C00078141F00F8143F157FA47EED3F806CEC0E0092C7FC127F138013C0EA3FF013FE +EA1FFF6C13FC6C13FF6C14C06C806C6C13F8011F7F130301007FECE7FF14E102E0138015 +7F153FED1FC0A2003E140F127FD8FF801307A5130000FC158000F0140F1270007815005D +6C141E153E6C5C6C5C3907C0E1F03903F8EFE0C6B51280D93FFEC7FCEB0FF8EB00E0A422 +497BC32D>36 D<121EEA7F8012FF13C0A213E0A3127FEA1E601200A413E013C0A3120113 +80120313005A120E5A1218123812300B1C79BE19>39 D<1430147014E0EB01C0EB038013 +07EB0F00131E133E133C5B13F85B12015B1203A2485AA2120F5BA2121F90C7FCA25AA312 +3E127EA6127C12FCB2127C127EA6123E123FA37EA27F120FA27F1207A26C7EA212017F12 +007F13787F133E131E7FEB07801303EB01C0EB00E014701430145A77C323>I<12C07E12 +707E7E121E7E6C7E7F12036C7E7F12007F1378137CA27FA2133F7FA21480130FA214C0A3 +130714E0A6130314F0B214E01307A614C0130FA31480A2131F1400A25B133EA25BA21378 +13F85B12015B485A12075B48C7FC121E121C5A5A5A5A145A7BC323>I<121EEA7F8012FF +13C0A213E0A3127FEA1E601200A413E013C0A312011380120313005A120E5A1218123812 +300B1C798919>44 D<B512FEA617067F961E>I<121EEA7F80A2EAFFC0A4EA7F80A2EA1E +000A0A798919>I<ED0180ED03C01507A21680150FA216005DA2151E153EA2153C157CA2 +157815F8A25D1401A25D1403A25D1407A25D140FA24AC7FCA2141E143EA2143C147CA214 +7814F8A25C1301A25C1303A25C1307A25C130FA291C8FC5BA2131E133EA25BA2137813F8 +A25B1201A25B1203A25B1207A25B120FA290C9FC5AA2121E123EA2123C127CA2127812F8 +A25A1260225B7BC32D>I<EB01FE90380FFFC090383F03F090387C00F849137C48487F48 +487F4848EB0F80A2000F15C04848EB07E0A3003F15F0A290C712034815F8A64815FCB3A2 +6C15F8A56C6CEB07F0A3001F15E0A36C6CEB0FC0A26C6CEB1F80000315006C6C133E6C6C +5B017C5B90383F03F090380FFFC0D901FEC7FC263F7DBC2D>I<EB01C013031307131F13 +7FEA07FFB5FC139FEAF81F1200B3B3ACEB7FF0B612F8A31D3D78BC2D>I<EB07FC90383F +FF8090B512E03903F01FF83907C007FC390F0001FE001E6D7E001C1580003CEC7FC05AED +3FE01270B4FC6DEB1FF07FA56C5A6CC7FC120CC813E0153FA216C0157F168015FF16004A +5A5D4A5A4A5A5D4A5A4A5A4AC7FC147E147C5C495A495A495A495A49C71270133E133C5B +4914E0485A485A485A48C7120148B6FCA25A4815C0B7FCA3243D7CBC2D>I<EB07FC9038 +3FFF809038F80FE03901E003F839078001FCD80F007F000E6D7E001E1580D81F80137F48 +6C14C07FA27F5BA2121F6C5AC8138015FF1600A24A5AA24A5A5DEC07E04A5A023FC7FCEB +1FFCECFF809038000FE0EC07F86E7E6E7E6E7E1680ED7FC0A216E0153FA216F0A2120C12 +3F487E487EA316E0A249137F6CC713C01278EDFF807E6C4913006C495A3907C007FC3903 +F80FF0C6B55A013F1380D907F8C7FC243F7CBC2D>I<150E151E153EA2157EA215FE1401 +A21403EC077E1406140E141CA214381470A214E0EB01C0A2EB0380EB0700A2130E5BA25B +5BA25B5B1201485A90C7FC5A120E120C121C5AA25A5AB8FCA3C8EAFE00AC4A7E49B6FCA3 +283E7EBD2D>I<00061403D80780131F01F813FE90B5FC5D5D5D15C092C7FC14FCEB3FE0 +90C9FCACEB01FE90380FFF8090383E03E090387001F8496C7E49137E497F90C713800006 +141FC813C0A216E0150FA316F0A3120C127F7F12FFA416E090C7121F12FC007015C01278 +0038EC3F80123C6CEC7F00001F14FE6C6C485A6C6C485A3903F80FE0C6B55A013F90C7FC +EB07F8243F7CBC2D>I<EC1FE0ECFFF8903803F03E90380FC00F90391F000780133E017E +EB1FC049133F4848137F12035B12074848EB3F80ED1F00001F91C7FC5BA2123FA3485AA2 +14FE903887FF8039FF8F07E090389C01F09038B800FC01B0137E13F0497F16804914C0A2 +ED1FE0A34914F0A5127FA6123F6D14E0A2121FED3FC0A26C6C1480A20007EC7F006C6C13 +7E6C6C5B6C6C485A90387E07F06DB45A010F1380D903FCC7FC243F7CBC2D>I<1238123C +123F90B612FCA316F85A16F016E00078C712010070EC03C0ED078016005D48141E151C15 +3C5DC8127015F04A5A5D14034A5A92C7FC5C141EA25CA2147C147814F8A213015C1303A3 +1307A3130F5CA2131FA6133FAA6D5A0107C8FC26407BBD2D>I<EB03FC90381FFF809038 +7C07E09038F001F83901E0007C48487F48487F48C7FCED0F80121E16C0003E1407A4123F +A26DEB0F807F6C6C131F6D140001FC133E6C6C5B9038FF80786C6D5A6CEBF3E06CEBFF80 +6C91C7FC133F6D13C06D7F013F13F801787F48486C7E3903E01FFF48486C1380260F8003 +13C048487E489038007FE0003E143F007E141F007CEC0FF01507481403A31501A46C15E0 +007C1403A2007E15C06C14076CEC0F806DEB1F006C6C133ED807F05B3901FC03F86CB512 +E0011F1380D903FCC7FC243F7CBC2D>I<EB03FCEB1FFF90387E07C09038FC03F048486C +7E48486C7E4848137C000F147E4848137F81003F15805B007F15C0A2151F12FF16E0A516 +F0A5127F153FA36C7EA2001F147F120F6C6C13FF6D13DF000313013900F8039F90387E0F +1FD91FFE13E0EB07F090C7FCA2ED3FC0A41680157FD80F801400487E486C13FEA24A5A5D +49485AEB8007391E000FE0001F495A260FC07FC7FC3803FFFE6C13F838003FC0243F7CBC +2D>I<121EEA7F80A2EAFFC0A4EA7F80A2EA1E00C7FCB3121EEA7F80A2EAFFC0A4EA7F80 +A2EA1E000A2779A619>I<121EEA7F80A2EAFFC0A4EA7F80A2EA1E00C7FCB3121E127FEA +FF80A213C0A4127F121E1200A412011380A3120313005A1206120E120C121C5A1230A20A +3979A619>I<EB1FF890B5FC3903E01FC0390F0007F0001EEB03F848EB01FC4814FE1400 +00FE14FF7E7FA46CC7FC123EC7EA01FEA2EC03FCEC07F815F0EC0FC0EC1F80EC3F00143E +5C147814F85C13015CA2495AA25CAB91C7FC90C8FCA8EB0780EB1FE0A2497EA46D5AA2EB +078020407BBF2B>63 D<15074B7EA34B7EA34B7EA34B7EA34B7E15E7A2913801C7FC15C3 +A291380381FEA34AC67EA3020E6D7EA34A6D7EA34A6D7EA34A6D7EA34A6D7EA349486D7E +91B6FCA249819138800001A249C87EA24982010E157FA2011E82011C153FA2013C820138 +151FA2017882170F13FC00034C7ED80FFF4B7EB500F0010FB512F8A33D417DC044>65 D<B712FCEEFF8017F00001903980000FF86C6CC7EA03FE707E701380EF7FC0EF3FE0A2EF 1FF0A218F8A3170F171FA318F0A2EF3FE0177F18C0EFFF804C1300EE03FCEE0FF8EE7FE0 91B6C7FC17E091C7EA07FCEE01FE933800FF80EF7FC0EF3FE0EF1FF018F8170F18FC1707 @@ -2242,7 +2240,7 @@ end %%Page: 1 1 1 0 bop 1056 1884 a Ft(V)-16 b(ersion)65 b(Managemen)-5 b(t)1762 2172 y(with)1753 2421 y(CVS)1696 2795 y Fs(for)30 -b Fr(cvs)g Fs(1.9.2)1551 3293 y(P)m(er)h(Cederqvist)e(et)i(al)p +b Fr(cvs)g Fs(1.9.4)1551 3293 y(P)m(er)h(Cederqvist)e(et)i(al)p eop %%Page: 2 2 2 1 bop 0 3629 a Fs(Cop)m(yrigh)m(t)452 3626 y(c)427 @@ -2306,7 +2304,7 @@ b(is)h(y)m(et)h(another)g(in)e(the)0 3509 y(gro)m(wing)k(list)f(of)h (companies)g(that)g(supp)s(ort)f(free)h(soft)m(w)m(are.)53 b(Y)-8 b(ou)35 b(are)g(free)f(to)h(cop)m(y)g(b)s(oth)e(this)g(man)m (ual)h(and)0 3633 y(the)39 b Fr(cvs)e Fs(program.)65 -b(See)39 b(App)s(endix)c(F)k([Cop)m(ying],)h(page)g(155,)i(for)c(the)h +b(See)39 b(App)s(endix)c(F)k([Cop)m(ying],)h(page)g(157,)i(for)c(the)h (details.)63 b(Sign)m(um)37 b(Supp)s(ort)g(o\013ers)0 3758 y(supp)s(ort)31 b(con)m(tracts)k(and)d(binary)f(distribution)e (for)k(man)m(y)g(programs,)g(suc)m(h)g(as)g Fr(cvs)p @@ -2341,13 +2339,13 @@ Fs(can)h(handle)e(binary)g(\014les,)i(but)f(y)m(ou)h(m)m(ust)f(ha)m(v)m Fn(-a)p Fs(')g(\015ag)g(\(release)h(1.15)g(and)f(later)g(are)g(OK\).)g (Y)-8 b(ou)32 b(m)m(ust)g(also)480 1689 y(con\014gure)e(b)s(oth)g Fr(r)n(cs)f Fs(and)h Fr(cvs)f Fs(to)i(handle)e(binary)g(\014les)g(when) -h(y)m(ou)g(install)f(them.)480 1839 y(Kew)m(ord)43 b(substitution)f -(can)i(b)s(e)f(a)h(source)g(of)g(trouble)e(with)h(binary)e(\014les.)80 -b(See)44 b(Chapter)f(17)480 1964 y([Keyw)m(ord)30 b(substitution],)f -(page)i(75,)g(for)g(solutions.)0 2140 y(The)f Fn(admin)f +h(y)m(ou)g(install)f(them.)480 1839 y(Keyw)m(ord)40 b(substitution)e +(can)j(b)s(e)f(a)h(source)f(of)h(trouble)f(with)f(binary)f(\014les.)70 +b(See)41 b(Chapter)f(17)480 1964 y([Keyw)m(ord)30 b(substitution],)f +(page)i(77,)g(for)g(solutions.)0 2140 y(The)f Fn(admin)f Fs(command)480 2265 y(Careless)j(use)g(of)g(the)h Fn(admin)e Fs(command)h(can)h(cause)g Fr(cvs)e Fs(to)i(cease)h(w)m(orking.)46 -b(See)33 b(Section)f(A.5)480 2389 y([admin],)e(page)h(93,)g(b)s(efore)f +b(See)33 b(Section)f(A.5)480 2389 y([admin],)e(page)h(95,)g(b)s(efore)f (trying)g(to)h(use)f(it.)0 2845 y Fm(Credits)125 3120 y Fs(Roland)e(P)m(esc)m(h,)i(then)f(of)g(Cygn)m(us)f(Supp)s(ort)f Fn(<roland@wrs.com>)e Fs(wrote)k(the)h(man)m(ual)e(pages)i(whic)m(h)d @@ -2365,13 +2363,13 @@ Fn(<dgg@think.com>)p Fs(.)125 4043 y(Some)i(text)h(has)f(b)s(een)g Fs(.)125 4318 y(The)35 b Fr(cvs)g(f)-8 b(a)n(q)35 b Fs(b)m(y)h(Da)m (vid)g(G.)h(Grubbs)d(has)i(pro)m(vided)f(useful)f(material.)57 b(The)36 b Fr(f)-8 b(a)n(q)35 b Fs(is)g(no)h(longer)g(main-)0 -4443 y(tained,)f(ho)m(w)m(ev)m(er,)j(and)33 b(this)h(man)m(ual)g(ab)s -(out)g(the)h(closest)g(thing)f(there)g(is)g(to)h(a)g(successor)g -(\(with)f(resp)s(ect)g(to)0 4567 y(do)s(cumen)m(ting)29 -b(ho)m(w)i(to)g(use)f Fr(cvs)p Fs(,)g(at)h(least\).)125 -4842 y(In)53 b(addition,)59 b(the)c(follo)m(wing)e(p)s(ersons)g(ha)m(v) -m(e)i(help)s(ed)e(b)m(y)h(telling)f(me)h(ab)s(out)h(mistak)m(es)f(I'v)m -(e)i(made:)0 4966 y(Ro)m(xanne)e(Brunskill)d Fn(<rbrunski@datap.ca>)p +4443 y(tained,)29 b(ho)m(w)m(ev)m(er,)i(and)d(this)g(man)m(ual)h(is)f +(ab)s(out)g(the)i(closest)f(thing)f(there)h(is)g(to)g(a)h(successor)f +(\(with)f(resp)s(ect)h(to)0 4567 y(do)s(cumen)m(ting)g(ho)m(w)i(to)g +(use)f Fr(cvs)p Fs(,)g(at)h(least\).)125 4842 y(In)53 +b(addition,)59 b(the)c(follo)m(wing)e(p)s(ersons)g(ha)m(v)m(e)i(help)s +(ed)e(b)m(y)h(telling)f(me)h(ab)s(out)h(mistak)m(es)f(I'v)m(e)i(made:)0 +4966 y(Ro)m(xanne)e(Brunskill)d Fn(<rbrunski@datap.ca>)p Fs(,)j(Kath)m(y)g(Dy)m(er)h Fn(<dyer@phoenix.ocf.llnl.)o(gov>)o Fs(,)f(Karl)0 5091 y(Pingle)59 b Fn(<pingle@acuson.com>)p Fs(,)64 b(Thomas)c(A)h(P)m(eterson)g Fn(<tap@src.honeywell.com>)p @@ -2530,7 +2528,7 @@ Fr(cvs)p Fs(.)480 4685 y(Figuring)c(out)i(what)g(\014les)f(need)h(to)g (to)i(use)f Fn(make)f Fs(for)480 4934 y(building,)k(and)h(use)g(some)g (automated)i(to)s(ol)e(for)g(generating)h(the)g(dep)s(endencies)d(whic) m(h)h Fn(make)480 5059 y Fs(uses.)480 5215 y(See)30 b(Chapter)g(19)h -([Builds],)e(page)i(81,)g(for)f(more)g(information)f(on)h(doing)f +([Builds],)e(page)i(83,)g(for)f(more)g(information)f(on)h(doing)f (builds)e(in)i(conjunction)480 5340 y(with)g Fr(cvs)p Fs(.)p eop %%Page: 7 9 @@ -2583,7 +2581,7 @@ j(that)g(it)f(is)f(\014xed?\).)40 b(F)-8 b(or)29 b(in)m(terfacing)480 3756 y Fr(cvs)34 b Fs(to)h(an)g(external)f(bug-trac)m(king)h(system,)h (see)g(the)e(`)p Fn(rcsinfo)p Fs(')g(and)g(`)p Fn(verifymsg)p Fs(')e(\014les)i(\(see)480 3881 y(App)s(endix)28 b(C)i([Administrativ)m -(e)e(\014les],)i(page)h(135\).)480 4050 y(Another)k(asp)s(ect)h(of)f(c) +(e)e(\014les],)i(page)h(137\).)480 4050 y(Another)k(asp)s(ect)h(of)f(c) m(hange)i(con)m(trol)e(is)g(k)m(eeping)g(trac)m(k)h(of)g(the)f(fact)h (that)g(c)m(hanges)h(to)f(sev)m(eral)480 4175 y(\014les)23 b(w)m(ere)h(in)e(fact)i(c)m(hanged)h(together)g(as)f(one)g(logical)f(c) @@ -2644,7 +2642,7 @@ Fo(rep)s(ository)37 b Fs(\(see)31 b(Chapter)f(4)g([Rep)s(ository],)h b(The)32 b Fo(mo)s(dules)i Fs(feature)e(can)h(b)s(e)0 1525 y(used)h(to)h(group)e(together)j(a)f(set)g(of)f(directories)f(or)i (\014les)e(in)m(to)h(a)h(single)e(en)m(tit)m(y)i(\(see)g(Section)f(C.1) -h([mo)s(dules],)0 1650 y(page)c(135\).)42 b(A)31 b(t)m(ypical)f(usage)h +h([mo)s(dules],)0 1650 y(page)c(137\).)42 b(A)31 b(t)m(ypical)f(usage)h (is)e(to)i(de\014ne)f(one)h(mo)s(dule)d(p)s(er)i(pro)5 b(ject.)0 2679 y Fm(2.1)68 b(Revision)32 b(n)l(um)l(b)t(ers)125 3017 y Fs(Eac)m(h)37 b(v)m(ersion)f(of)h(a)h(\014le)e(has)g(a)h(unique) @@ -2713,9 +2711,9 @@ s(er)g(it)g(pic)m(ks)g(the)0 3337 y(\014rst)26 b(un)m(used)g(ev)m(en)i b(branc)m(h)g(n)m(um)m(b)s(ers)g(ending)f(in)h(a)h(zero)h(\(suc)m(h)f (as)g(6.4.0\))j(are)d(used)f(in)m(ternally)f(b)m(y)0 3587 y Fr(cvs)i Fs(\(see)i(Section)f(E.1)g([Magic)h(branc)m(h)f(n)m(um) -m(b)s(ers],)f(page)i(153\).)42 b(The)29 b(branc)m(h)h(1.1.1)i(has)d(a)i +m(b)s(ers],)f(page)i(155\).)42 b(The)29 b(branc)m(h)h(1.1.1)i(has)d(a)i (sp)s(ecial)d(meaning.)0 3711 y(See)j(Chapter)e(13)j([T)-8 -b(rac)m(king)30 b(sources],)h(page)g(63.)0 4159 y Fm(2.2)68 +b(rac)m(king)30 b(sources],)h(page)g(65.)0 4159 y Fm(2.2)68 b(V)-11 b(ersions,)31 b(revisions)g(and)f(releases)125 4433 y Fs(A)40 b(\014le)g(can)h(ha)m(v)m(e)h(sev)m(eral)f(v)m(ersions,) h(as)f(describ)s(ed)e(ab)s(o)m(v)m(e.)72 b(Lik)m(ewise,)42 @@ -2762,7 +2760,7 @@ Fs(',)d(and)i(a)g(couple)f(of)i(hours)d(later)i(y)m(ou)h(ha)m(v)m(e)0 b(A)24 b(note)h(to)g Fr(r)n(cs)e Fs(and)h Fr(sccs)f Fs(users:)37 b(There)23 b(is)h(no)g(need)g(to)h(lo)s(c)m(k)0 4207 y(the)31 b(\014les)e(that)i(y)m(ou)g(w)m(an)m(t)g(to)g(edit.)40 -b(See)31 b(Chapter)e(6)i([Multiple)e(dev)m(elop)s(ers],)h(page)h(33,)g +b(See)31 b(Chapter)e(6)i([Multiple)e(dev)m(elop)s(ers],)h(page)h(35,)g (for)g(an)f(explanation.)0 4682 y Fm(3.2)68 b(Committing)32 b(y)l(our)f(c)l(hanges)125 4959 y Fs(When)f(y)m(ou)i(ha)m(v)m(e)g(c)m (hec)m(k)m(ed)h(that)f(the)f(compiler)f(is)g(still)f(compilable)g(y)m @@ -2794,7 +2792,7 @@ g(o)m(v)m(erhead)g(of)g(starting)f(an)0 1147 y(editor)k(y)m(ou)h(can)f e(of)i(course)240 2600 y Fn($)47 b(cd)h(..)240 2704 y($)f(rm)h(-r)f(tc) 0 2986 y Fs(but)30 b(a)g(b)s(etter)h(w)m(a)m(y)g(is)f(to)h(use)f(the)g Fn(release)f Fs(command)h(\(see)h(Section)f(A.14)i([release],)g(page)f -(114\):)240 3248 y Fn($)47 b(cd)h(..)240 3352 y($)f(cvs)g(release)f(-d) +(116\):)240 3248 y Fn($)47 b(cd)h(..)240 3352 y($)f(cvs)g(release)f(-d) h(tc)240 3455 y(M)g(driver.c)240 3559 y(?)g(tc)240 3663 y(You)g(have)g([1])f(altered)g(files)h(in)g(this)f(repository.)240 3767 y(Are)h(you)g(sure)f(you)h(want)g(to)g(release)f(\(and)h(delete\)) @@ -2804,7 +2802,7 @@ i(that)g(all)d(y)m(our)i(mo)s(di\014cations)e(ha)m(v)m(e)j(b)s(een)e (committed.)75 b(If)41 b(history)0 4277 y(logging)30 b(is)f(enabled)g(it)g(also)h(mak)m(es)h(a)f(note)h(in)d(the)j(history)e (\014le.)39 b(See)30 b(Section)g(C.10)h([history)e(\014le],)h(page)g -(147.)125 4560 y(When)g(y)m(ou)g(use)g(the)h(`)p Fn(-d)p +(149.)125 4560 y(When)g(y)m(ou)g(use)g(the)h(`)p Fn(-d)p Fs(')f(\015ag)h(with)e Fn(release)p Fs(,)g(it)h(also)g(remo)m(v)m(es)i (y)m(our)e(w)m(orking)g(cop)m(y)-8 b(.)125 4842 y(In)33 b(the)i(example)f(ab)s(o)m(v)m(e,)j(the)d Fn(release)f @@ -2815,9 +2813,9 @@ b(That)22 b(is)g(nothing)f(to)i(w)m(orry)f(ab)s(out:)36 b(`)p Fn(tc)p Fs(')22 b(is)g(the)g(executable)h(compiler,)0 5091 y(and)j(it)g(should)e(not)i(b)s(e)g(stored)h(in)e(the)h(rep)s (ository)-8 b(.)39 b(See)26 b(Section)g(C.9)h([cvsignore],)h(page)f -(146,)i(for)d(information)0 5215 y(ab)s(out)39 b(ho)m(w)g(to)h(mak)m(e) +(148,)i(for)d(information)0 5215 y(ab)s(out)39 b(ho)m(w)g(to)h(mak)m(e) g(that)g(w)m(arning)d(go)j(a)m(w)m(a)m(y)-8 b(.)70 b(See)39 -b(Section)g(A.14.2)i([release)f(output],)h(page)f(115,)j(for)c(a)0 +b(Section)g(A.14.2)i([release)f(output],)h(page)f(117,)j(for)c(a)0 5340 y(complete)31 b(explanation)e(of)i(all)e(p)s(ossible)f(output)i (from)g Fn(release)p Fs(.)p eop %%Page: 13 15 @@ -2961,7 +2959,7 @@ s(e)e(necessary)i(to)g(understand)e(ho)m(w)h Fr(cvs)f Fs(stores)i(data)g(in)e(the)h(rep)s(ository)-8 b(,)0 3579 y(for)34 b(example)g(y)m(ou)h(migh)m(t)f(need)g(to)h(trac)m(k)h (do)m(wn)e Fr(cvs)f Fs(lo)s(c)m(ks)h(\(see)i(Section)e(6.5)h -([Concurrency],)g(page)g(38\))h(or)0 3703 y(y)m(ou)31 +([Concurrency],)g(page)g(40\))h(or)0 3703 y(y)m(ou)31 b(migh)m(t)f(need)g(to)h(deal)f(with)f(the)i(\014le)e(p)s(ermissions)e (appropriate)j(for)g(the)g(rep)s(ository)-8 b(.)0 4143 y Fk(4.2.1)63 b(Where)30 b(\014les)h(are)f(stored)h(within)f(the)h(rep) @@ -3024,10 +3022,10 @@ Fs(\014les)g(used)g(in)g Fr(cvs)g Fs(di\013er)g(in)f(a)j(few)e(w)m(a)m (ys)i(from)f(the)g(standard)f(format.)41 b(The)28 b(biggest)h (di\013erence)0 1680 y(is)k(magic)g(branc)m(hes;)j(for)d(more)h (information)e(see)i(Section)f(E.1)h([Magic)h(branc)m(h)e(n)m(um)m(b)s -(ers],)g(page)i(153.)51 b(Also)0 1805 y(in)27 b Fr(cvs)h +(ers],)g(page)i(155.)51 b(Also)0 1805 y(in)27 b Fr(cvs)h Fs(the)h(v)-5 b(alid)27 b(tag)j(names)f(are)g(a)g(subset)g(of)f(what)h Fr(r)n(cs)f Fs(accepts;)j(for)d Fr(cvs)p Fs('s)g(rules)g(see)h(Section) -g(7.1)g([T)-8 b(ags],)0 1929 y(page)31 b(45.)0 2429 y +g(7.1)g([T)-8 b(ags],)0 1929 y(page)31 b(47.)0 2429 y Fk(4.2.2)63 b(File)30 b(p)s(ermissions)125 2712 y Fs(All)25 b(`)p Fn(,v)p Fs(')j(\014les)e(are)i(created)g(read-only)-8 b(,)28 b(and)f(y)m(ou)g(should)f(not)h(c)m(hange)i(the)e(p)s(ermission) @@ -3045,7 +3043,7 @@ b(.)125 3494 y(This)28 b(means)i(that)h(y)m(ou)g(can)g(only)e(con)m 3777 y(Note)h(that)g(users)f(m)m(ust)g(also)g(ha)m(v)m(e)i(write)d (access)j(to)f(c)m(hec)m(k)h(out)f(\014les,)e(b)s(ecause)i Fr(cvs)e Fs(needs)h(to)h(create)h(lo)s(c)m(k)0 3902 y(\014les)e(\(see)j -(Section)e(6.5)h([Concurrency],)f(page)i(38\).)125 4185 +(Section)e(6.5)h([Concurrency],)f(page)i(40\).)125 4185 y(Also)26 b(note)h(that)g(users)f(m)m(ust)g(ha)m(v)m(e)i(write)e (access)i(to)f(the)g(`)p Fn(CVSROOT/val-tags)p Fs(')c(\014le.)38 b Fr(Cvs)27 b Fs(uses)f(it)g(to)h(k)m(eep)0 4309 y(trac)m(k)39 @@ -3071,555 +3069,606 @@ eop %%Page: 19 21 19 20 bop 0 -116 a Fs(Chapter)30 b(4:)41 b(The)30 b(Rep)s(ository)2725 b(19)0 366 y(on)33 b(w)m(atc)m(hes,)j(Section)d(6.6.1)i([Setting)e(a)h -(w)m(atc)m(h],)i(page)e(40;)h(-r,)g(Section)e(A.3)h([Global)e -(options],)i(page)g(89;)i(or)0 491 y(CVSREAD,)30 b(App)s(endix)e(D)j -([En)m(vironmen)m(t)e(v)-5 b(ariables],)30 b(page)h(149\).)125 -783 y(Since)e Fr(cvs)g Fs(w)m(as)i(not)f(written)g(to)h(b)s(e)f(run)f -(setuid,)g(it)h(is)f(unsafe)h(to)h(try)f(to)h(run)e(it)h(setuid.)39 -b(Y)-8 b(ou)31 b(cannot)g(use)0 907 y(the)g(setuid)e(features)h(of)h -Fr(r)n(cs)e Fs(together)j(with)d Fr(cvs)p Fs(.)0 1517 -y Fm(4.3)68 b(The)30 b(administrativ)l(e)j(\014les)125 -1809 y Fs(The)24 b(directory)h(`)p Fn($CVSROOT/CVSROOT)p +(w)m(atc)m(h],)i(page)e(42;)h(-r,)g(Section)e(A.3)h([Global)e +(options],)i(page)g(91;)i(or)0 491 y(CVSREAD,)30 b(App)s(endix)e(D)j +([En)m(vironmen)m(t)e(v)-5 b(ariables],)30 b(page)h(151\).)125 +803 y(Note)i(that)g(using)e(the)i(clien)m(t/serv)m(er)g +Fr(cvs)e Fs(\(see)j(Section)e(4.6)i([Remote)g(rep)s(ositories],)e(page) +h(21\),)h(there)f(is)0 928 y(no)26 b(go)s(o)s(d)h(w)m(a)m(y)g(to)h(set) +f Fn(CVSUMASK)p Fs(;)f(the)h(setting)f(on)h(the)f(clien)m(t)h(mac)m +(hine)f(has)g(no)h(e\013ect.)41 b(If)26 b(y)m(ou)h(are)g(connecting)0 +1052 y(with)34 b Fn(rsh)p Fs(,)h(y)m(ou)g(can)h(set)f +Fn(CVSUMASK)e Fs(in)g(`)p Fn(.bashrc)p Fs(')h(or)h(`)p +Fn(.cshrc)p Fs(',)g(as)g(describ)s(ed)e(in)g(the)i(do)s(cumen)m(tation) +g(for)0 1177 y(y)m(our)e(op)s(erating)g(system.)51 b(This)31 +b(b)s(eha)m(vior)i(migh)m(t)g(c)m(hange)i(in)d(future)h(v)m(ersions)f +(of)i Fr(cvs)p Fs(;)h(do)e(not)h(rely)e(on)i(the)0 1302 +y(setting)c(of)h Fn(CVSUMASK)d Fs(on)i(the)h(clien)m(t)f(ha)m(ving)g +(no)g(e\013ect.)125 1614 y(Since)f Fr(cvs)g Fs(w)m(as)i(not)f(written)g +(to)h(b)s(e)f(run)f(setuid,)g(it)h(is)f(unsafe)h(to)h(try)f(to)h(run)e +(it)h(setuid.)39 b(Y)-8 b(ou)31 b(cannot)g(use)0 1738 +y(the)g(setuid)e(features)h(of)h Fr(r)n(cs)e Fs(together)j(with)d +Fr(cvs)p Fs(.)0 2533 y Fm(4.3)68 b(The)30 b(administrativ)l(e)j +(\014les)125 2845 y Fs(The)24 b(directory)h(`)p Fn($CVSROOT/CVSROOT)p Fs(')d(con)m(tains)j(some)h Fo(administrativ)m(e)e(\014les)p -Fs(.)38 b(See)26 b(App)s(endix)c(C)j([Admin-)0 1934 y(istrativ)m(e)35 -b(\014les],)i(page)f(135,)i(for)d(a)h(complete)g(description.)54 +Fs(.)38 b(See)26 b(App)s(endix)c(C)j([Admin-)0 2970 y(istrativ)m(e)35 +b(\014les],)i(page)f(137,)i(for)d(a)h(complete)g(description.)54 b(Y)-8 b(ou)36 b(can)f(use)h Fr(cvs)e Fs(without)g(an)m(y)i(of)g(these) -g(\014les,)0 2058 y(but)30 b(some)g(commands)g(w)m(ork)h(b)s(etter)f +g(\014les,)0 3094 y(but)30 b(some)g(commands)g(w)m(ork)h(b)s(etter)f (when)g(at)h(least)f(the)h(`)p Fn(modules)p Fs(')e(\014le)g(is)h(prop)s -(erly)e(set)j(up.)125 2350 y(The)f(most)i(imp)s(ortan)m(t)e(of)h(these) +(erly)e(set)j(up.)125 3407 y(The)f(most)i(imp)s(ortan)m(t)e(of)h(these) h(\014les)e(is)g(the)h(`)p Fn(modules)p Fs(')f(\014le.)42 b(It)31 b(de\014nes)f(all)g(mo)s(dules)f(in)h(the)h(rep)s(ository)-8 -b(.)0 2475 y(This)29 b(is)g(a)i(sample)e(`)p Fn(modules)p -Fs(')g(\014le.)240 2746 y Fn(CVSROOT)428 b(CVSROOT)240 -2850 y(modules)g(CVSROOT)45 b(modules)240 2954 y(cvs)620 -b(gnu/cvs)240 3057 y(rcs)g(gnu/rcs)240 3161 y(diff)572 -b(gnu/diff)240 3265 y(tc)668 b(yoyodyne/tc)125 3557 y +b(.)0 3531 y(This)29 b(is)g(a)i(sample)e(`)p Fn(modules)p +Fs(')g(\014le.)240 3823 y Fn(CVSROOT)428 b(CVSROOT)240 +3926 y(modules)g(CVSROOT)45 b(modules)240 4030 y(cvs)620 +b(gnu/cvs)240 4134 y(rcs)g(gnu/rcs)240 4238 y(diff)572 +b(gnu/diff)240 4342 y(tc)668 b(yoyodyne/tc)125 4654 y Fs(The)41 b(`)p Fn(modules)p Fs(')f(\014le)h(is)g(line)f(orien)m(ted.) 75 b(In)41 b(its)g(simplest)f(form)i(eac)m(h)h(line)d(con)m(tains)i -(the)g(name)g(of)g(the)0 3681 y(mo)s(dule,)31 b(whitespace,)i(and)f +(the)g(name)g(of)g(the)0 4779 y(mo)s(dule,)31 b(whitespace,)i(and)f (the)h(directory)e(where)h(the)h(mo)s(dule)d(resides.)46 b(The)32 b(directory)g(is)f(a)i(path)f(relativ)m(e)0 -3806 y(to)f Fn($CVSROOT)p Fs(.)39 b(The)29 b(last)i(four)e(lines)g(in)g +4903 y(to)f Fn($CVSROOT)p Fs(.)39 b(The)29 b(last)i(four)e(lines)g(in)g (the)i(example)f(ab)s(o)m(v)m(e)h(are)g(examples)f(of)g(suc)m(h)g -(lines.)125 4098 y(The)c(line)g(that)i(de\014nes)e(the)i(mo)s(dule)e +(lines.)125 5215 y(The)c(line)g(that)i(de\014nes)e(the)i(mo)s(dule)e (called)g(`)p Fn(modules)p Fs(')g(uses)h(features)g(that)h(are)g(not)g -(explained)d(here.)40 b(See)0 4222 y(Section)30 b(C.1)h([mo)s(dules],)e -(page)i(135,)h(for)e(a)h(full)d(explanation)i(of)g(all)f(the)i(a)m(v)-5 -b(ailable)30 b(features.)0 4799 y Fk(4.3.1)63 b(Editing)30 -b(administrativ)m(e)f(\014les)125 5091 y Fs(Y)-8 b(ou)34 +(explained)d(here.)40 b(See)0 5340 y(Section)30 b(C.1)h([mo)s(dules],)e +(page)i(137,)h(for)e(a)h(full)d(explanation)i(of)g(all)f(the)i(a)m(v)-5 +b(ailable)30 b(features.)p eop +%%Page: 20 22 +20 21 bop 0 -116 a Fs(20)2411 b(CVS|Concurren)m(t)29 +b(V)-8 b(ersions)30 b(System)0 366 y Fk(4.3.1)63 b(Editing)30 +b(administrativ)m(e)f(\014les)125 643 y Fs(Y)-8 b(ou)34 b(edit)g(the)g(administrativ)m(e)e(\014les)h(in)g(the)h(same)h(w)m(a)m (y)g(that)f(y)m(ou)h(w)m(ould)d(edit)i(an)m(y)g(other)h(mo)s(dule.)50 -b(Use)0 5215 y(`)p Fn(cvs)30 b(checkout)e(CVSROOT)p Fs(')35 +b(Use)0 768 y(`)p Fn(cvs)30 b(checkout)e(CVSROOT)p Fs(')35 b(to)j(get)h(a)f(w)m(orking)e(cop)m(y)-8 b(,)41 b(edit)36 b(it,)j(and)e(commit)g(y)m(our)g(c)m(hanges)i(in)c(the)j(normal)0 -5340 y(w)m(a)m(y)-8 b(.)p eop -%%Page: 20 22 -20 21 bop 0 -116 a Fs(20)2411 b(CVS|Concurren)m(t)29 -b(V)-8 b(ersions)30 b(System)125 366 y(It)24 b(is)f(p)s(ossible)e(to)k +892 y(w)m(a)m(y)-8 b(.)125 1169 y(It)24 b(is)f(p)s(ossible)e(to)k (commit)f(an)f(erroneous)h(administrativ)m(e)f(\014le.)37 b(Y)-8 b(ou)25 b(can)f(often)g(\014x)g(the)g(error)f(and)h(c)m(hec)m(k) -h(in)0 491 y(a)g(new)f(revision,)g(but)g(sometimes)g(a)h(particularly)d -(bad)i(error)g(in)f(the)i(administrativ)m(e)e(\014le)g(mak)m(es)i(it)f -(imp)s(ossible)0 616 y(to)31 b(commit)f(new)g(revisions.)0 -1048 y Fm(4.4)68 b(Multiple)31 b(rep)t(ositories)125 -1321 y Fs(In)44 b(some)h(situations)f(it)h(is)f(a)h(go)s(o)s(d)g(idea)g +h(in)0 1294 y(a)g(new)f(revision,)g(but)g(sometimes)g(a)h(particularly) +d(bad)i(error)g(in)f(the)i(administrativ)m(e)e(\014le)g(mak)m(es)i(it)f +(imp)s(ossible)0 1418 y(to)31 b(commit)f(new)g(revisions.)0 +1892 y Fm(4.4)68 b(Multiple)31 b(rep)t(ositories)125 +2168 y Fs(In)44 b(some)h(situations)f(it)h(is)f(a)h(go)s(o)s(d)g(idea)g (to)h(ha)m(v)m(e)g(more)f(than)g(one)h(rep)s(ository)-8 -b(,)48 b(for)d(instance)g(if)f(y)m(ou)0 1446 y(ha)m(v)m(e)37 +b(,)48 b(for)d(instance)g(if)f(y)m(ou)0 2293 y(ha)m(v)m(e)37 b(t)m(w)m(o)f(dev)m(elopmen)m(t)g(groups)f(that)h(w)m(ork)g(on)f (separate)h(pro)5 b(jects)36 b(without)f(sharing)f(an)m(y)h(co)s(de.)57 -b(All)34 b(y)m(ou)0 1571 y(ha)m(v)m(e)f(to)g(do)e(to)i(ha)m(v)m(e)g +b(All)34 b(y)m(ou)0 2417 y(ha)m(v)m(e)f(to)g(do)e(to)i(ha)m(v)m(e)g (sev)m(eral)f(rep)s(ositories)f(is)g(to)h(sp)s(ecify)f(the)h (appropriate)f(rep)s(ository)-8 b(,)31 b(using)g(the)h -Fn(CVSROOT)0 1695 y Fs(en)m(vironmen)m(t)g(v)-5 b(ariable,)33 +Fn(CVSROOT)0 2542 y Fs(en)m(vironmen)m(t)g(v)-5 b(ariable,)33 b(the)f(`)p Fn(-d)p Fs(')h(option)f(to)i Fr(cvs)p Fs(,)e(or)h(\(once)h (y)m(ou)f(ha)m(v)m(e)g(c)m(hec)m(k)m(ed)i(out)e(a)g(w)m(orking)f -(directory\))0 1820 y(b)m(y)c(simply)d(allo)m(wing)h +(directory\))0 2666 y(b)m(y)c(simply)d(allo)m(wing)h Fr(cvs)h Fs(to)h(use)g(the)g(rep)s(ository)e(that)i(w)m(as)g(used)f(to) i(c)m(hec)m(k)g(out)f(the)g(w)m(orking)f(directory)g(\(see)0 -1944 y(Section)j(4.1)i([Sp)s(ecifying)c(a)j(rep)s(ository],)e(page)i -(15\).)125 2218 y(The)k(big)f(adv)-5 b(an)m(tage)38 b(of)e(ha)m(ving)f +2791 y(Section)j(4.1)i([Sp)s(ecifying)c(a)j(rep)s(ository],)e(page)i +(15\).)125 3068 y(The)k(big)f(adv)-5 b(an)m(tage)38 b(of)e(ha)m(ving)f (m)m(ultiple)e(rep)s(ositories)i(is)f(that)i(they)g(can)g(reside)f(on)g -(di\013eren)m(t)h(serv)m(ers.)0 2343 y(The)28 b(big)f(disadv)-5 +(di\013eren)m(t)h(serv)m(ers.)0 3192 y(The)28 b(big)f(disadv)-5 b(an)m(tage)28 b(is)f(that)i(y)m(ou)f(cannot)h(ha)m(v)m(e)g(a)g(single) d Fr(cvs)i Fs(command)f(recurse)h(in)m(to)g(directories)f(whic)m(h)0 -2467 y(comes)41 b(from)g(di\013eren)m(t)f(rep)s(ositories.)70 +3317 y(comes)41 b(from)g(di\013eren)m(t)f(rep)s(ositories.)70 b(Generally)40 b(sp)s(eaking,)i(if)e(y)m(ou)h(are)g(thinking)d(of)j -(setting)g(up)f(sev)m(eral)0 2592 y(rep)s(ositories)30 +(setting)g(up)f(sev)m(eral)0 3441 y(rep)s(ositories)30 b(on)i(the)g(same)g(mac)m(hine,)g(y)m(ou)g(migh)m(t)f(w)m(an)m(t)i(to)f (consider)f(using)f(sev)m(eral)i(directories)f(within)e(the)0 -2716 y(same)i(rep)s(ository)-8 b(.)125 2990 y(None)30 +3566 y(same)i(rep)s(ository)-8 b(.)125 3843 y(None)30 b(of)h(the)f(examples)g(in)f(this)h(man)m(ual)f(sho)m(w)i(m)m(ultiple)d -(rep)s(ositories.)0 3422 y Fm(4.5)68 b(Creating)32 b(a)f(rep)t(ository) -125 3696 y Fs(T)-8 b(o)34 b(set)h(up)e(a)h Fr(cvs)f Fs(rep)s(ository)-8 +(rep)s(ositories.)0 4316 y Fm(4.5)68 b(Creating)32 b(a)f(rep)t(ository) +125 4593 y Fs(T)-8 b(o)34 b(set)h(up)e(a)h Fr(cvs)f Fs(rep)s(ository)-8 b(,)35 b(\014rst)e(c)m(ho)s(ose)i(the)f(mac)m(hine)g(and)g(disk)e(on)i (whic)m(h)f(y)m(ou)h(w)m(an)m(t)h(to)g(store)g(the)0 -3821 y(revision)25 b(history)h(of)i(the)f(source)g(\014les.)39 +4717 y(revision)25 b(history)h(of)i(the)f(source)g(\014les.)39 b(CPU)26 b(and)h(memory)g(requiremen)m(ts)f(are)h(mo)s(dest|a)h(serv)m -(er)f(with)f(32M)0 3945 y(of)39 b(memory)f(or)g(ev)m(en)h(less)f(can)g +(er)f(with)f(32M)0 4842 y(of)39 b(memory)f(or)g(ev)m(en)h(less)f(can)g (handle)f(a)i(fairly)e(large)h(source)h(tree)g(with)e(a)h(fair)g(amoun) -m(t)g(of)h(activit)m(y)-8 b(.)65 b(T)-8 b(o)0 4070 y(estimate)41 +m(t)g(of)h(activit)m(y)-8 b(.)65 b(T)-8 b(o)0 4966 y(estimate)41 b(disk)d(space)j(requiremen)m(ts,)h(if)d(y)m(ou)h(are)h(imp)s(orting)c (R)m(CS)j(\014les)f(from)h(another)g(system,)j(the)d(size)0 -4194 y(of)35 b(those)g(\014les)e(is)h(the)h(appro)m(ximate)f(initial)e +5091 y(of)35 b(those)g(\014les)e(is)h(the)h(appro)m(ximate)f(initial)e (size)i(of)h(y)m(our)g(rep)s(ository)-8 b(,)35 b(or)f(if)g(y)m(ou)h -(are)g(starting)f(without)g(an)m(y)0 4319 y(v)m(ersion)29 +(are)g(starting)f(without)g(an)m(y)0 5215 y(v)m(ersion)29 b(history)-8 b(,)30 b(a)g(rule)e(of)i(th)m(um)m(b)f(is)g(to)i(allo)m(w) e(for)g(the)h(serv)m(er)g(appro)m(ximately)f(three)h(times)f(the)h -(size)g(of)g(the)0 4443 y(co)s(de)35 b(to)h(b)s(e)e(under)g(CVS)g(for)h +(size)g(of)g(the)0 5340 y(co)s(de)35 b(to)h(b)s(e)e(under)g(CVS)g(for)h (the)g(rep)s(ository)f(\(y)m(ou)h(will)e(ev)m(en)m(tually)i(outgro)m(w) -g(this,)h(but)e(not)h(for)g(a)g(while\).)0 4568 y(On)25 -b(the)i(mac)m(hines)f(on)g(whic)m(h)f(the)i(dev)m(elop)s(ers)e(will)f -(b)s(e)i(w)m(orking,)g(y)m(ou'll)g(w)m(an)m(t)h(disk)e(space)h(for)h -(appro)m(ximately)0 4692 y(one)37 b(w)m(orking)f(directory)h(for)f(eac) -m(h)i(dev)m(elop)s(er)e(\(either)h(the)g(en)m(tire)g(tree)g(or)g(a)g(p) -s(ortion)f(of)h(it,)h(dep)s(ending)c(on)0 4817 y(what)26 -b(eac)m(h)i(dev)m(elop)s(er)d(uses\).)40 b(Don't)27 b(w)m(orry)f(ab)s -(out)g(CPU)g(and)f(memory)h(requiremen)m(ts)g(for)g(the)g(clien)m -(ts|an)m(y)0 4941 y(mac)m(hine)k(with)f(enough)h(capacit)m(y)i(to)f -(run)e(the)h(op)s(erating)g(system)h(in)e(question)g(should)g(ha)m(v)m -(e)i(little)f(trouble.)125 5215 y(The)f(rep)s(ository)g(should)f(b)s(e) -h(accessable)h(\(directly)f(or)h(via)g(a)g(net)m(w)m(ork)m(ed)h(\014le) -e(system\))h(from)g(all)e(mac)m(hines)0 5340 y(whic)m(h)i(w)m(an)m(t)i -(to)f(use)g Fr(cvs)f Fs(in)g(serv)m(er)h(or)g(lo)s(cal)g(mo)s(de;)g -(the)g(clien)m(t)g(mac)m(hines)f(need)h(not)h(ha)m(v)m(e)g(an)m(y)f -(access)i(to)e(it)p eop +g(this,)h(but)e(not)h(for)g(a)g(while\).)p eop %%Page: 21 23 21 22 bop 0 -116 a Fs(Chapter)30 b(4:)41 b(The)30 b(Rep)s(ository)2725 -b(21)0 366 y(other)31 b(than)f(via)f(the)i Fr(cvs)e Fs(proto)s(col.)41 -b(It)30 b(is)f(not)i(p)s(ossible)d(to)j(use)f Fr(cvs)f -Fs(to)i(read)f(from)g(a)g(rep)s(ository)g(whic)m(h)f(one)0 -491 y(only)35 b(has)h(read)g(access)h(to;)j Fr(cvs)35 -b Fs(needs)g(to)i(b)s(e)f(able)f(to)i(create)g(lo)s(c)m(k)f(\014les)f -(\(see)i(Section)f(6.5)h([Concurrency],)0 616 y(page)31 -b(38\).)125 897 y(T)-8 b(o)34 b(create)i(a)f(rep)s(ository)-8 -b(,)35 b(run)e(the)h Fn(cvs)c(init)j Fs(command.)52 b(It)35 -b(will)c(set)k(up)f(an)g(empt)m(y)g(rep)s(ository)g(in)f(the)0 -1021 y Fr(cvs)c Fs(ro)s(ot)i(sp)s(eci\014ed)e(in)g(the)h(usual)f(w)m(a) +b(21)0 366 y(On)25 b(the)i(mac)m(hines)f(on)g(whic)m(h)f(the)i(dev)m +(elop)s(ers)e(will)f(b)s(e)i(w)m(orking,)g(y)m(ou'll)g(w)m(an)m(t)h +(disk)e(space)h(for)h(appro)m(ximately)0 491 y(one)37 +b(w)m(orking)f(directory)h(for)f(eac)m(h)i(dev)m(elop)s(er)e(\(either)h +(the)g(en)m(tire)g(tree)g(or)g(a)g(p)s(ortion)f(of)h(it,)h(dep)s +(ending)c(on)0 616 y(what)26 b(eac)m(h)i(dev)m(elop)s(er)d(uses\).)40 +b(Don't)27 b(w)m(orry)f(ab)s(out)g(CPU)g(and)f(memory)h(requiremen)m +(ts)g(for)g(the)g(clien)m(ts|an)m(y)0 740 y(mac)m(hine)k(with)f(enough) +h(capacit)m(y)i(to)f(run)e(the)h(op)s(erating)g(system)h(in)e(question) +g(should)g(ha)m(v)m(e)i(little)f(trouble.)125 1020 y(The)f(rep)s +(ository)g(should)f(b)s(e)h(accessable)h(\(directly)f(or)h(via)g(a)g +(net)m(w)m(ork)m(ed)h(\014le)e(system\))h(from)g(all)e(mac)m(hines)0 +1145 y(whic)m(h)i(w)m(an)m(t)i(to)f(use)g Fr(cvs)f Fs(in)g(serv)m(er)h +(or)g(lo)s(cal)g(mo)s(de;)g(the)g(clien)m(t)g(mac)m(hines)f(need)h(not) +h(ha)m(v)m(e)g(an)m(y)f(access)i(to)e(it)0 1269 y(other)g(than)f(via)f +(the)i Fr(cvs)e Fs(proto)s(col.)41 b(It)30 b(is)f(not)i(p)s(ossible)d +(to)j(use)f Fr(cvs)f Fs(to)i(read)f(from)g(a)g(rep)s(ository)g(whic)m +(h)f(one)0 1394 y(only)35 b(has)h(read)g(access)h(to;)j +Fr(cvs)35 b Fs(needs)g(to)i(b)s(e)f(able)f(to)i(create)g(lo)s(c)m(k)f +(\014les)f(\(see)i(Section)f(6.5)h([Concurrency],)0 1518 +y(page)31 b(40\).)125 1798 y(T)-8 b(o)34 b(create)i(a)f(rep)s(ository) +-8 b(,)35 b(run)e(the)h Fn(cvs)c(init)j Fs(command.)52 +b(It)35 b(will)c(set)k(up)f(an)g(empt)m(y)g(rep)s(ository)g(in)f(the)0 +1923 y Fr(cvs)c Fs(ro)s(ot)i(sp)s(eci\014ed)e(in)g(the)h(usual)f(w)m(a) m(y)j(\(see)f(Chapter)f(4)g([Rep)s(ository],)h(page)g(15\).)42 -b(F)-8 b(or)31 b(example,)240 1281 y Fn(cvs)47 b(-d)g -(/usr/local/cvsroot)c(init)125 1563 y(cvs)29 b(init)h +b(F)-8 b(or)31 b(example,)240 2182 y Fn(cvs)47 b(-d)g +(/usr/local/cvsroot)c(init)125 2462 y(cvs)29 b(init)h Fs(is)f(careful)h(to)i(nev)m(er)f(o)m(v)m(erwrite)g(an)m(y)g(existing)e (\014les)h(in)f(the)i(rep)s(ository)-8 b(,)30 b(so)h(no)g(harm)f(is)g -(done)g(if)0 1687 y(y)m(ou)h(run)e Fn(cvs)g(init)g Fs(on)i(an)f -(already)g(set-up)g(rep)s(ository)-8 b(.)125 1968 y Fn(cvs)29 +(done)g(if)0 2587 y(y)m(ou)h(run)e Fn(cvs)g(init)g Fs(on)i(an)f +(already)g(set-up)g(rep)s(ository)-8 b(.)125 2867 y Fn(cvs)29 b(init)22 b Fs(will)f(enable)i(history)g(logging;)j(if)c(y)m(ou)i (don't)g(w)m(an)m(t)g(that,)i(remo)m(v)m(e)f(the)e(history)g(\014le)g -(after)h(running)0 2093 y Fn(cvs)29 b(init)p Fs(.)40 -b(See)31 b(Section)f(C.10)h([history)f(\014le],)g(page)h(147.)0 -2605 y Fm(4.6)68 b(Remote)32 b(rep)t(ositories)125 2886 +(after)h(running)0 2991 y Fn(cvs)29 b(init)p Fs(.)40 +b(See)31 b(Section)f(C.10)h([history)f(\014le],)g(page)h(149.)0 +3494 y Fm(4.6)68 b(Remote)32 b(rep)t(ositories)125 3774 y Fs(Y)-8 b(our)29 b(w)m(orking)f(cop)m(y)i(of)g(the)f(sources)g(can)h (b)s(e)e(on)h(a)h(di\013eren)m(t)f(mac)m(hine)f(than)h(the)h(rep)s -(ository)-8 b(.)40 b(Using)28 b Fr(cvs)0 3010 y Fs(in)k(this)g(manner)g +(ository)-8 b(.)40 b(Using)28 b Fr(cvs)0 3898 y Fs(in)k(this)g(manner)g (is)g(kno)m(wn)h(as)g Fo(clien)m(t/serv)m(er)40 b Fs(op)s(eration.)49 b(Y)-8 b(ou)33 b(run)f Fr(cvs)g Fs(on)h(a)h(mac)m(hine)f(whic)m(h)f -(can)h(moun)m(t)0 3135 y(y)m(our)j(w)m(orking)f(directory)-8 +(can)h(moun)m(t)0 4023 y(y)m(our)j(w)m(orking)f(directory)-8 b(,)37 b(kno)m(wn)f(as)g(the)g Fo(clien)m(t)p Fs(,)h(and)e(tell)g(it)h (to)g(comm)m(unicate)h(to)f(a)h(mac)m(hine)e(whic)m(h)g(can)0 -3259 y(moun)m(t)d(the)h(rep)s(ository)-8 b(,)32 b(kno)m(wn)g(as)g(the)g +4147 y(moun)m(t)d(the)h(rep)s(ository)-8 b(,)32 b(kno)m(wn)g(as)g(the)g Fo(serv)m(er)p Fs(.)47 b(Generally)-8 b(,)32 b(using)f(a)i(remote)g -(rep)s(ository)e(is)g(just)h(lik)m(e)f(using)0 3384 y(a)g(lo)s(cal)e +(rep)s(ository)e(is)g(just)h(lik)m(e)f(using)0 4272 y(a)g(lo)s(cal)e (one,)i(except)h(that)f(the)f(format)h(of)f(the)h(rep)s(ository)e(name) -i(is:)240 3644 y Fn(:)p Fo(metho)s(d)t Fn(:)p Fo(user)7 +i(is:)240 4531 y Fn(:)p Fo(metho)s(d)t Fn(:)p Fo(user)7 b Fn(@)p Fo(hostname)e Fn(:/path/to/repos)o(itor)o(y)125 -3925 y Fs(The)27 b(details)h(of)g(exactly)i(what)e(needs)g(to)h(b)s(e)f +4811 y Fs(The)27 b(details)h(of)g(exactly)i(what)e(needs)g(to)h(b)s(e)f (set)h(up)e(dep)s(end)g(on)h(ho)m(w)h(y)m(ou)f(are)h(connecting)g(to)g -(the)f(serv)m(er.)125 4206 y(If)40 b Fo(metho)s(d)k Fs(is)c(not)h(sp)s +(the)f(serv)m(er.)125 5091 y(If)40 b Fo(metho)s(d)k Fs(is)c(not)h(sp)s (eci\014ed,)h(and)e(the)h(rep)s(ository)f(name)h(con)m(tains)g(`)p Fn(:)p Fs(',)j(then)d(the)g(default)f(is)g Fn(ext)g Fs(or)0 -4331 y Fn(server)p Fs(,)j(dep)s(ending)c(on)j(y)m(our)f(platform;)47 -b(b)s(oth)40 b(are)i(describ)s(ed)e(in)g(Section)i(4.6.1)h([Connecting) -e(via)h(rsh],)0 4455 y(page)31 b(21.)0 4934 y Fk(4.6.1)63 -b(Connecting)30 b(with)g(rsh)125 5215 y Fs(CVS)e(uses)g(the)h(`)p -Fn(rsh)p Fs(')f(proto)s(col)h(to)h(p)s(erform)d(these)i(op)s(erations,) -g(so)g(the)g(remote)h(user)e(host)h(needs)f(to)i(ha)m(v)m(e)0 -5340 y(a)h(`)p Fn(.rhosts)p Fs(')e(\014le)g(whic)m(h)g(gran)m(ts)i -(access)h(to)f(the)g(lo)s(cal)e(user.)p eop +5215 y Fn(server)p Fs(,)j(dep)s(ending)c(on)j(y)m(our)f(platform;)47 +b(b)s(oth)40 b(are)i(describ)s(ed)e(in)g(Section)i(4.6.2)h([Connecting) +e(via)h(rsh],)0 5340 y(page)31 b(22.)p eop %%Page: 22 24 22 23 bop 0 -116 a Fs(22)2411 b(CVS|Concurren)m(t)29 -b(V)-8 b(ersions)30 b(System)125 366 y(F)-8 b(or)25 b(example,)h(supp)s -(ose)e(y)m(ou)h(are)g(the)h(user)e(`)p Fn(mozart)p Fs(')g(on)g(the)i -(lo)s(cal)e(mac)m(hine)g(`)p Fn(anklet.grunge.com)p Fs(',)f(and)0 -491 y(the)28 b(serv)m(er)g(mac)m(hine)g(is)f(`)p Fn -(chainsaw.brickyard.com)p Fs('.)34 b(On)27 b(c)m(hainsa)m(w,)h(put)f -(the)i(follo)m(wing)d(line)g(in)m(to)i(the)g(\014le)0 -616 y(`)p Fn(.rhosts)p Fs(')h(in)g(`)p Fn(bach)p Fs(''s)h(home)g -(directory:)240 919 y Fn(anklet.grunge.com)91 b(mozart)125 -1243 y Fs(Then)29 b(test)i(that)g Fn(rsh)f Fs(is)f(w)m(orking)h(with) -240 1547 y Fn(rsh)47 b(-l)g(bach)g(chainsaw.brickyard.com)41 -b('echo)47 b($PATH')125 1871 y Fs(Next)d(y)m(ou)g(ha)m(v)m(e)h(to)f -(mak)m(e)g(sure)f(that)h Fn(rsh)f Fs(will)e(b)s(e)i(able)g(to)h(\014nd) -e(the)i(serv)m(er.)81 b(Mak)m(e)45 b(sure)e(that)h(the)0 -1996 y(path)32 b(whic)m(h)f Fn(rsh)g Fs(prin)m(ted)g(in)g(the)h(ab)s(o) -m(v)m(e)h(example)f(includes)e(the)i(directory)g(con)m(taining)g(a)g -(program)g(named)0 2120 y Fn(cvs)37 b Fs(whic)m(h)g(is)g(the)i(serv)m -(er.)64 b(Y)-8 b(ou)39 b(need)e(to)i(set)g(the)f(path)g(in)f(`)p +b(V)-8 b(ersions)30 b(System)0 366 y Fk(4.6.1)63 b(Serv)m(er)30 +b(requiremen)m(ts)125 647 y Fs(The)44 b(quic)m(k)h(answ)m(er)f(to)i +(what)f(sort)g(of)h(mac)m(hine)e(is)g(suitable)g(as)h(a)h(serv)m(er)f +(is)f(that)h(requiremen)m(ts)g(are)0 771 y(mo)s(dest|a)28 +b(serv)m(er)h(with)d(32M)k(of)e(memory)g(or)g(ev)m(en)g(less)g(can)g +(handle)f(a)h(fairly)f(large)h(source)g(tree)h(with)d(a)j(fair)0 +896 y(amoun)m(t)i(of)f(activit)m(y)-8 b(.)125 1176 y(The)34 +b(real)g(answ)m(er,)i(of)f(course,)h(is)d(more)i(complicated.)53 +b(The)34 b Fr(cvs)g Fs(serv)m(er)h(consists)f(of)h(t)m(w)m(o)h(pro)s +(cesses)e(for)0 1300 y(eac)m(h)28 b(clien)m(t)e(that)i(it)e(is)g +(serving.)38 b(Memory)27 b(consumption)f(on)g(the)h(c)m(hild)e(pro)s +(cess)i(should)d(remain)i(fairly)f(small.)0 1425 y(Memory)30 +b(consumption)e(on)h(the)h(paren)m(t)g(pro)s(cess,)f(particularly)e(if) +h(the)i(net)m(w)m(ork)g(connection)g(to)g(the)g(clien)m(t)f(is)0 +1549 y(slo)m(w,)g(can)h(b)s(e)f(exp)s(ected)h(to)g(gro)m(w)g(to)g +(sligh)m(tly)d(more)j(than)f(the)h(size)f(of)g(the)h(sources)f(in)f(a)i +(single)e(directory)-8 b(,)30 b(or)0 1674 y(t)m(w)m(o)i(megab)m(ytes,)g +(whic)m(hev)m(er)e(is)f(larger.)125 1954 y(Multiplying)21 +b(the)k(size)g(of)g(eac)m(h)i Fr(cvs)d Fs(serv)m(er)h(b)m(y)g(the)g(n)m +(um)m(b)s(er)f(of)h(serv)m(ers)g(whic)m(h)f(y)m(ou)h(exp)s(ect)h(to)f +(ha)m(v)m(e)i(activ)m(e)0 2079 y(at)38 b(one)g(time)g(should)d(giv)m(e) +j(an)g(idea)f(of)h(memory)f(requiremen)m(ts)g(for)g(the)h(serv)m(er.)63 +b(F)-8 b(or)38 b(the)g(most)g(part,)i(the)0 2203 y(memory)25 +b(consumed)g(b)m(y)g(the)h(paren)m(t)g(pro)s(cess)f(probably)e(can)j(b) +s(e)f(sw)m(ap)g(space)h(rather)f(than)g(ph)m(ysical)f(memory)-8 +b(.)125 2483 y(Resource)40 b(consumption)f(for)h(the)h(clien)m(t)f(or)g +(the)g(non-clien)m(t/serv)m(er)h Fr(cvs)e Fs(is)g(ev)m(en)i(more)g(mo)s +(dest|an)m(y)0 2608 y(mac)m(hine)30 b(with)f(enough)h(capacit)m(y)i(to) +f(run)e(the)h(op)s(erating)g(system)h(in)e(question)g(should)g(ha)m(v)m +(e)i(little)f(trouble.)0 3078 y Fk(4.6.2)63 b(Connecting)30 +b(with)g(rsh)125 3358 y Fs(CVS)e(uses)g(the)h(`)p Fn(rsh)p +Fs(')f(proto)s(col)h(to)h(p)s(erform)d(these)i(op)s(erations,)g(so)g +(the)g(remote)h(user)e(host)h(needs)f(to)i(ha)m(v)m(e)0 +3483 y(a)h(`)p Fn(.rhosts)p Fs(')e(\014le)g(whic)m(h)g(gran)m(ts)i +(access)h(to)f(the)g(lo)s(cal)e(user.)125 3763 y(F)-8 +b(or)25 b(example,)h(supp)s(ose)e(y)m(ou)h(are)g(the)h(user)e(`)p +Fn(mozart)p Fs(')g(on)g(the)i(lo)s(cal)e(mac)m(hine)g(`)p +Fn(anklet.grunge.com)p Fs(',)f(and)0 3887 y(the)28 b(serv)m(er)g(mac)m +(hine)g(is)f(`)p Fn(chainsaw.brickyard.com)p Fs('.)34 +b(On)27 b(c)m(hainsa)m(w,)h(put)f(the)i(follo)m(wing)d(line)g(in)m(to)i +(the)g(\014le)0 4012 y(`)p Fn(.rhosts)p Fs(')h(in)g(`)p +Fn(bach)p Fs(''s)h(home)g(directory:)240 4271 y Fn(anklet.grunge.com)91 +b(mozart)125 4551 y Fs(Then)29 b(test)i(that)g Fn(rsh)f +Fs(is)f(w)m(orking)h(with)240 4811 y Fn(rsh)47 b(-l)g(bach)g +(chainsaw.brickyard.com)41 b('echo)47 b($PATH')125 5091 +y Fs(Next)d(y)m(ou)g(ha)m(v)m(e)h(to)f(mak)m(e)g(sure)f(that)h +Fn(rsh)f Fs(will)e(b)s(e)i(able)g(to)h(\014nd)e(the)i(serv)m(er.)81 +b(Mak)m(e)45 b(sure)e(that)h(the)0 5215 y(path)32 b(whic)m(h)f +Fn(rsh)g Fs(prin)m(ted)g(in)g(the)h(ab)s(o)m(v)m(e)h(example)f +(includes)e(the)i(directory)g(con)m(taining)g(a)g(program)g(named)0 +5340 y Fn(cvs)37 b Fs(whic)m(h)g(is)g(the)i(serv)m(er.)64 +b(Y)-8 b(ou)39 b(need)e(to)i(set)g(the)f(path)g(in)f(`)p Fn(.bashrc)p Fs(',)i(`)p Fn(.cshrc)p Fs(',)g(etc.,)j(not)c(`)p -Fn(.login)p Fs(')f(or)0 2245 y(`)p Fn(.profile)p Fs('.)48 -b(Alternately)-8 b(,)34 b(y)m(ou)g(can)g(set)f(the)h(en)m(vironmen)m(t) -f(v)-5 b(ariable)32 b Fn(CVS_SERVER)f Fs(on)i(the)g(clien)m(t)g(mac)m -(hine)0 2369 y(to)e(the)g(\014lename)e(of)i(the)f(serv)m(er)h(y)m(ou)g -(w)m(an)m(t)g(to)g(use,)f(for)h(example)f(`)p Fn -(/usr/local/bin/cvs-1.6)p Fs('.)125 2694 y(There)f(is)h(no)g(need)g(to) -h(edit)f Fn(inetd.conf)e Fs(or)i(start)h(a)g Fr(cvs)e -Fs(serv)m(er)i(daemon.)125 3018 y(There)23 b(are)i(t)m(w)m(o)h(access)f -(metho)s(ds)f(that)h(y)m(ou)f(use)g(in)f(CVSR)m(OOT)g(for)h(rsh.)38 -b Fn(:server:)22 b Fs(sp)s(eci\014es)h(an)h(in)m(ternal)0 -3143 y(rsh)e(clien)m(t,)j(whic)m(h)d(is)g(supp)s(orted)f(only)i(b)m(y)g -(some)g(CVS)g(p)s(orts.)37 b Fn(:ext:)22 b Fs(sp)s(eci\014es)g(an)h -(external)g(rsh)g(program.)38 b(By)0 3267 y(default)32 -b(this)f(is)g Fn(rsh)h Fs(but)g(y)m(ou)h(ma)m(y)g(set)g(the)f -Fn(CVS_RSH)f Fs(en)m(vironmen)m(t)h(v)-5 b(ariable)31 -b(to)i(in)m(v)m(ok)m(e)h(another)e(program)0 3392 y(whic)m(h)37 -b(can)i(access)g(the)g(remote)g(serv)m(er)g(\(for)f(example,)i -Fn(remsh)d Fs(on)i(HP-UX)g(9)f(b)s(ecause)h Fn(rsh)e -Fs(is)g(something)0 3516 y(di\013eren)m(t\).)i(It)25 +Fn(.login)p Fs(')f(or)p eop +%%Page: 23 25 +23 24 bop 0 -116 a Fs(Chapter)30 b(4:)41 b(The)30 b(Rep)s(ository)2725 +b(23)0 366 y(`)p Fn(.profile)p Fs('.)48 b(Alternately)-8 +b(,)34 b(y)m(ou)g(can)g(set)f(the)h(en)m(vironmen)m(t)f(v)-5 +b(ariable)32 b Fn(CVS_SERVER)f Fs(on)i(the)g(clien)m(t)g(mac)m(hine)0 +491 y(to)e(the)g(\014lename)e(of)i(the)f(serv)m(er)h(y)m(ou)g(w)m(an)m +(t)g(to)g(use,)f(for)h(example)f(`)p Fn(/usr/local/bin/cvs-1.6)p +Fs('.)125 765 y(There)f(is)h(no)g(need)g(to)h(edit)f +Fn(inetd.conf)e Fs(or)i(start)h(a)g Fr(cvs)e Fs(serv)m(er)i(daemon.)125 +1039 y(There)23 b(are)i(t)m(w)m(o)h(access)f(metho)s(ds)f(that)h(y)m +(ou)f(use)g(in)f(CVSR)m(OOT)g(for)h(rsh.)38 b Fn(:server:)22 +b Fs(sp)s(eci\014es)h(an)h(in)m(ternal)0 1163 y(rsh)e(clien)m(t,)j +(whic)m(h)d(is)g(supp)s(orted)f(only)i(b)m(y)g(some)g(CVS)g(p)s(orts.) +37 b Fn(:ext:)22 b Fs(sp)s(eci\014es)g(an)h(external)g(rsh)g(program.) +38 b(By)0 1288 y(default)32 b(this)f(is)g Fn(rsh)h Fs(but)g(y)m(ou)h +(ma)m(y)g(set)g(the)f Fn(CVS_RSH)f Fs(en)m(vironmen)m(t)h(v)-5 +b(ariable)31 b(to)i(in)m(v)m(ok)m(e)h(another)e(program)0 +1413 y(whic)m(h)37 b(can)i(access)g(the)g(remote)g(serv)m(er)g(\(for)f +(example,)i Fn(remsh)d Fs(on)i(HP-UX)g(9)f(b)s(ecause)h +Fn(rsh)e Fs(is)g(something)0 1537 y(di\013eren)m(t\).)i(It)25 b(m)m(ust)g(b)s(e)g(a)h(program)f(whic)m(h)f(can)h(transmit)g(data)h (to)g(and)e(from)h(the)h(serv)m(er)f(without)g(mo)s(difying)0 -3641 y(it;)34 b(for)f(example)g(the)h(Windo)m(ws)e(NT)h +1662 y(it;)34 b(for)f(example)g(the)h(Windo)m(ws)e(NT)h Fn(rsh)g Fs(is)f(not)h(suitable)f(since)h(it)g(b)m(y)g(default)f -(translates)h(b)s(et)m(w)m(een)h(CRLF)0 3765 y(and)27 +(translates)h(b)s(et)m(w)m(een)h(CRLF)0 1786 y(and)27 b(LF.)g(The)g(OS/2)g(CVS)g(p)s(ort)g(has)g(a)g(hac)m(k)h(to)g(pass)f(`) p Fn(-b)p Fs(')g(to)h Fn(rsh)f Fs(to)h(get)g(around)e(this,)h(but)g -(since)g(this)f(could)0 3890 y(p)s(oten)m(tially)g(cause)j(programs)e -(for)g(programs)h(other)f(than)h(the)g(standard)f Fn(rsh)p -Fs(,)g(it)g(ma)m(y)i(c)m(hange)f(in)f(the)h(future.)0 -4014 y(If)e(y)m(ou)i(set)f Fn(CVS_RSH)e Fs(to)i Fn(SSH)f +(since)g(this)f(could)0 1911 y(p)s(oten)m(tially)h(cause)i(problems)e +(for)h(programs)g(other)g(than)g(the)h(standard)f Fn(rsh)p +Fs(,)g(it)g(ma)m(y)h(c)m(hange)g(in)e(the)i(future.)0 +2035 y(If)d(y)m(ou)i(set)f Fn(CVS_RSH)e Fs(to)i Fn(SSH)f Fs(or)h(some)h(other)f(rsh)e(replacemen)m(t,)k(the)e(instructions)d(in) -i(the)h(rest)g(of)g(this)f(section)0 4139 y(concerning)31 -b(`)p Fn(.rhosts)p Fs(')g(and)g(so)h(on)g(are)h(lik)m(ely)d(to)j(b)s(e) -e(incorrect;)i(consult)e(the)i(do)s(cumen)m(tation)e(for)h(y)m(our)g -(rsh)0 4263 y(replacemen)m(t.)125 4588 y(Con)m(tin)m(uing)43 +i(the)h(rest)g(of)g(this)f(section)0 2160 y(concerning)33 +b(`)p Fn(.rhosts)p Fs(')g(and)g(so)h(on)g(are)g(lik)m(ely)f(to)h(b)s(e) +g(inapplicable;)e(consult)h(the)i(do)s(cumen)m(tation)e(for)h(y)m(our)0 +2284 y(rsh)29 b(replacemen)m(t.)125 2558 y(Con)m(tin)m(uing)43 b(our)j(example,)j(supp)s(osing)43 b(y)m(ou)j(w)m(an)m(t)g(to)h(access) g(the)f(mo)s(dule)e(`)p Fn(foo)p Fs(')h(in)f(the)i(rep)s(ository)0 -4712 y(`)p Fn(/usr/local/cvsroot/)p Fs(',)26 b(on)k(mac)m(hine)g(`)p +2683 y(`)p Fn(/usr/local/cvsroot/)p Fs(',)26 b(on)k(mac)m(hine)g(`)p Fn(chainsaw.brickyard.com)p Fs(',)25 b(y)m(ou)31 b(are)g(ready)f(to)h -(go:)240 5016 y Fn(cvs)47 b(-d)g(:ext:bach@chainsaw.bricky)o(ard)o +(go:)240 2936 y Fn(cvs)47 b(-d)g(:ext:bach@chainsaw.bricky)o(ard)o (.com)o(:/us)o(r/l)o(ocal)o(/cvs)o(roo)o(t)42 b(checkout)j(foo)125 -5340 y Fs(\(The)30 b(`)p Fn(bach@)p Fs(')f(can)i(b)s(e)f(omitted)g(if)f +3210 y Fs(\(The)30 b(`)p Fn(bach@)p Fs(')f(can)i(b)s(e)f(omitted)g(if)f (the)i(username)f(is)f(the)i(same)f(on)h(b)s(oth)e(the)i(lo)s(cal)f -(and)f(remote)j(hosts.\))p eop -%%Page: 23 25 -23 24 bop 0 -116 a Fs(Chapter)30 b(4:)41 b(The)30 b(Rep)s(ository)2725 -b(23)0 366 y Fk(4.6.2)63 b(Direct)29 b(connection)i(with)f(passw)m(ord) -h(authen)m(tication)125 640 y Fs(The)k Fr(cvs)f Fs(clien)m(t)h(can)h -(also)g(connect)g(to)h(the)f(serv)m(er)g(using)e(a)i(passw)m(ord)f -(proto)s(col.)56 b(This)34 b(is)g(particularly)0 765 -y(useful)d(if)g(using)g Fn(rsh)g Fs(is)g(not)i(feasible)e(\(for)i -(example,)f(the)h(serv)m(er)f(is)g(b)s(ehind)d(a)k(\014rew)m(all\),)f -(and)g(Kerb)s(eros)f(also)0 890 y(is)e(not)i(a)m(v)-5 -b(ailable.)125 1163 y(T)d(o)38 b(use)g(this)f(metho)s(d,)j(it)d(is)h -(necessary)g(to)h(mak)m(e)g(some)g(adjustmen)m(ts)f(on)g(b)s(oth)f(the) -h(serv)m(er)h(and)e(clien)m(t)0 1288 y(sides.)0 1691 -y Fk(4.6.2.1)63 b(Setting)31 b(up)f(the)h(serv)m(er)f(for)g(passw)m -(ord)h(authen)m(tication)125 1965 y Fs(On)j(the)i(serv)m(er)g(side,)f -(the)h(\014le)f(`)p Fn(/etc/inetd.conf)p Fs(')d(needs)j(to)h(b)s(e)f -(edited)f(so)i Fn(inetd)e Fs(kno)m(ws)i(to)g(run)e(the)0 -2090 y(command)22 b Fn(cvs)30 b(pserver)20 b Fs(when)h(it)h(receiv)m -(es)h(a)g(connection)g(on)f(the)g(righ)m(t)g(p)s(ort.)38 -b(By)23 b(default,)g(the)f(p)s(ort)g(n)m(um)m(b)s(er)0 -2214 y(is)i(2401;)k(it)d(w)m(ould)e(b)s(e)h(di\013eren)m(t)g(if)g(y)m -(our)h(clien)m(t)f(w)m(ere)h(compiled)e(with)h Fn(CVS_AUTH_PORT)d -Fs(de\014ned)i(to)i(something)0 2339 y(else,)30 b(though.)125 -2613 y(If)25 b(y)m(our)h Fn(inetd)e Fs(allo)m(ws)i(ra)m(w)g(p)s(ort)f -(n)m(um)m(b)s(ers)g(in)f(`)p Fn(/etc/inetd.conf)p Fs(',)g(then)h(the)h -(follo)m(wing)f(\(all)g(on)h(a)g(single)0 2737 y(line)j(in)g(`)p -Fn(inetd.conf)p Fs('\))f(should)h(b)s(e)g(su\016cien)m(t:)240 -2990 y Fn(2401)94 b(stream)g(tcp)h(nowait)f(root)g(/usr/local/bin/cvs) -240 3094 y(cvs)47 b(-b)g(/usr/local/bin)d(pserver)125 -3368 y Fs(The)27 b(`)p Fn(-b)p Fs(')g(option)h(sp)s(eci\014es)e(the)i -(directory)f(whic)m(h)g(con)m(tains)h(the)g Fr(r)n(cs)e -Fs(binaries)g(on)i(the)g(serv)m(er.)40 b(Y)-8 b(ou)28 -b(could)0 3493 y(also)i(use)g(the)h(`)p Fn(-T)p Fs(')f(option)g(to)h -(sp)s(ecify)e(a)i(temp)s(orary)f(directory)-8 b(.)125 -3767 y(If)36 b(y)m(our)g Fn(inetd)g Fs(w)m(an)m(ts)h(a)g(sym)m(b)s -(olic)e(service)i(name)f(instead)g(of)h(a)g(ra)m(w)g(p)s(ort)f(n)m(um)m -(b)s(er,)h(then)g(put)f(this)f(in)0 3891 y(`)p Fn(/etc/services)p -Fs(':)240 4144 y Fn(cvspserver)284 b(2401/tcp)125 4418 +(and)f(remote)j(hosts.\))0 3615 y Fk(4.6.3)63 b(Direct)29 +b(connection)i(with)f(passw)m(ord)h(authen)m(tication)125 +3889 y Fs(The)k Fr(cvs)f Fs(clien)m(t)h(can)h(also)g(connect)g(to)h +(the)f(serv)m(er)g(using)e(a)i(passw)m(ord)f(proto)s(col.)56 +b(This)34 b(is)g(particularly)0 4013 y(useful)d(if)g(using)g +Fn(rsh)g Fs(is)g(not)i(feasible)e(\(for)i(example,)f(the)h(serv)m(er)f +(is)g(b)s(ehind)d(a)k(\014rew)m(all\),)f(and)g(Kerb)s(eros)f(also)0 +4138 y(is)e(not)i(a)m(v)-5 b(ailable.)125 4412 y(T)d(o)38 +b(use)g(this)f(metho)s(d,)j(it)d(is)h(necessary)g(to)h(mak)m(e)g(some)g +(adjustmen)m(ts)f(on)g(b)s(oth)f(the)h(serv)m(er)h(and)e(clien)m(t)0 +4537 y(sides.)0 4941 y Fk(4.6.3.1)63 b(Setting)31 b(up)f(the)h(serv)m +(er)f(for)g(passw)m(ord)h(authen)m(tication)125 5215 +y Fs(On)j(the)i(serv)m(er)g(side,)f(the)h(\014le)f(`)p +Fn(/etc/inetd.conf)p Fs(')d(needs)j(to)h(b)s(e)f(edited)f(so)i +Fn(inetd)e Fs(kno)m(ws)i(to)g(run)e(the)0 5340 y(command)22 +b Fn(cvs)30 b(pserver)20 b Fs(when)h(it)h(receiv)m(es)h(a)g(connection) +g(on)f(the)g(righ)m(t)g(p)s(ort.)38 b(By)23 b(default,)g(the)f(p)s(ort) +g(n)m(um)m(b)s(er)p eop +%%Page: 24 26 +24 25 bop 0 -116 a Fs(24)2411 b(CVS|Concurren)m(t)29 +b(V)-8 b(ersions)30 b(System)0 366 y(is)24 b(2401;)k(it)d(w)m(ould)e(b) +s(e)h(di\013eren)m(t)g(if)g(y)m(our)h(clien)m(t)f(w)m(ere)h(compiled)e +(with)h Fn(CVS_AUTH_PORT)d Fs(de\014ned)i(to)i(something)0 +491 y(else,)30 b(though.)125 771 y(If)25 b(y)m(our)h +Fn(inetd)e Fs(allo)m(ws)i(ra)m(w)g(p)s(ort)f(n)m(um)m(b)s(ers)g(in)f(`) +p Fn(/etc/inetd.conf)p Fs(',)g(then)h(the)h(follo)m(wing)f(\(all)g(on)h +(a)g(single)0 896 y(line)j(in)g(`)p Fn(inetd.conf)p Fs('\))f(should)h +(b)s(e)g(su\016cien)m(t:)240 1156 y Fn(2401)94 b(stream)g(tcp)h(nowait) +f(root)g(/usr/local/bin/cvs)240 1259 y(cvs)47 b(-b)g(/usr/local/bin)d +(pserver)125 1540 y Fs(The)27 b(`)p Fn(-b)p Fs(')g(option)h(sp)s +(eci\014es)e(the)i(directory)f(whic)m(h)g(con)m(tains)h(the)g +Fr(r)n(cs)e Fs(binaries)g(on)i(the)g(serv)m(er.)40 b(Y)-8 +b(ou)28 b(could)0 1664 y(also)i(use)g(the)h(`)p Fn(-T)p +Fs(')f(option)g(to)h(sp)s(ecify)e(a)i(temp)s(orary)f(directory)-8 +b(.)125 1945 y(If)36 b(y)m(our)g Fn(inetd)g Fs(w)m(an)m(ts)h(a)g(sym)m +(b)s(olic)e(service)i(name)f(instead)g(of)h(a)g(ra)m(w)g(p)s(ort)f(n)m +(um)m(b)s(er,)h(then)g(put)f(this)f(in)0 2069 y(`)p Fn(/etc/services)p +Fs(':)240 2329 y Fn(cvspserver)284 b(2401/tcp)125 2609 y Fs(and)29 b(put)h Fn(cvspserver)e Fs(instead)h(of)i -Fn(2401)e Fs(in)g(`)p Fn(inetd.conf)p Fs('.)125 4692 +Fn(2401)e Fs(in)g(`)p Fn(inetd.conf)p Fs('.)125 2890 y(Once)k(the)g(ab)s(o)m(v)m(e)h(is)e(tak)m(en)i(care)g(of,)g(restart)g (y)m(our)f Fn(inetd)p Fs(,)g(or)g(do)g(whatev)m(er)h(is)e(necessary)h -(to)h(force)g(it)e(to)0 4817 y(reread)e(its)g(initialization)d -(\014les.)125 5091 y(Because)46 b(the)f(clien)m(t)g(stores)h(and)e +(to)h(force)g(it)e(to)0 3014 y(reread)e(its)g(initialization)d +(\014les.)125 3295 y(Because)46 b(the)f(clien)m(t)g(stores)h(and)e (transmits)g(passw)m(ords)g(in)g(cleartext)i(\(almost|see)h(Section)d -(4.6.2.3)0 5215 y([P)m(assw)m(ord)27 b(authen)m(tication)h(securit)m +(4.6.3.3)0 3419 y([P)m(assw)m(ord)27 b(authen)m(tication)h(securit)m (y],)f(page)h(26,)h(for)e(details\),)g(a)g(separate)h Fr(cvs)e Fs(passw)m(ord)h(\014le)f(ma)m(y)h(b)s(e)f(used,)0 -5340 y(so)35 b(p)s(eople)f(don't)g(compromise)h(their)e(regular)h +3544 y(so)35 b(p)s(eople)f(don't)g(compromise)h(their)e(regular)h (passw)m(ords)g(when)g(they)h(access)h(the)f(rep)s(ository)-8 -b(.)53 b(This)33 b(\014le)h(is)p eop -%%Page: 24 26 -24 25 bop 0 -116 a Fs(24)2411 b(CVS|Concurren)m(t)29 -b(V)-8 b(ersions)30 b(System)0 366 y(`)p Fn($CVSROOT/CVSROOT/passwd)p -Fs(')h(\(see)39 b(Section)e(4.3)h([In)m(tro)g(administrativ)m(e)e +b(.)53 b(This)33 b(\014le)h(is)0 3668 y(`)p Fn($CVSROOT/CVSROOT/passwd) +p Fs(')d(\(see)39 b(Section)e(4.3)h([In)m(tro)g(administrativ)m(e)e (\014les],)i(page)g(19\).)63 b(Its)37 b(format)h(is)0 -491 y(similar)25 b(to)k(`)p Fn(/etc/passwd)p Fs(',)e(except)i(that)f +3793 y(similar)25 b(to)k(`)p Fn(/etc/passwd)p Fs(',)e(except)i(that)f (it)g(only)f(has)h(t)m(w)m(o)i(\014elds,)d(username)g(and)h(passw)m -(ord.)39 b(F)-8 b(or)29 b(example:)240 760 y Fn(bach:ULtgRLXo7NRxs)240 -864 y(cwang:1sOp854gDF3DY)125 1153 y Fs(The)k(passw)m(ord)g(is)h +(ord.)39 b(F)-8 b(or)29 b(example:)240 4053 y Fn(bach:ULtgRLXo7NRxs)240 +4156 y(cwang:1sOp854gDF3DY)125 4437 y Fs(The)k(passw)m(ord)g(is)h (encrypted)f(according)h(to)h(the)f(standard)f(Unix)g Fn(crypt\(\))f Fs(function,)i(so)h(it)e(is)g(p)s(ossible)0 -1278 y(to)e(paste)g(in)e(passw)m(ords)h(directly)f(from)h(regular)f -(Unix)g(`)p Fn(passwd)p Fs(')h(\014les.)125 1568 y(When)35 +4561 y(to)e(paste)g(in)e(passw)m(ords)h(directly)f(from)h(regular)f +(Unix)g(`)p Fn(passwd)p Fs(')h(\014les.)125 4842 y(When)35 b(authen)m(ticating)h(a)g(passw)m(ord,)h(the)f(serv)m(er)g(\014rst)f(c) m(hec)m(ks)j(for)d(the)h(user)f(in)g(the)h Fr(cvs)f Fs(`)p -Fn(passwd)p Fs(')g(\014le.)0 1692 y(If)f(it)g(\014nds)e(the)j(user,)g +Fn(passwd)p Fs(')g(\014le.)0 4966 y(If)f(it)g(\014nds)e(the)j(user,)g (it)f(compares)h(against)f(that)h(passw)m(ord.)52 b(If)34 b(it)g(do)s(es)g(not)g(\014nd)f(the)i(user,)g(or)f(if)f(the)i -Fr(cvs)0 1817 y Fs(`)p Fn(passwd)p Fs(')e(\014le)g(do)s(es)h(not)h +Fr(cvs)0 5091 y Fs(`)p Fn(passwd)p Fs(')e(\014le)g(do)s(es)h(not)h (exist,)g(then)f(the)h(serv)m(er)f(tries)g(to)h(matc)m(h)g(the)g(passw) -m(ord)e(using)g(the)i(system's)f(user-)0 1941 y(lo)s(okup)28 +m(ord)e(using)g(the)i(system's)f(user-)0 5215 y(lo)s(okup)28 b(routine.)39 b(When)29 b(using)f(the)h Fr(cvs)f Fs(`)p Fn(passwd)p Fs(')g(\014le,)h(the)h(serv)m(er)f(runs)f(under)f(as)j(the) -f(username)g(sp)s(eci\014ed)0 2066 y(in)k(the)h(the)h(third)d(argumen)m +f(username)g(sp)s(eci\014ed)0 5340 y(in)k(the)h(the)h(third)d(argumen)m (t)j(in)e(the)i(en)m(try)-8 b(,)36 b(or)e(as)h(the)f(\014rst)g(argumen) -m(t)g(if)g(there)g(is)g(no)g(third)e(argumen)m(t)j(\(in)0 -2190 y(this)f(w)m(a)m(y)j Fr(cvs)d Fs(allo)m(ws)h(imaginary)f +m(t)g(if)g(there)g(is)g(no)g(third)e(argumen)m(t)j(\(in)p +eop +%%Page: 25 27 +25 26 bop 0 -116 a Fs(Chapter)30 b(4:)41 b(The)30 b(Rep)s(ository)2725 +b(25)0 366 y(this)34 b(w)m(a)m(y)j Fr(cvs)d Fs(allo)m(ws)h(imaginary)f (usernames)g(pro)m(vided)g(the)i Fr(cvs)e Fs(`)p Fn(passwd)p -Fs(')g(\014le)h(indicates)f(corresp)s(onding)0 2315 y(v)-5 +Fs(')g(\014le)h(indicates)f(corresp)s(onding)0 491 y(v)-5 b(alid)27 b(system)i(usernames\).)40 b(In)28 b(an)m(y)h(case,)i Fr(cvs)d Fs(will)e(ha)m(v)m(e)k(no)f(privileges)d(whic)m(h)i(the)h(\(v) --5 b(alid\))28 b(user)g(w)m(ould)g(not)0 2439 y(ha)m(v)m(e.)125 -2729 y(It)36 b(is)f(p)s(ossible)f(to)j(\\map")f(cvs-sp)s(eci\014c)g +-5 b(alid\))28 b(user)g(w)m(ould)g(not)0 616 y(ha)m(v)m(e.)125 +894 y(It)36 b(is)f(p)s(ossible)f(to)j(\\map")f(cvs-sp)s(eci\014c)g (usernames)f(on)m(to)i(system)g(usernames)e(\(i.e.,)j(on)m(to)g(system) -e(login)0 2854 y(names\))k(in)e(the)h(`)p Fn($CVSROOT/CVSROOT/passwd)p +e(login)0 1019 y(names\))k(in)e(the)h(`)p Fn($CVSROOT/CVSROOT/passwd)p Fs(')34 b(\014le)k(b)m(y)i(app)s(ending)c(a)k(colon)g(and)e(the)i -(system)g(username)0 2978 y(after)31 b(the)f(passw)m(ord.)40 -b(F)-8 b(or)32 b(example:)240 3247 y Fn(cvs:ULtgRLXo7NRxs:kfogel)240 -3351 y(generic:1sOp854gDF3DY:sp)o(wang)240 3455 y -(anyone:1sOp854gDF3DY:spw)o(ang)125 3744 y Fs(Th)m(us,)k(someone)g +(system)g(username)0 1144 y(after)31 b(the)f(passw)m(ord.)40 +b(F)-8 b(or)32 b(example:)240 1402 y Fn(cvs:ULtgRLXo7NRxs:kfogel)240 +1505 y(generic:1sOp854gDF3DY:sp)o(wang)240 1609 y +(anyone:1sOp854gDF3DY:spw)o(ang)125 1888 y Fs(Th)m(us,)k(someone)g (remotely)g(accessing)g(the)f(rep)s(ository)g(on)g(`)p Fn(chainsaw.brickyard.com)p Fs(')30 b(with)k(the)i(fol-)0 -3869 y(lo)m(wing)29 b(command:)240 4138 y Fn(cvs)47 b(-d)g +2013 y(lo)m(wing)29 b(command:)240 2271 y Fn(cvs)47 b(-d)g (:pserver:cvs@chainsaw.bri)o(cky)o(ard.)o(com:)o(/us)o(r/lo)o(cal/)o -(cvs)o(root)41 b(checkout)46 b(foo)125 4428 y Fs(w)m(ould)24 +(cvs)o(root)41 b(checkout)46 b(foo)125 2550 y Fs(w)m(ould)24 b(end)h(up)g(running)d(the)k(serv)m(er)g(under)e(the)i(system)g(iden)m (tit)m(y)f(kfogel,)i(assuming)d(successful)h(authen)m(ti-)0 -4552 y(cation.)41 b(Ho)m(w)m(ev)m(er,)31 b(the)e(remote)h(user)f(w)m +2674 y(cation.)41 b(Ho)m(w)m(ev)m(er,)31 b(the)e(remote)h(user)f(w)m (ould)f(not)h(necessarily)f(need)g(to)i(kno)m(w)f(kfogel's)h(system)f -(passw)m(ord,)g(as)0 4677 y(the)d(`)p Fn($CVSROOT/CVSROOT/passwd)p +(passw)m(ord,)g(as)0 2799 y(the)d(`)p Fn($CVSROOT/CVSROOT/passwd)p Fs(')19 b(\014le)25 b(migh)m(t)g(con)m(tain)h(a)g(di\013eren)m(t)f (passw)m(ord,)h(used)f(only)g(for)g Fr(cvs)p Fs(.)38 -b(And)25 b(as)0 4801 y(the)31 b(example)f(ab)s(o)m(v)m(e)h(indicates,)f +b(And)25 b(as)0 2923 y(the)31 b(example)f(ab)s(o)m(v)m(e)h(indicates,)f (it)g(is)f(p)s(ermissible)e(to)k(map)f(m)m(ultiple)e(cvs)j(usernames)e -(on)m(to)j(a)f(single)e(system)0 4926 y(username.)125 -5215 y(This)f(feature)j(is)e(designed)g(to)i(allo)m(w)f(p)s(eople)f +(on)m(to)j(a)f(single)e(system)0 3048 y(username.)125 +3327 y(This)f(feature)j(is)e(designed)g(to)i(allo)m(w)f(p)s(eople)f (rep)s(ository)h(access)h(without)f(full)e(system)i(access)i(\(in)d -(partic-)0 5340 y(ular,)i(see)i(See)f(Section)f(4.7)i([Read-only)f -(access],)i(page)f(27\);)h(ho)m(w)m(ev)m(er,)g(also)d(See)i(Section)e -(4.6.2.3)k([P)m(assw)m(ord)p eop -%%Page: 25 27 -25 26 bop 0 -116 a Fs(Chapter)30 b(4:)41 b(The)30 b(Rep)s(ository)2725 -b(25)0 366 y(authen)m(tication)42 b(securit)m(y],)i(page)e(26.)74 -b(An)m(y)42 b(sort)f(of)h(rep)s(ository)e(access)j(v)m(ery)f(lik)m(ely) -d(implies)g(a)j(degree)g(of)0 491 y(general)30 b(system)h(access)h(as)e -(w)m(ell.)125 781 y(Righ)m(t)36 b(no)m(w,)i(the)f(only)e(w)m(a)m(y)j -(to)f(put)f(a)g(passw)m(ord)g(in)f(the)i Fr(cvs)e Fs(`)p -Fn(passwd)p Fs(')h(\014le)f(is)h(to)h(paste)g(it)f(there)g(from)0 -905 y(somewhere)30 b(else.)41 b(Someda)m(y)-8 b(,)31 +(partic-)0 3451 y(ular,)i(see)i(See)f(Section)f(4.7)i([Read-only)f +(access],)i(page)f(28\);)h(ho)m(w)m(ev)m(er,)g(also)d(See)i(Section)e +(4.6.3.3)k([P)m(assw)m(ord)0 3576 y(authen)m(tication)42 +b(securit)m(y],)i(page)e(26.)74 b(An)m(y)42 b(sort)f(of)h(rep)s +(ository)e(access)j(v)m(ery)f(lik)m(ely)d(implies)g(a)j(degree)g(of)0 +3700 y(general)30 b(system)h(access)h(as)e(w)m(ell.)125 +3979 y(Righ)m(t)36 b(no)m(w,)i(the)f(only)e(w)m(a)m(y)j(to)f(put)f(a)g +(passw)m(ord)g(in)f(the)i Fr(cvs)e Fs(`)p Fn(passwd)p +Fs(')h(\014le)f(is)h(to)h(paste)g(it)f(there)g(from)0 +4104 y(somewhere)30 b(else.)41 b(Someda)m(y)-8 b(,)31 b(there)g(ma)m(y)g(b)s(e)f(a)g Fn(cvs)g(passwd)f Fs(command.)0 -1464 y Fk(4.6.2.2)63 b(Using)32 b(the)e(clien)m(t)f(with)h(passw)m(ord) -h(authen)m(tication)125 1754 y Fs(Before)i(connecting)f(to)h(the)g +4563 y Fk(4.6.3.2)63 b(Using)32 b(the)e(clien)m(t)f(with)h(passw)m(ord) +h(authen)m(tication)125 4842 y Fs(Before)i(connecting)f(to)h(the)g (serv)m(er,)g(the)f(clien)m(t)g(m)m(ust)g Fo(log)h(in)e Fs(with)g(the)h(command)g Fn(cvs)e(login)p Fs(.)45 b(Logging)0 -1878 y(in)26 b(v)m(eri\014es)h(a)g(passw)m(ord)g(with)f(the)h(serv)m +4966 y(in)26 b(v)m(eri\014es)h(a)g(passw)m(ord)g(with)f(the)h(serv)m (er,)i(and)d(also)h(records)g(the)h(passw)m(ord)e(for)h(later)h -(transactions)f(with)f(the)0 2003 y(serv)m(er.)55 b(The)35 +(transactions)f(with)f(the)0 5091 y(serv)m(er.)55 b(The)35 b Fn(cvs)30 b(login)j Fs(command)i(needs)g(to)h(kno)m(w)f(the)g (username,)h(serv)m(er)g(hostname,)h(and)d(full)f(rep)s(osi-)0 -2128 y(tory)e(path,)h(and)e(it)h(gets)h(this)d(information)h(from)g +5215 y(tory)e(path,)h(and)e(it)h(gets)h(this)d(information)h(from)g (the)i(rep)s(ository)e(argumen)m(t)h(or)g(the)g Fn(CVSROOT)e -Fs(en)m(vironmen)m(t)0 2252 y(v)-5 b(ariable.)125 2542 -y Fn(cvs)29 b(login)g Fs(is)g(in)m(teractiv)m(e)j(|)e(it)g(prompts)f -(for)h(a)h(passw)m(ord:)240 2811 y Fn(cvs)47 b(-d)g -(:pserver:bach@chainsaw.br)o(ick)o(yard)o(.com)o(:/u)o(sr/l)o(ocal)o -(/cv)o(sroo)o(t)42 b(login)240 2915 y(CVS)47 b(password:)125 -3205 y Fs(The)32 b(passw)m(ord)f(is)h(c)m(hec)m(k)m(ed)i(with)d(the)i -(serv)m(er;)h(if)e(it)g(is)f(correct,)k(the)d Fn(login)f -Fs(succeeds,)j(else)e(it)g(fails,)g(com-)0 3329 y(plaining)27 -b(that)k(the)g(passw)m(ord)f(w)m(as)g(incorrect.)125 -3619 y(Once)i(y)m(ou)h(ha)m(v)m(e)g(logged)g(in,)f(y)m(ou)g(can)h +Fs(en)m(vironmen)m(t)0 5340 y(v)-5 b(ariable.)p eop +%%Page: 26 28 +26 27 bop 0 -116 a Fs(26)2411 b(CVS|Concurren)m(t)29 +b(V)-8 b(ersions)30 b(System)125 366 y Fn(cvs)f(login)g +Fs(is)g(in)m(teractiv)m(e)j(|)e(it)g(prompts)f(for)h(a)h(passw)m(ord:) +240 636 y Fn(cvs)47 b(-d)g(:pserver:bach@chainsaw.br)o(ick)o(yard)o +(.com)o(:/u)o(sr/l)o(ocal)o(/cv)o(sroo)o(t)42 b(login)240 +739 y(CVS)47 b(password:)125 1029 y Fs(The)32 b(passw)m(ord)f(is)h(c)m +(hec)m(k)m(ed)i(with)d(the)i(serv)m(er;)h(if)e(it)g(is)f(correct,)k +(the)d Fn(login)f Fs(succeeds,)j(else)e(it)g(fails,)g(com-)0 +1154 y(plaining)27 b(that)k(the)g(passw)m(ord)f(w)m(as)g(incorrect.)125 +1444 y(Once)i(y)m(ou)h(ha)m(v)m(e)g(logged)g(in,)f(y)m(ou)g(can)h (force)g Fr(cvs)e Fs(to)i(connect)h(directly)d(to)i(the)f(serv)m(er)h -(and)f(authen)m(ticate)0 3744 y(with)d(the)i(stored)f(passw)m(ord:)240 -4013 y Fn(cvs)47 b(-d)g(:pserver:bach@chainsaw.br)o(ick)o(yard)o(.com)o +(and)f(authen)m(ticate)0 1568 y(with)d(the)i(stored)f(passw)m(ord:)240 +1837 y Fn(cvs)47 b(-d)g(:pserver:bach@chainsaw.br)o(ick)o(yard)o(.com)o (:/u)o(sr/l)o(ocal)o(/cv)o(sroo)o(t)42 b(checkout)j(foo)125 -4303 y Fs(The)30 b(`)p Fn(:pserver:)p Fs(')e(is)i(necessary)g(b)s +2127 y Fs(The)30 b(`)p Fn(:pserver:)p Fs(')e(is)i(necessary)g(b)s (ecause)h(without)e(it,)i Fr(cvs)e Fs(will)f(assume)i(it)g(should)f -(use)h Fn(rsh)g Fs(to)h(connect)0 4427 y(with)g(the)i(serv)m(er)g -(\(see)h(Section)f(4.6.1)h([Connecting)f(via)f(rsh],)h(page)h(21\).)49 +(use)h Fn(rsh)g Fs(to)h(connect)0 2252 y(with)g(the)i(serv)m(er)g +(\(see)h(Section)f(4.6.2)h([Connecting)f(via)f(rsh],)h(page)h(22\).)49 b(\(Once)33 b(y)m(ou)g(ha)m(v)m(e)h(a)f(w)m(orking)f(cop)m(y)0 -4552 y(c)m(hec)m(k)m(ed)h(out)d(and)g(are)h(running)d +2376 y(c)m(hec)m(k)m(ed)h(out)d(and)g(are)h(running)d Fr(cvs)i Fs(commands)g(from)g(within)e(it,)j(there)f(is)g(no)h(longer)f -(an)m(y)h(need)f(to)h(sp)s(ecify)0 4676 y(the)g(rep)s(ository)e +(an)m(y)h(need)f(to)h(sp)s(ecify)0 2501 y(the)g(rep)s(ository)e (explicitly)-8 b(,)28 b(b)s(ecause)j Fr(cvs)e Fs(records)h(it)g(in)f (the)i(w)m(orking)f(cop)m(y's)h(`)p Fn(CVS)p Fs(')f(sub)s(directory)-8 -b(.\))125 4966 y(P)m(assw)m(ords)25 b(are)h(stored)f(b)m(y)h(default)e +b(.\))125 2791 y(P)m(assw)m(ords)25 b(are)h(stored)f(b)m(y)h(default)e (in)g(the)i(\014le)f(`)p Fn($HOME/.cvspass)p Fs('.)35 -b(Its)26 b(format)f(is)g(h)m(uman-readable,)h(but)0 5091 +b(Its)26 b(format)f(is)g(h)m(uman-readable,)h(but)0 2915 y(don't)32 b(edit)g(it)f(unless)f(y)m(ou)j(kno)m(w)f(what)g(y)m(ou)g (are)h(doing.)44 b(The)32 b(passw)m(ords)f(are)i(not)f(stored)g(in)f -(cleartext,)j(but)0 5215 y(are)g(trivially)d(enco)s(ded)j(to)g(protect) +(cleartext,)j(but)0 3040 y(are)g(trivially)d(enco)s(ded)j(to)g(protect) h(them)f(from)f Fn(")p Fs(inno)s(cen)m(t)p Fn(")g Fs(compromise)g -(\(i.e.,)i(inadv)m(erten)m(tly)e(b)s(eing)g(seen)0 5340 +(\(i.e.,)i(inadv)m(erten)m(tly)e(b)s(eing)g(seen)0 3164 y(b)m(y)d(a)h(system)g(administrator)d(who)i(happ)s(ens)f(to)i(lo)s(ok) -f(at)h(that)g(\014le\).)p eop -%%Page: 26 28 -26 27 bop 0 -116 a Fs(26)2411 b(CVS|Concurren)m(t)29 -b(V)-8 b(ersions)30 b(System)125 366 y(The)j Fn(CVS_PASSFILE)e -Fs(en)m(vironmen)m(t)i(v)-5 b(ariable)33 b(o)m(v)m(errides)h(this)e -(default.)51 b(If)33 b(y)m(ou)i(use)e(this)g(v)-5 b(ariable,)34 -b(mak)m(e)0 491 y(sure)f(y)m(ou)h(set)f(it)g Fo(b)s(efore)39 -b Fn(cvs)29 b(login)j Fs(is)h(run.)48 b(If)33 b(y)m(ou)h(w)m(ere)g(to)g -(set)g(it)f(after)h(running)c Fn(cvs)g(login)p Fs(,)j(then)g(later)0 -616 y Fr(cvs)c Fs(commands)h(w)m(ould)g(b)s(e)f(unable)g(to)i(lo)s(ok)f -(up)g(the)g(passw)m(ord)g(for)g(transmission)e(to)j(the)g(serv)m(er.)0 -1127 y Fk(4.6.2.3)63 b(Securit)m(y)30 b(considerations)h(with)f(passw)m -(ord)h(authen)m(tication)125 1412 y Fs(The)22 b(passw)m(ords)h(are)g +f(at)h(that)g(\014le\).)125 3454 y(The)19 b(passw)m(ord)h(for)g(the)g +(curren)m(tly)g(c)m(ho)s(osen)g(remote)i(rep)s(ository)d(can)h(b)s(e)g +(remo)m(v)m(ed)h(from)f(the)h(CVS)p 3544 3454 28 4 v +32 w(P)-8 b(ASSFILE)p 4006 3472 42 81 v 0 3579 a(b)m(y)30 +b(using)f(the)i Fn(cvs)e(logout)g Fs(command.)125 3869 +y(The)k Fn(CVS_PASSFILE)e Fs(en)m(vironmen)m(t)i(v)-5 +b(ariable)33 b(o)m(v)m(errides)h(this)e(default.)51 b(If)33 +b(y)m(ou)i(use)e(this)g(v)-5 b(ariable,)34 b(mak)m(e)0 +3993 y(sure)f(y)m(ou)h(set)f(it)g Fo(b)s(efore)39 b Fn(cvs)29 +b(login)j Fs(is)h(run.)48 b(If)33 b(y)m(ou)h(w)m(ere)g(to)g(set)g(it)f +(after)h(running)c Fn(cvs)g(login)p Fs(,)j(then)g(later)0 +4118 y Fr(cvs)c Fs(commands)h(w)m(ould)g(b)s(e)f(unable)g(to)i(lo)s(ok) +f(up)g(the)g(passw)m(ord)g(for)g(transmission)e(to)j(the)g(serv)m(er.)0 +4676 y Fk(4.6.3.3)63 b(Securit)m(y)30 b(considerations)h(with)f(passw)m +(ord)h(authen)m(tication)125 4966 y Fs(The)22 b(passw)m(ords)h(are)g (stored)h(on)f(the)g(clien)m(t)g(side)f(in)g(a)i(trivial)d(enco)s(ding) -h(of)i(the)f(cleartext,)j(and)d(transmitted)0 1537 y(in)36 +h(of)i(the)f(cleartext,)j(and)d(transmitted)0 5091 y(in)36 b(the)h(same)g(enco)s(ding.)59 b(The)37 b(enco)s(ding)f(is)f(done)i (only)f(to)i(prev)m(en)m(t)f(inadv)m(erten)m(t)g(passw)m(ord)g -(compromises)0 1661 y(\(i.e.,)k(a)e(system)g(administrator)d(acciden)m +(compromises)0 5215 y(\(i.e.,)k(a)e(system)g(administrator)d(acciden)m (tally)i(lo)s(oking)g(at)h(the)f(\014le\),)j(and)c(will)f(not)j(prev)m -(en)m(t)g(ev)m(en)g(a)g(naiv)m(e)0 1786 y(attac)m(k)m(er)33 -b(from)d(gaining)f(the)i(passw)m(ord.)125 2070 y(The)h(separate)j -Fr(cvs)d Fs(passw)m(ord)h(\014le)g(\(see)h(Section)f(4.6.2.1)j([P)m -(assw)m(ord)e(authen)m(tication)g(serv)m(er],)h(page)f(23\))0 -2195 y(allo)m(ws)d(p)s(eople)f(to)i(use)f(a)h(di\013eren)m(t)f(passw)m -(ord)f(for)h(rep)s(ository)g(access)h(than)f(for)h(login)e(access.)45 -b(On)30 b(the)i(other)0 2319 y(hand,)42 b(once)e(a)h(user)e(has)h -(access)h(to)g(the)f(rep)s(ository)-8 b(,)42 b(she)d(can)i(execute)g -(programs)f(on)f(the)i(serv)m(er)f(system)0 2444 y(through)e(a)i(v)-5 -b(ariet)m(y)40 b(of)f(means.)67 b(Th)m(us,)40 b(rep)s(ository)f(access) -h(implies)c(fairly)i(broad)h(system)g(access)h(as)g(w)m(ell.)0 -2569 y(It)f(migh)m(t)g(b)s(e)f(p)s(ossible)f(to)j(mo)s(dify)d +(en)m(t)g(ev)m(en)g(a)g(naiv)m(e)0 5340 y(attac)m(k)m(er)33 +b(from)d(gaining)f(the)i(passw)m(ord.)p eop +%%Page: 27 29 +27 28 bop 0 -116 a Fs(Chapter)30 b(4:)41 b(The)30 b(Rep)s(ository)2725 +b(27)125 366 y(The)32 b(separate)j Fr(cvs)d Fs(passw)m(ord)h(\014le)g +(\(see)h(Section)f(4.6.3.1)j([P)m(assw)m(ord)e(authen)m(tication)g +(serv)m(er],)h(page)f(23\))0 491 y(allo)m(ws)d(p)s(eople)f(to)i(use)f +(a)h(di\013eren)m(t)f(passw)m(ord)f(for)h(rep)s(ository)g(access)h +(than)f(for)h(login)e(access.)45 b(On)30 b(the)i(other)0 +616 y(hand,)42 b(once)e(a)h(user)e(has)h(access)h(to)g(the)f(rep)s +(ository)-8 b(,)42 b(she)d(can)i(execute)g(programs)f(on)f(the)i(serv)m +(er)f(system)0 740 y(through)e(a)i(v)-5 b(ariet)m(y)40 +b(of)f(means.)67 b(Th)m(us,)40 b(rep)s(ository)f(access)h(implies)c +(fairly)i(broad)h(system)g(access)h(as)g(w)m(ell.)0 865 +y(It)f(migh)m(t)g(b)s(e)f(p)s(ossible)f(to)j(mo)s(dify)d Fr(cvs)h Fs(to)i(prev)m(en)m(t)g(that,)i(but)c(no)h(one)g(has)g(done)g -(so)g(as)g(of)h(this)e(writing.)0 2693 y(F)-8 b(urthermore,)35 +(so)g(as)g(of)h(this)e(writing.)0 989 y(F)-8 b(urthermore,)35 b(there)f(ma)m(y)g(b)s(e)f(other)h(w)m(a)m(ys)h(in)d(whic)m(h)h(ha)m (ving)g(access)i(to)f Fr(cvs)f Fs(allo)m(ws)g(p)s(eople)g(to)h(gain)g -(more)0 2818 y(general)c(access)i(to)f(the)g(system;)g(no)s(one)f(has)g -(done)g(a)h(careful)e(audit.)125 3102 y(In)d(summary)-8 +(more)0 1114 y(general)c(access)i(to)f(the)g(system;)g(no)s(one)f(has)g +(done)g(a)h(careful)e(audit.)125 1411 y(In)d(summary)-8 b(,)27 b(an)m(y)m(one)i(who)d(gets)i(the)g(passw)m(ord)e(gets)i(rep)s (ository)e(access,)k(and)c(some)i(measure)f(of)g(general)0 -3227 y(system)32 b(access)i(as)e(w)m(ell.)45 b(The)32 +1535 y(system)32 b(access)i(as)e(w)m(ell.)45 b(The)32 b(passw)m(ord)g(is)f(a)m(v)-5 b(ailable)31 b(to)i(an)m(y)m(one)h(who)e (can)g(sni\013)f(net)m(w)m(ork)i(pac)m(k)m(ets)h(or)e(read)0 -3351 y(a)f(protected)g(\(i.e.,)g(user)f(read-only\))g(\014le.)40 +1660 y(a)f(protected)g(\(i.e.,)g(user)f(read-only\))g(\014le.)40 b(If)30 b(y)m(ou)g(w)m(an)m(t)i(real)e(securit)m(y)-8 -b(,)30 b(get)i(Kerb)s(eros.)0 3863 y Fk(4.6.3)63 b(Direct)29 -b(connection)i(with)f(k)m(erb)s(eros)125 4148 y Fs(The)j(main)g(disadv) +b(,)30 b(get)i(Kerb)s(eros.)0 2284 y Fk(4.6.4)63 b(Direct)29 +b(connection)i(with)f(k)m(erb)s(eros)125 2581 y Fs(The)j(main)g(disadv) -5 b(an)m(tage)34 b(of)g(using)f(rsh)f(is)h(that)i(all)e(the)h(data)g -(needs)g(to)h(pass)e(through)g(additional)f(pro-)0 4272 +(needs)g(to)h(pass)e(through)g(additional)f(pro-)0 2706 y(grams,)40 b(so)d(it)g(ma)m(y)i(b)s(e)d(slo)m(w)m(er.)63 b(So)37 b(if)g(y)m(ou)g(ha)m(v)m(e)i(k)m(erb)s(eros)e(installed)f(y)m -(ou)i(can)f(connect)i(via)e(a)h(direct)f Fr(tcp)0 4397 +(ou)i(can)f(connect)i(via)e(a)h(direct)f Fr(tcp)0 2830 y Fs(connection,)31 b(authen)m(ticating)f(with)f(k)m(erb)s(eros.)125 -4682 y(T)-8 b(o)35 b(do)f(this,)h Fr(cvs)e Fs(needs)i(to)g(b)s(e)f +3128 y(T)-8 b(o)35 b(do)f(this,)h Fr(cvs)e Fs(needs)i(to)g(b)s(e)f (compiled)f(with)g(k)m(erb)s(eros)i(supp)s(ort;)g(when)e(con\014guring) -g Fr(cvs)h Fs(it)g(tries)g(to)0 4806 y(detect)e(whether)d(k)m(erb)s +g Fr(cvs)h Fs(it)g(tries)g(to)0 3252 y(detect)e(whether)d(k)m(erb)s (eros)i(is)e(presen)m(t)h(or)h(y)m(ou)f(can)h(use)f(the)h(`)p Fn(--with-krb4)p Fs(')d(\015ag)i(to)h(con\014gure.)125 -5091 y(The)h(data)i(transmitted)f(is)f Fo(not)k Fs(encrypted)d(b)m(y)g +3549 y(The)h(data)i(transmitted)f(is)f Fo(not)k Fs(encrypted)d(b)m(y)g (default.)49 b(Encryption)32 b(supp)s(ort)f(m)m(ust)i(b)s(e)g(compiled) -f(in)m(to)0 5215 y(b)s(oth)37 b(the)h(clien)m(t)f(and)h(serv)m(er;)k +f(in)m(to)0 3674 y(b)s(oth)37 b(the)h(clien)m(t)f(and)h(serv)m(er;)k (use)37 b(the)h(`)p Fn(--enable-encryption)p Fs(')33 b(con\014gure)38 b(option)f(to)i(turn)d(it)i(on.)62 b(Y)-8 -b(ou)0 5340 y(m)m(ust)30 b(then)g(use)g(the)h Fn(-x)f -Fs(global)f(option)h(to)h(request)g(encryption.)p eop -%%Page: 27 29 -27 28 bop 0 -116 a Fs(Chapter)30 b(4:)41 b(The)30 b(Rep)s(ository)2725 -b(27)125 366 y(Y)-8 b(ou)32 b(need)g(to)h(edit)e Fn(inetd.conf)e -Fs(on)j(the)g(serv)m(er)h(mac)m(hine)e(to)i(run)e Fn(cvs)e(kserver)p -Fs(.)44 b(The)31 b(clien)m(t)h(uses)g(p)s(ort)0 491 y(1999)k(b)m(y)e -(default;)h(if)f(y)m(ou)g(w)m(an)m(t)h(to)g(use)f(another)g(p)s(ort)g -(sp)s(ecify)e(it)i(in)f(the)h Fn(CVS_CLIENT_PORT)c Fs(en)m(vironmen)m -(t)0 616 y(v)-5 b(ariable)29 b(on)h(the)h(clien)m(t.)125 -890 y(When)e(y)m(ou)i(w)m(an)m(t)f(to)h(use)f Fr(cvs)p +b(ou)0 3798 y(m)m(ust)30 b(then)g(use)g(the)h Fn(-x)f +Fs(global)f(option)h(to)h(request)g(encryption.)125 4096 +y(Y)-8 b(ou)32 b(need)g(to)h(edit)e Fn(inetd.conf)e Fs(on)j(the)g(serv) +m(er)h(mac)m(hine)e(to)i(run)e Fn(cvs)e(kserver)p Fs(.)44 +b(The)31 b(clien)m(t)h(uses)g(p)s(ort)0 4220 y(1999)k(b)m(y)e(default;) +h(if)f(y)m(ou)g(w)m(an)m(t)h(to)g(use)f(another)g(p)s(ort)g(sp)s(ecify) +e(it)i(in)f(the)h Fn(CVS_CLIENT_PORT)c Fs(en)m(vironmen)m(t)0 +4345 y(v)-5 b(ariable)29 b(on)h(the)h(clien)m(t.)125 +4642 y(When)e(y)m(ou)i(w)m(an)m(t)f(to)h(use)f Fr(cvs)p Fs(,)f(get)i(a)g(tic)m(k)m(et)g(in)e(the)h(usual)e(w)m(a)m(y)j (\(generally)f Fn(kinit)p Fs(\);)f(it)h(m)m(ust)g(b)s(e)f(a)h(tic)m(k)m -(et)0 1014 y(whic)m(h)f(allo)m(ws)h(y)m(ou)h(to)g(log)f(in)m(to)g(the)h +(et)0 4766 y(whic)m(h)f(allo)m(ws)h(y)m(ou)h(to)g(log)f(in)m(to)g(the)h (serv)m(er)g(mac)m(hine.)40 b(Then)29 b(y)m(ou)i(are)g(ready)f(to)h -(go:)240 1267 y Fn(cvs)47 b(-d)g(:kserver:chainsaw.brickya)o(rd.)o +(go:)240 5043 y Fn(cvs)47 b(-d)g(:kserver:chainsaw.brickya)o(rd.)o (com:)o(/use)o(r/l)o(ocal)o(/cvs)o(roo)o(t)42 b(checkout)j(foo)125 -1541 y Fs(Previous)29 b(v)m(ersions)g(of)i Fr(cvs)e Fs(w)m(ould)h(fall) +5340 y Fs(Previous)29 b(v)m(ersions)g(of)i Fr(cvs)e Fs(w)m(ould)h(fall) f(bac)m(k)i(to)g(a)g(connection)f(via)g(rsh;)g(this)f(v)m(ersion)h -(will)d(not)k(do)f(so.)0 1990 y Fm(4.7)68 b(Read-only)31 -b(rep)t(ository)h(access)125 2264 y Fs(It)j(is)g(p)s(ossible)f(to)i +(will)d(not)k(do)f(so.)p eop +%%Page: 28 30 +28 29 bop 0 -116 a Fs(28)2411 b(CVS|Concurren)m(t)29 +b(V)-8 b(ersions)30 b(System)0 366 y Fm(4.7)68 b(Read-only)31 +b(rep)t(ository)h(access)125 677 y Fs(It)j(is)g(p)s(ossible)f(to)i (gran)m(t)h(read-only)e(rep)s(ository)g(access)i(to)f(p)s(eople)f -(using)f(the)i(passw)m(ord-authen)m(ticated)0 2388 y(serv)m(er)i(\(see) -h(Section)e(4.6.2)j([P)m(assw)m(ord)e(authen)m(ticated],)i(page)f -(23\).)64 b(\(The)37 b(other)h(access)h(metho)s(ds)e(do)h(not)0 -2513 y(ha)m(v)m(e)43 b(explicit)c(supp)s(ort)h(for)h(read-only)g(users) -f(b)s(ecause)i(those)g(metho)s(ds)e(all)h(assume)g(login)f(access)j(to) -f(the)0 2637 y(rep)s(ository)27 b(mac)m(hine)h(an)m(yw)m(a)m(y)-8 +(using)f(the)i(passw)m(ord-authen)m(ticated)0 801 y(serv)m(er)i(\(see)h +(Section)e(4.6.3)j([P)m(assw)m(ord)e(authen)m(ticated],)i(page)f(23\).) +64 b(\(The)37 b(other)h(access)h(metho)s(ds)e(do)h(not)0 +926 y(ha)m(v)m(e)43 b(explicit)c(supp)s(ort)h(for)h(read-only)g(users)f +(b)s(ecause)i(those)g(metho)s(ds)e(all)h(assume)g(login)f(access)j(to)f +(the)0 1051 y(rep)s(ository)27 b(mac)m(hine)h(an)m(yw)m(a)m(y)-8 b(,)30 b(and)e(therefore)g(the)h(user)e(can)i(do)f(whatev)m(er)g(lo)s -(cal)g(\014le)f(p)s(ermissions)e(allo)m(w)i(her)0 2762 -y(to)k(do.\))125 3036 y(A)38 b(user)f(who)h(has)g(read-only)g(access)h +(cal)g(\014le)f(p)s(ermissions)e(allo)m(w)i(her)0 1175 +y(to)k(do.\))125 1486 y(A)38 b(user)f(who)h(has)g(read-only)g(access)h (can)g(do)f(only)f(those)i Fr(cvs)e Fs(op)s(erations)h(whic)m(h)f(do)h -(not)g(mo)s(dify)f(the)0 3161 y(rep)s(ository)-8 b(,)30 +(not)g(mo)s(dify)f(the)0 1610 y(rep)s(ository)-8 b(,)30 b(except)i(for)e(certain)h(\\administrativ)m(e")f(\014les)f(\(suc)m(h)i (as)f(lo)s(c)m(k)h(\014les)f(and)g(the)g(history)g(\014le\).)41 -b(It)30 b(ma)m(y)0 3285 y(b)s(e)40 b(desirable)f(to)i(use)g(this)e +b(It)30 b(ma)m(y)0 1735 y(b)s(e)40 b(desirable)f(to)i(use)g(this)e (feature)i(in)f(conjunction)f(with)h(user-aliasing)e(\(see)k(Section)e -(4.6.2.1)k([P)m(assw)m(ord)0 3410 y(authen)m(tication)32 +(4.6.3.1)k([P)m(assw)m(ord)0 1859 y(authen)m(tication)32 b(serv)m(er],)g(page)g(23\).)46 b(Ho)m(w)m(ev)m(er,)34 b(note)e(that)g(read-only)f(access)i(do)s(es)e(not)h(rep)s(eal)e(the)i -(existing)0 3534 y(securit)m(y)e(considerations)f(in)g(See)i(Section)f -(4.6.2.3)j([P)m(assw)m(ord)e(authen)m(tication)f(securit)m(y],)h(page)g -(26.)125 3808 y(There)e(are)i(t)m(w)m(o)h(w)m(a)m(ys)f(to)g(sp)s(ecify) +(existing)0 1984 y(securit)m(y)e(considerations)f(in)g(See)i(Section)f +(4.6.3.3)j([P)m(assw)m(ord)e(authen)m(tication)f(securit)m(y],)h(page)g +(26.)125 2294 y(There)e(are)i(t)m(w)m(o)h(w)m(a)m(ys)f(to)g(sp)s(ecify) e(read-only)h(access)i(for)e(a)h(user:)40 b(b)m(y)30 -b(inclusion,)d(and)j(b)m(y)g(exclusion.)125 4082 y Fn(")p +b(inclusion,)d(and)j(b)m(y)g(exclusion.)125 2605 y Fn(")p Fs(Inclusion)p Fn(")d Fs(means)j(listing)f(that)i(user)f(sp)s (eci\014cally)e(in)h(the)i(`)p Fn($CVSROOT/CVSROOT/readers)p -Fs(')24 b(\014le,)30 b(whic)m(h)0 4207 y(is)f(simply)f(a)j +Fs(')24 b(\014le,)30 b(whic)m(h)0 2729 y(is)f(simply)f(a)j (newline-separated)e(list)g(of)i(users.)40 b(Here)31 b(is)e(a)i(sample)e(`)p Fn(readers)p Fs(')g(\014le:)240 -4460 y Fn(melissa)240 4564 y(splotnik)240 4667 y(jrandom)125 -4941 y Fs(\(Don't)i(forget)h(the)e(newline)e(after)j(the)g(last)f -(user.\))125 5215 y Fn(")p Fs(Exclusion)p Fn(")17 b Fs(means)j +3019 y Fn(melissa)240 3123 y(splotnik)240 3226 y(jrandom)125 +3537 y Fs(\(Don't)i(forget)h(the)e(newline)e(after)j(the)g(last)f +(user.\))125 3847 y Fn(")p Fs(Exclusion)p Fn(")17 b Fs(means)j (explicitly)e(listing)g(ev)m(ery)m(one)k(who)e(has)g Fo(write)25 b Fs(access|if)20 b(the)h(`)p Fn($CVSROOT/CVSROOT/writers)o -Fs(')p 4214 5233 42 81 v 0 5340 a(\014le)j(exists,)h(then)f(only)g +Fs(')p 4214 3865 42 81 v 0 3972 a(\014le)j(exists,)h(then)f(only)g (those)h(users)f(listed)f(in)g(it)h(ha)m(v)m(e)i(write)e(access,)j(and) -d(ev)m(ery)m(one)i(else)e(has)h(read-only)f(access)p -eop -%%Page: 28 30 -28 29 bop 0 -116 a Fs(28)2411 b(CVS|Concurren)m(t)29 -b(V)-8 b(ersions)30 b(System)0 366 y(\(of)f(course,)h(ev)m(en)f(the)g -(read-only)g(users)e(still)g(need)i(to)g(b)s(e)f(listed)g(in)f(the)i(`) -p Fn($CVSROOT/CVSROOT/passwd)p Fs(')23 b(\014le\).)0 -491 y(The)30 b(`)p Fn(writers)p Fs(')f(\014le)g(has)h(the)h(same)g -(format)f(as)h(the)g(`)p Fn(readers)p Fs(')d(\014le.)125 -765 y(Note:)73 b(if)45 b(y)m(our)h(`)p Fn($CVSROOT/CVSROOT/passwd)p +d(ev)m(ery)m(one)i(else)e(has)h(read-only)f(access)0 +4096 y(\(of)29 b(course,)h(ev)m(en)f(the)g(read-only)g(users)e(still)g +(need)i(to)g(b)s(e)f(listed)g(in)f(the)i(`)p Fn +($CVSROOT/CVSROOT/passwd)p Fs(')23 b(\014le\).)0 4221 +y(The)30 b(`)p Fn(writers)p Fs(')f(\014le)g(has)h(the)h(same)g(format)f +(as)h(the)g(`)p Fn(readers)p Fs(')d(\014le.)125 4531 +y(Note:)73 b(if)45 b(y)m(our)h(`)p Fn($CVSROOT/CVSROOT/passwd)p Fs(')41 b(\014le)k(maps)h(cvs)g(users)f(on)m(to)j(system)e(users)f -(\(see)i(Sec-)0 890 y(tion)41 b(4.6.2.1)i([P)m(assw)m(ord)f(authen)m +(\(see)i(Sec-)0 4656 y(tion)41 b(4.6.3.1)i([P)m(assw)m(ord)f(authen)m (tication)f(serv)m(er],)k(page)c(23\),)46 b(mak)m(e)c(sure)e(y)m(ou)i -(den)m(y)f(or)g(gran)m(t)h(read-only)0 1014 y(access)34 +(den)m(y)f(or)g(gran)m(t)h(read-only)0 4780 y(access)34 b(using)d(the)i Fo(cvs)k Fs(usernames,)c(not)g(the)g(system)g (usernames.)47 b(That)33 b(is,)g(the)g(`)p Fn(readers)p -Fs(')e(and)h(`)p Fn(writers)p Fs(')0 1139 y(\014les)d(con)m(tain)i(cvs) +Fs(')e(and)h(`)p Fn(writers)p Fs(')0 4905 y(\014les)d(con)m(tain)i(cvs) g(usernames,)e(whic)m(h)h(ma)m(y)h(or)f(ma)m(y)h(not)g(b)s(e)e(the)i -(same)g(as)f(system)h(usernames.)125 1413 y(Here)j(is)f(a)i(complete)f +(same)g(as)f(system)h(usernames.)125 5215 y(Here)j(is)f(a)i(complete)f (description)e(of)j(the)f(serv)m(er's)g(b)s(eha)m(vior)f(in)g(deciding) -f(whether)i(to)h(gran)m(t)g(read-only)0 1537 y(or)30 -b(read-write)g(access:)125 1811 y(If)h(`)p Fn(readers)p -Fs(')f(exists,)i(and)g(this)e(user)h(is)g(listed)g(in)f(it,)i(then)g -(she)f(gets)i(read-only)e(access.)47 b(Or)31 b(if)f(`)p -Fn(writers)p Fs(')0 1936 y(exists,)38 b(and)e(this)g(user)g(is)g(NOT)g -(listed)g(in)f(it,)j(then)f(she)f(also)h(gets)h(read-only)e(access)i -(\(this)e(is)g(true)g(ev)m(en)i(if)0 2060 y(`)p Fn(readers)p -Fs(')29 b(exists)h(but)g(she)g(is)f(not)i(listed)e(there\).)41 -b(Otherwise,)29 b(she)h(gets)i(full)c(read-write)i(access.)125 -2334 y(Of)41 b(course)g(there)h(is)f(a)h(con\015ict)f(if)g(the)h(user)f -(is)g(listed)f(in)g(b)s(oth)h(\014les.)74 b(This)39 b(is)i(resolv)m(ed) -h(in)e(the)i(more)0 2459 y(conserv)-5 b(ativ)m(e)37 b(w)m(a)m(y)-8 -b(,)39 b(it)d(b)s(eing)f(b)s(etter)h(to)h(protect)g(the)f(rep)s -(ository)f(to)s(o)i(m)m(uc)m(h)f(than)g(to)s(o)g(little:)51 -b(suc)m(h)36 b(a)h(user)0 2583 y(gets)31 b(read-only)f(access.)p -eop +f(whether)i(to)h(gran)m(t)g(read-only)0 5340 y(or)30 +b(read-write)g(access:)p eop %%Page: 29 31 -29 30 bop 0 -116 a Fs(Chapter)30 b(5:)41 b(Starting)30 -b(a)g(pro)5 b(ject)31 b(with)e(CVS)2212 b(29)0 366 y +29 30 bop 0 -116 a Fs(Chapter)30 b(4:)41 b(The)30 b(Rep)s(ository)2725 +b(29)125 366 y(If)31 b(`)p Fn(readers)p Fs(')f(exists,)i(and)g(this)e +(user)h(is)g(listed)g(in)f(it,)i(then)g(she)f(gets)i(read-only)e +(access.)47 b(Or)31 b(if)f(`)p Fn(writers)p Fs(')0 491 +y(exists,)38 b(and)e(this)g(user)g(is)g(NOT)g(listed)g(in)f(it,)j(then) +f(she)f(also)h(gets)h(read-only)e(access)i(\(this)e(is)g(true)g(ev)m +(en)i(if)0 616 y(`)p Fn(readers)p Fs(')29 b(exists)h(but)g(she)g(is)f +(not)i(listed)e(there\).)41 b(Otherwise,)29 b(she)h(gets)i(full)c +(read-write)i(access.)125 890 y(Of)41 b(course)g(there)h(is)f(a)h +(con\015ict)f(if)g(the)h(user)f(is)g(listed)f(in)g(b)s(oth)h(\014les.) +74 b(This)39 b(is)i(resolv)m(ed)h(in)e(the)i(more)0 1014 +y(conserv)-5 b(ativ)m(e)37 b(w)m(a)m(y)-8 b(,)39 b(it)d(b)s(eing)f(b)s +(etter)h(to)h(protect)g(the)f(rep)s(ository)f(to)s(o)i(m)m(uc)m(h)f +(than)g(to)s(o)g(little:)51 b(suc)m(h)36 b(a)h(user)0 +1139 y(gets)31 b(read-only)f(access.)p eop +%%Page: 30 32 +30 31 bop 0 -116 a Fs(30)2411 b(CVS|Concurren)m(t)29 +b(V)-8 b(ersions)30 b(System)p eop +%%Page: 31 33 +31 32 bop 0 -116 a Fs(Chapter)30 b(5:)41 b(Starting)30 +b(a)g(pro)5 b(ject)31 b(with)e(CVS)2212 b(31)0 366 y Fp(5)80 b(Starting)30 b(a)h(pro)9 b(ject)29 b(with)h(CVS)125 749 y Fs(Because)d(renaming)e(\014les)f(and)i(mo)m(ving)f(them)h(b)s (et)m(w)m(een)h(directories)e(is)f(somewhat)j(incon)m(v)m(enien)m(t,)g @@ -3631,7 +3680,7 @@ h(it)h(do)s(es)f(increase)g(the)h(p)s(oten)m(tial)f(for)h(confusion)e (and)h Fr(cvs)0 1123 y Fs(do)s(es)36 b(ha)m(v)m(e)i(some)e(quirks)f (particularly)f(in)h(the)h(area)h(of)g(renaming)e(directories.)58 b(See)36 b(Chapter)g(14)h([Mo)m(ving)0 1247 y(\014les],)30 -b(page)h(67.)125 1523 y(What)g(to)g(do)f(next)h(dep)s(ends)d(on)i(the)h +b(page)h(69.)125 1523 y(What)g(to)g(do)f(next)h(dep)s(ends)d(on)i(the)h (situation)e(at)i(hand.)0 1988 y Fm(5.1)68 b(Setting)31 b(up)f(the)h(\014les)125 2264 y Fs(The)25 b(\014rst)g(step)g(is)g(to)i (create)g(the)f(\014les)f(inside)e(the)j(rep)s(ository)-8 @@ -3662,15 +3711,15 @@ b(They)30 b(ma)m(y)h(\014ll)d(no)j(purp)s(ose)0 4477 y(in)41 b(this)h(con)m(text,)47 b(but)42 b(since)g Fr(cvs)g Fs(requires)f(them)h(they)h(m)m(ust)f(b)s(e)g(presen)m(t.)77 b(See)43 b(Chapter)f(13)i([T)-8 b(rac)m(king)0 4602 y(sources],)31 -b(page)g(63,)g(for)g(more)f(information)f(ab)s(out)h(them.)125 +b(page)g(65,)g(for)g(more)f(information)f(ab)s(out)h(them.)125 4877 y(Y)-8 b(ou)30 b(can)h(no)m(w)f(v)m(erify)g(that)h(it)f(w)m(ork)m (ed,)h(and)f(remo)m(v)m(e)i(y)m(our)e(original)f(source)h(directory)-8 b(.)240 5132 y Fn($)47 b(cd)h(..)240 5236 y($)f(mv)h Fo(dir)k(dir)p Fn(.orig)240 5340 y($)47 b(cvs)g(checkout)f(yoyodyne/)p Fo(dir)336 b Fn(#)48 b Fs(Explanation)29 b(b)s(elo)m(w)p eop -%%Page: 30 32 -30 31 bop 0 -116 a Fs(30)2411 b(CVS|Concurren)m(t)29 +%%Page: 32 34 +32 33 bop 0 -116 a Fs(32)2411 b(CVS|Concurren)m(t)29 b(V)-8 b(ersions)30 b(System)240 366 y Fn($)47 b(diff)g(-r)g Fo(dir)p Fn(.orig)e(yoyodyne/)p Fo(dir)240 470 y Fn($)i(rm)h(-r)f Fo(dir)p Fn(.orig)0 754 y Fs(Erasing)28 b(the)h(original)e(sources)i @@ -3694,7 +3743,7 @@ Fn($CVSROOT)p Fs(')0 1820 y(are)h(reasonable,)i(and)e(that)h(they)f(b)s s(ort)d(are)j(binary)-8 b(,)31 b(y)m(ou)i(ma)m(y)g(w)m(an)m(t)g(to)g (use)f(the)g(wrapp)s(ers)f(features)0 2352 y(to)g(sp)s(ecify)e(whic)m (h)g(\014les)h(are)g(binary)f(and)h(whic)m(h)f(are)i(not.)41 -b(See)30 b(Section)g(C.2)h([W)-8 b(rapp)s(ers],)30 b(page)h(137.)0 +b(See)30 b(Section)g(C.2)h([W)-8 b(rapp)s(ers],)30 b(page)h(139.)0 2856 y Fk(5.1.2)63 b(Creating)30 b(Files)h(F)-10 b(rom)30 b(Other)g(V)-10 b(ersion)31 b(Con)m(trol)g(Systems)125 3139 y Fs(If)j(y)m(ou)g(ha)m(v)m(e)i(a)f(pro)5 b(ject)35 @@ -3734,9 +3783,9 @@ Fs(;)j(if)c(it)g(is,)i Fr(cvs)e Fs(will)f(ha)m(v)m(e)480 h(standard)f(format.)480 5340 y(If)30 b(y)m(ours)g(do)s(es,)g(exp)s (ort)h(the)f Fr(r)n(cs)f Fs(\014les)h(and)g(then)g(follo)m(w)f(the)i (ab)s(o)m(v)m(e)g(instructions.)p eop -%%Page: 31 33 -31 32 bop 0 -116 a Fs(Chapter)30 b(5:)41 b(Starting)30 -b(a)g(pro)5 b(ject)31 b(with)e(CVS)2212 b(31)0 366 y(F)-8 +%%Page: 33 35 +33 34 bop 0 -116 a Fs(Chapter)30 b(5:)41 b(Starting)30 +b(a)g(pro)5 b(ject)31 b(with)e(CVS)2212 b(33)0 366 y(F)-8 b(rom)31 b(SCCS)480 491 y(There)48 b(is)f(a)h(script)f(in)g(the)h(`)p Fn(contrib)p Fs(')e(directory)i(of)g(the)g Fr(cvs)f Fs(source)h (distribution)d(called)480 616 y(`)p Fn(sccs2rcs)p Fs(')38 @@ -3772,13 +3821,13 @@ j(de\014ne)d(a)i(mo)s(dule.)49 5098 y(1.)61 b(Get)31 b(a)g(w)m(orking)f(cop)m(y)h(of)g(the)f(mo)s(dules)f(\014le.)420 5236 y Fn($)47 b(cvs)g(checkout)f(CVSROOT/modules)420 5340 y($)h(cd)h(CVSROOT)p eop -%%Page: 32 34 -32 33 bop 0 -116 a Fs(32)2411 b(CVS|Concurren)m(t)29 +%%Page: 34 36 +34 35 bop 0 -116 a Fs(34)2411 b(CVS|Concurren)m(t)29 b(V)-8 b(ersions)30 b(System)49 366 y(2.)61 b(Edit)34 b(the)h(\014le)f(and)g(insert)g(a)i(line)d(that)i(de\014nes)f(the)h(mo) s(dule.)53 b(See)35 b(Section)g(4.3)h([In)m(tro)g(administrativ)m(e)180 491 y(\014les],)31 b(page)h(19,)g(for)f(an)h(in)m(tro)s(duction.)41 -b(See)31 b(Section)g(C.1)h([mo)s(dules],)e(page)i(135,)h(for)e(a)h +b(See)31 b(Section)g(C.1)h([mo)s(dules],)e(page)i(137,)h(for)e(a)h (full)d(description)180 616 y(of)i(the)f(mo)s(dules)f(\014le.)39 b(Y)-8 b(ou)31 b(can)g(use)f(the)h(follo)m(wing)d(line)h(to)i(de\014ne) f(the)h(mo)s(dule)d(`)p Fn(tc)p Fs(':)420 744 y Fn(tc)143 @@ -3788,115 +3837,119 @@ b(yoyodyne/tc)49 894 y Fs(3.)61 b(Commit)30 b(y)m(our)g(c)m(hanges)h y Fs(4.)61 b(Release)31 b(the)g(mo)s(dules)d(mo)s(dule.)420 1300 y Fn($)47 b(cd)h(..)420 1404 y($)f(cvs)g(release)f(-d)h(CVSROOT)p eop -%%Page: 33 35 -33 34 bop 0 -116 a Fs(Chapter)30 b(6:)41 b(Multiple)28 -b(dev)m(elop)s(ers)2565 b(33)0 366 y Fp(6)80 b(Multiple)32 -b(dev)l(elop)t(ers)125 768 y Fs(When)g(more)h(than)g(one)g(p)s(erson)f +%%Page: 35 37 +35 36 bop 0 -116 a Fs(Chapter)30 b(6:)41 b(Multiple)28 +b(dev)m(elop)s(ers)2565 b(35)0 366 y Fp(6)80 b(Multiple)32 +b(dev)l(elop)t(ers)125 744 y Fs(When)g(more)h(than)g(one)g(p)s(erson)f (w)m(orks)g(on)h(a)g(soft)m(w)m(are)i(pro)5 b(ject)33 -b(things)f(often)h(get)h(complicated.)48 b(Often,)0 893 +b(things)f(often)h(get)h(complicated.)48 b(Often,)0 868 y(t)m(w)m(o)29 b(p)s(eople)e(try)h(to)h(edit)e(the)i(same)f(\014le)f (sim)m(ultaneously)-8 b(.)38 b(One)28 b(solution,)f(kno)m(wn)g(as)i Fo(\014le)e(lo)s(c)m(king)35 b Fs(or)28 b Fo(reserv)m(ed)0 -1017 y(c)m(hec)m(k)m(outs)p Fs(,)g(is)c(to)i(allo)m(w)e(only)g(one)h(p) -s(erson)f(to)h(edit)g(eac)m(h)h(\014le)d(at)j(a)f(time.)39 -b(This)23 b(is)h(the)h(only)f(solution)f(with)h(some)0 -1142 y(v)m(ersion)30 b(con)m(trol)i(systems,)f(including)c -Fr(r)n(cs)j Fs(and)g Fr(sccs)p Fs(.)41 b Fr(Cvs)31 b -Fs(do)s(esn't)f(ha)m(v)m(e)i(a)g(v)m(ery)f(nice)f(implemen)m(tation)g -(of)0 1267 y(reserv)m(ed)k(c)m(hec)m(k)m(outs)h(\(y)m(et\))h(but)d -(there)g(are)h(w)m(a)m(ys)h(to)f(get)h(it)e(w)m(orking)f(\(for)i -(example,)g(see)g(the)g Fn(cvs)c(admin)f(-l)0 1391 y -Fs(command)34 b(in)f(Section)h(A.5.1)h([admin)e(options],)i(page)g -(93\).)53 b(It)34 b(also)g(ma)m(y)h(b)s(e)f(p)s(ossible)d(to)k(use)f -(the)g(w)m(atc)m(hes)0 1516 y(features)k(describ)s(ed)d(b)s(elo)m(w,)k -(together)f(with)e(suitable)g(pro)s(cedures)g(\(not)i(enforced)g(b)m(y) -f(soft)m(w)m(are\),)k(to)d(a)m(v)m(oid)0 1640 y(ha)m(ving)30 -b(t)m(w)m(o)i(p)s(eople)d(edit)h(at)h(the)f(same)h(time.)125 -1920 y(The)j(default)f(mo)s(del)h(with)f Fr(cvs)g Fs(is)h(kno)m(wn)g -(as)h Fo(unreserv)m(ed)f(c)m(hec)m(k)m(outs)p Fs(.)55 -b(In)34 b(this)f(mo)s(del,)i(dev)m(elop)s(ers)f(can)0 -2044 y(edit)26 b(their)f(o)m(wn)i Fo(w)m(orking)f(cop)m(y)35 -b Fs(of)26 b(a)h(\014le)f(sim)m(ultaneously)-8 b(.)37 -b(The)26 b(\014rst)g(p)s(erson)f(that)i(commits)g(his)e(c)m(hanges)i -(has)0 2169 y(no)i(automatic)i(w)m(a)m(y)f(of)g(kno)m(wing)f(that)h -(another)g(has)f(started)h(to)h(edit)e(it.)40 b(Others)29 -b(will)d(get)31 b(an)f(error)f(message)0 2293 y(when)f(they)i(try)f(to) -h(commit)g(the)f(\014le.)40 b(They)28 b(m)m(ust)i(then)f(use)g -Fr(cvs)f Fs(commands)h(to)h(bring)e(their)g(w)m(orking)h(cop)m(y)0 -2418 y(up)g(to)i(date)g(with)f(the)g(rep)s(ository)f(revision.)39 +993 y(c)m(hec)m(k)m(outs)p Fs(,)40 b(is)35 b(to)i(allo)m(w)f(only)f +(one)h(p)s(erson)f(to)i(edit)e(eac)m(h)j(\014le)d(at)i(a)f(time.)58 +b(This)34 b(is)h(the)h(only)g(solution)e(with)0 1117 +y(some)j(v)m(ersion)g(con)m(trol)h(systems,)h(including)33 +b Fr(r)n(cs)j Fs(and)h Fr(sccs)p Fs(.)59 b(Curren)m(tly)36 +b(the)h(usual)f(w)m(a)m(y)i(to)g(get)g(reserv)m(ed)0 +1242 y(c)m(hec)m(k)m(outs)i(with)c Fr(cvs)h Fs(is)f(the)i +Fn(cvs)30 b(admin)e(-l)37 b Fs(command)h(\(see)g(Section)g(A.5.1)h +([admin)d(options],)j(page)f(95\).)0 1366 y(This)29 b(is)g(not)i(as)g +(nicely)f(in)m(tegrated)h(in)m(to)f Fr(cvs)g Fs(as)h(the)g(w)m(atc)m(h) +h(features,)f(describ)s(ed)d(b)s(elo)m(w,)i(but)g(it)h(seems)f(that)0 +1491 y(most)e(p)s(eople)g(with)e(a)j(need)f(for)g(reserv)m(ed)g(c)m +(hec)m(k)m(outs)i(\014nd)d(it)h(adequate.)41 b(It)28 +b(also)g(ma)m(y)h(b)s(e)e(p)s(ossible)f(to)j(use)f(the)0 +1615 y(w)m(atc)m(hes)j(features)f(describ)s(ed)d(b)s(elo)m(w,)i +(together)i(with)d(suitable)g(pro)s(cedures)g(\(not)i(enforced)f(b)m(y) +h(soft)m(w)m(are\),)h(to)0 1740 y(a)m(v)m(oid)g(ha)m(ving)f(t)m(w)m(o)i +(p)s(eople)d(edit)h(at)h(the)f(same)h(time.)125 2014 +y(The)j(default)f(mo)s(del)h(with)f Fr(cvs)g Fs(is)h(kno)m(wn)g(as)h +Fo(unreserv)m(ed)f(c)m(hec)m(k)m(outs)p Fs(.)55 b(In)34 +b(this)f(mo)s(del,)i(dev)m(elop)s(ers)f(can)0 2139 y(edit)26 +b(their)f(o)m(wn)i Fo(w)m(orking)f(cop)m(y)35 b Fs(of)26 +b(a)h(\014le)f(sim)m(ultaneously)-8 b(.)37 b(The)26 b(\014rst)g(p)s +(erson)f(that)i(commits)g(his)e(c)m(hanges)i(has)0 2263 +y(no)i(automatic)i(w)m(a)m(y)f(of)g(kno)m(wing)f(that)h(another)g(has)f +(started)h(to)h(edit)e(it.)40 b(Others)29 b(will)d(get)31 +b(an)f(error)f(message)0 2388 y(when)f(they)i(try)f(to)h(commit)g(the)f +(\014le.)40 b(They)28 b(m)m(ust)i(then)f(use)g Fr(cvs)f +Fs(commands)h(to)h(bring)e(their)g(w)m(orking)h(cop)m(y)0 +2513 y(up)g(to)i(date)g(with)f(the)g(rep)s(ository)f(revision.)39 b(This)29 b(pro)s(cess)h(is)f(almost)i(automatic.)125 -2698 y Fr(Cvs)24 b Fs(also)h(supp)s(orts)d(mec)m(hanisms)i(whic)m(h)g +2787 y Fr(Cvs)24 b Fs(also)h(supp)s(orts)d(mec)m(hanisms)i(whic)m(h)g (facilitate)g(v)-5 b(arious)24 b(kinds)f(of)h(comm)m(uncation,)j -(without)c(actually)0 2822 y(enforcing)30 b(rules)f(lik)m(e)g(reserv)m -(ed)i(c)m(hec)m(k)m(outs)h(do.)125 3102 y(The)22 b(rest)h(of)h(this)e +(without)c(actually)0 2912 y(enforcing)30 b(rules)f(lik)m(e)g(reserv)m +(ed)i(c)m(hec)m(k)m(outs)h(do.)125 3186 y(The)22 b(rest)h(of)h(this)e (c)m(hapter)h(describ)s(es)f(ho)m(w)h(these)g(v)-5 b(arious)22 b(mo)s(dels)g(w)m(ork,)j(and)d(some)i(of)f(the)g(issues)f(in)m(v)m(olv) -m(ed)0 3226 y(in)29 b(c)m(ho)s(osing)h(b)s(et)m(w)m(een)h(them.)0 -3726 y Fm(6.1)68 b(File)31 b(status)125 4005 y Fs(Based)26 +m(ed)0 3311 y(in)29 b(c)m(ho)s(osing)h(b)s(et)m(w)m(een)h(them.)0 +3765 y Fm(6.1)68 b(File)31 b(status)125 4040 y Fs(Based)26 b(on)g(what)g(op)s(erations)g(y)m(ou)g(ha)m(v)m(e)i(p)s(erformed)c(on)i (a)h(c)m(hec)m(k)m(ed)h(out)e(\014le,)h(and)e(what)h(op)s(erations)g -(others)0 4130 y(ha)m(v)m(e)39 b(p)s(erformed)e(to)h(that)h(\014le)e +(others)0 4165 y(ha)m(v)m(e)39 b(p)s(erformed)e(to)h(that)h(\014le)e (in)g(the)h(rep)s(ository)-8 b(,)39 b(one)g(can)f(classify)f(a)h (\014le)f(in)g(a)h(n)m(um)m(b)s(er)f(of)h(states.)64 -b(The)0 4254 y(states,)32 b(as)e(rep)s(orted)g(b)m(y)g(the)h -Fn(status)e Fs(command,)h(are:)0 4595 y(Up-to-date)480 -4720 y(The)g(\014le)f(is)h(iden)m(tical)f(with)g(the)i(latest)g +b(The)0 4289 y(states,)32 b(as)e(rep)s(orted)g(b)m(y)g(the)h +Fn(status)e Fs(command,)h(are:)0 4615 y(Up-to-date)480 +4740 y(The)g(\014le)f(is)h(iden)m(tical)f(with)g(the)i(latest)g (revision)d(in)h(the)i(rep)s(ository)e(for)h(the)h(branc)m(h)f(in)f -(use.)0 4905 y(Lo)s(cally)g(Mo)s(di\014ed)480 5030 y(Y)-8 +(use.)0 4915 y(Lo)s(cally)g(Mo)s(di\014ed)480 5040 y(Y)-8 b(ou)31 b(ha)m(v)m(e)g(edited)f(the)h(\014le,)e(and)h(not)h(y)m(et)g (committed)g(y)m(our)f(c)m(hanges.)0 5215 y(Lo)s(cally)f(Added)480 5340 y(Y)-8 b(ou)31 b(ha)m(v)m(e)g(added)f(the)h(\014le)e(with)g Fn(add)p Fs(,)h(and)g(not)g(y)m(et)i(committed)e(y)m(our)h(c)m(hanges.) p eop -%%Page: 34 36 -34 35 bop 0 -116 a Fs(34)2411 b(CVS|Concurren)m(t)29 +%%Page: 36 38 +36 37 bop 0 -116 a Fs(36)2411 b(CVS|Concurren)m(t)29 b(V)-8 b(ersions)30 b(System)0 366 y(Lo)s(cally)f(Remo)m(v)m(ed)480 491 y(Y)-8 b(ou)31 b(ha)m(v)m(e)g(remo)m(v)m(ed)h(the)e(\014le)g(with)f Fn(remove)p Fs(,)g(and)h(not)g(y)m(et)i(committed)e(y)m(our)h(c)m -(hanges.)0 679 y(Needs)g(Chec)m(k)m(out)480 804 y(Someone)j(else)f(has) +(hanges.)0 669 y(Needs)g(Chec)m(k)m(out)480 793 y(Someone)j(else)f(has) g(committed)h(a)f(new)m(er)h(revision)d(to)j(the)g(rep)s(ository)-8 -b(.)49 b(The)33 b(name)g(is)g(sligh)m(tly)480 928 y(misleading;)43 +b(.)49 b(The)33 b(name)g(is)g(sligh)m(tly)480 918 y(misleading;)43 b(y)m(ou)e(will)c(ordinarily)g(use)j Fn(update)f Fs(rather)h(than)g -Fn(checkout)e Fs(to)j(get)g(that)g(new)m(er)480 1053 -y(revision.)0 1241 y(Needs)31 b(P)m(atc)m(h)480 1366 +Fn(checkout)e Fs(to)j(get)g(that)g(new)m(er)480 1042 +y(revision.)0 1220 y(Needs)31 b(P)m(atc)m(h)480 1345 y(Lik)m(e)g(Needs)h(Chec)m(k)m(out,)h(but)e(the)h Fr(cvs)e Fs(serv)m(er)i(will)d(send)i(a)h(patc)m(h)g(rather)f(than)g(the)h(en)m -(tire)g(\014le.)480 1490 y(Sending)c(a)j(patc)m(h)g(or)g(sending)d(an)j +(tire)g(\014le.)480 1469 y(Sending)c(a)j(patc)m(h)g(or)g(sending)d(an)j (en)m(tire)f(\014le)f(accomplishes)h(the)g(same)h(thing.)0 -1678 y(Needs)g(Merge)480 1803 y(Someone)24 b(else)g(has)g(committed)g +1647 y(Needs)g(Merge)480 1772 y(Someone)24 b(else)g(has)g(committed)g (a)g(new)m(er)g(revision)e(to)j(the)f(rep)s(ository)-8 b(,)25 b(and)f(y)m(ou)g(ha)m(v)m(e)h(also)f(made)480 -1927 y(mo)s(di\014cations)29 b(to)i(the)f(\014le.)0 2116 -y(Unresolv)m(ed)g(Con\015ict)480 2240 y(This)e(is)g(lik)m(e)h(Lo)s -(cally)f(Mo)s(di\014ed,)g(except)i(that)g(a)g(previous)e -Fn(update)g Fs(command)h(ga)m(v)m(e)i(a)f(con\015ict.)480 -2365 y(Y)-8 b(ou)25 b(need)e(to)i(resolv)m(e)f(the)h(con\015ict)f(as)g -(describ)s(ed)e(in)g(Section)i(6.3)h([Con\015icts)f(example],)h(page)g -(35.)0 2553 y(Unkno)m(wn)103 b Fr(Cvs)33 b Fs(do)s(esn't)g(kno)m(w)g +1896 y(mo)s(di\014cations)29 b(to)i(the)f(\014le.)0 2074 +y(File)g(had)f(con\015icts)h(on)h(merge)480 2199 y(This)20 +b(is)h(lik)m(e)g(Lo)s(cally)f(Mo)s(di\014ed,)i(except)h(that)f(a)g +(previous)e Fn(update)g Fs(command)i(ga)m(v)m(e)i(a)e(con\015ict.)37 +b(If)480 2323 y(y)m(ou)23 b(ha)m(v)m(e)h(not)f(already)f(done)h(so,)i +(y)m(ou)e(need)f(to)i(resolv)m(e)f(the)g(con\015ict)f(as)h(describ)s +(ed)e(in)g(Section)i(6.3)480 2448 y([Con\015icts)30 b(example],)g(page) +h(37.)0 2626 y(Unkno)m(wn)103 b Fr(Cvs)33 b Fs(do)s(esn't)g(kno)m(w)g (an)m(ything)g(ab)s(out)g(this)f(\014le.)48 b(F)-8 b(or)34 b(example,)g(y)m(ou)g(ha)m(v)m(e)g(created)h(a)e(new)g(\014le)480 -2677 y(and)d(ha)m(v)m(e)h(not)g(run)e Fn(add)p Fs(.)125 -2990 y(T)-8 b(o)31 b(help)f(clarify)g(the)h(\014le)f(status,)i +2750 y(and)d(ha)m(v)m(e)h(not)g(run)e Fn(add)p Fs(.)125 +3052 y(T)-8 b(o)31 b(help)f(clarify)g(the)h(\014le)f(status,)i Fn(status)e Fs(also)h(rep)s(orts)f(the)i Fn(Working)c(revision)h -Fs(whic)m(h)h(is)g(the)i(revision)0 3115 y(that)40 b(the)g(\014le)f(in) +Fs(whic)m(h)h(is)g(the)i(revision)0 3177 y(that)40 b(the)g(\014le)f(in) f(the)i(w)m(orking)f(directory)g(deriv)m(es)g(from,)j(and)d(the)h Fn(Repository)27 b(revision)38 b Fs(whic)m(h)g(is)h(the)0 -3239 y(latest)31 b(revision)e(in)g(the)h(rep)s(ository)g(for)g(the)g -(branc)m(h)g(in)f(use.)125 3520 y(F)-8 b(or)31 b(information)d(on)j +3302 y(latest)31 b(revision)e(in)g(the)h(rep)s(ository)g(for)g(the)g +(branc)m(h)g(in)f(use.)125 3577 y(F)-8 b(or)31 b(information)d(on)j (the)f(options)g(to)h Fn(status)p Fs(,)e(see)i(Section)g(A.16)g -([status],)h(page)f(117.)42 b(F)-8 b(or)32 b(information)0 -3645 y(on)c(its)f Fn(Sticky)i(tag)e Fs(and)h Fn(Sticky)g(date)f -Fs(output,)h(see)h(Section)f(7.4)h([Stic)m(ky)f(tags],)i(page)f(49.)41 -b(F)-8 b(or)29 b(information)0 3769 y(on)h(its)g Fn(Sticky)f(options)f +([status],)h(page)f(119.)42 b(F)-8 b(or)32 b(information)0 +3702 y(on)c(its)f Fn(Sticky)i(tag)e Fs(and)h Fn(Sticky)g(date)f +Fs(output,)h(see)h(Section)f(7.4)h([Stic)m(ky)f(tags],)i(page)f(51.)41 +b(F)-8 b(or)29 b(information)0 3826 y(on)h(its)g Fn(Sticky)f(options)f Fs(output,)i(see)h(the)g(`)p Fn(-k)p Fs(')f(option)g(in)f(Section)h -(A.18.1)j([up)s(date)c(options],)i(page)g(120.)0 4280 +(A.18.1)j([up)s(date)c(options],)i(page)g(122.)0 4290 y Fm(6.2)68 b(Bringing)31 b(a)f(\014le)h(up)f(to)h(date)125 -4561 y Fs(When)26 b(y)m(ou)g(w)m(an)m(t)h(to)g(up)s(date)f(or)g(merge)h +4566 y Fs(When)26 b(y)m(ou)g(w)m(an)m(t)h(to)g(up)s(date)f(or)g(merge)h (a)f(\014le,)h(use)f(the)g Fn(update)f Fs(command.)39 b(F)-8 b(or)27 b(\014les)e(that)i(are)g(not)f(up)f(to)0 -4685 y(date)j(this)f(is)g(roughly)f(equiv)-5 b(alen)m(t)27 +4691 y(date)j(this)f(is)g(roughly)f(equiv)-5 b(alen)m(t)27 b(to)i(a)f Fn(checkout)e Fs(command:)39 b(the)28 b(new)m(est)g -(revision)e(of)i(the)g(\014le)f(is)g(extracted)0 4810 +(revision)e(of)i(the)g(\014le)f(is)g(extracted)0 4815 y(from)j(the)g(rep)s(ository)g(and)g(put)f(in)g(y)m(our)i(w)m(orking)e (cop)m(y)i(of)g(the)f(mo)s(dule.)125 5091 y(Y)-8 b(our)36 b(mo)s(di\014cations)f(to)j(a)f(\014le)f(are)h(nev)m(er)h(lost)e(when)g @@ -3906,9 +3959,9 @@ b(If)27 b(y)m(ou)g(ha)m(v)m(e)h(edited)f(the)g(\014le,)g(and)g(a)g(new) m(er)g(revision)f(is)g(a)m(v)-5 b(ailable,)27 b Fr(cvs)g Fs(will)0 5340 y(merge)k(all)e(c)m(hanges)j(in)m(to)e(y)m(our)g(w)m (orking)g(cop)m(y)-8 b(.)p eop -%%Page: 35 37 -35 36 bop 0 -116 a Fs(Chapter)30 b(6:)41 b(Multiple)28 -b(dev)m(elop)s(ers)2565 b(35)125 366 y(F)-8 b(or)29 b(instance,)g +%%Page: 37 39 +37 38 bop 0 -116 a Fs(Chapter)30 b(6:)41 b(Multiple)28 +b(dev)m(elop)s(ers)2565 b(37)125 366 y(F)-8 b(or)29 b(instance,)g (imagine)f(that)h(y)m(ou)g(c)m(hec)m(k)m(ed)i(out)e(revision)e(1.4)i (and)g(started)g(editing)e(it.)40 b(In)28 b(the)h(mean)m(time)0 491 y(someone)h(else)g(committed)g(revision)e(1.5,)j(and)e(shortly)f @@ -3923,7 +3976,7 @@ Fo(o)m(v)m(erlap)j Fs(o)s(ccurs.)54 b(In)34 b(suc)m(h)g(cases)i(a)f(w)m (arning)f(is)g(prin)m(ted,)g(and)g(the)h(resulting)e(\014le)h(includes) f(b)s(oth)0 1139 y(v)m(ersions)22 b(of)i(the)f(lines)e(that)j(o)m(v)m (erlap,)h(delimited)c(b)m(y)i(sp)s(ecial)f(mark)m(ers.)38 -b(See)24 b(Section)f(A.18)h([up)s(date],)h(page)e(120,)0 +b(See)24 b(Section)f(A.18)h([up)s(date],)h(page)e(122,)0 1263 y(for)30 b(a)h(complete)g(description)d(of)j(the)f Fn(update)f Fs(command.)0 1691 y Fm(6.3)68 b(Con\015icts)31 b(example)125 1965 y Fs(Supp)s(ose)d(revision)h(1.4)i(of)g(`)p @@ -3941,8 +3994,8 @@ y(char)h(**argv\))240 4198 y({)431 4302 y(parse\(\);)431 4821 y(})431 4925 y(if)g(\(nerr)f(==)i(0\))622 5029 y(gencode\(\);)431 5132 y(else)622 5236 y(fprintf\(stderr,)43 b("No)k(code)g (generated.\\n"\);)431 5340 y(exit\(!!nerr\);)p eop -%%Page: 36 38 -36 37 bop 0 -116 a Fs(36)2411 b(CVS|Concurren)m(t)29 +%%Page: 38 40 +38 39 bop 0 -116 a Fs(38)2411 b(CVS|Concurren)m(t)29 b(V)-8 b(ersions)30 b(System)240 366 y Fn(})0 649 y Fs(Y)-8 b(our)28 b(w)m(orking)f(cop)m(y)h(of)g(`)p Fn(driver.c)p Fs(',)e(based)h(on)h(revision)e(1.4,)j(con)m(tains)f(this)e(b)s(efore)h @@ -3971,9 +4024,9 @@ b(new)g(v)m(ersion)g(of)g(`)p Fn(driver.c)p Fs(')f(con)m(tains)i(this:) 4925 y(if)h(\(argc)f(!=)i(1\))431 5029 y({)622 5132 y(fprintf\(stderr,) 43 b("tc:)k(No)g(args)g(expected.\\n"\);)622 5236 y(exit\(1\);)431 5340 y(})p eop -%%Page: 37 39 -37 38 bop 0 -116 a Fs(Chapter)30 b(6:)41 b(Multiple)28 -b(dev)m(elop)s(ers)2565 b(37)431 366 y Fn(if)47 b(\(nerr)f(==)i(0\))622 +%%Page: 39 41 +39 40 bop 0 -116 a Fs(Chapter)30 b(6:)41 b(Multiple)28 +b(dev)m(elop)s(ers)2565 b(39)431 366 y Fn(if)47 b(\(nerr)f(==)i(0\))622 470 y(gencode\(\);)431 574 y(else)622 678 y(fprintf\(stderr,)43 b("No)k(code)g(generated.\\n"\);)240 782 y(<<<<<<<)f(driver.c)431 885 y(exit\(nerr)f(==)i(0)h(?)f(EXIT_SUCCESS)e(:)i(EXIT_FAILURE\);)240 @@ -4003,8 +4056,8 @@ y(Checking)g(in)h(driver.c;)240 5236 y(/usr/local/cvsroot/yoyod)o(yne/) o(tc/d)o(riv)o(er.c)o(,v)89 b(<--)95 b(driver.c)240 5340 y(new)47 b(revision:)e(1.7;)i(previous)e(revision:)h(1.6)p eop -%%Page: 38 40 -38 39 bop 0 -116 a Fs(38)2411 b(CVS|Concurren)m(t)29 +%%Page: 40 42 +40 41 bop 0 -116 a Fs(40)2411 b(CVS|Concurren)m(t)29 b(V)-8 b(ersions)30 b(System)240 366 y Fn(done)125 653 y Fs(F)-8 b(or)37 b(y)m(our)f(protection,)i Fr(cvs)e Fs(will)d(refuse)j(to)h(c)m(hec)m(k)h(in)d(a)i(\014le)e(if)g(a)i @@ -4032,7 +4085,7 @@ b(The)35 b(`)p Fn(-i)p Fs(')g(option)0 2658 y(of)e(the)f(`)p Fn(modules)p Fs(')f(\014le,)h(or)h(the)f(`)p Fn(loginfo)p Fs(')f(\014le,)i(can)f(b)s(e)g(used)g(to)h(automate)h(this)d(pro)s (cess.)47 b(See)32 b(Section)h(C.1)0 2783 y([mo)s(dules],)d(page)h -(135.)43 b(See)31 b(Section)f(C.7)h([loginfo],)g(page)g(143.)43 +(137.)43 b(See)31 b(Section)f(C.7)h([loginfo],)g(page)g(145.)43 b(Y)-8 b(ou)31 b(can)g(use)g(these)g(features)g(of)g Fr(cvs)e Fs(to,)j(for)0 2907 y(instance,)d(instruct)f Fr(cvs)f Fs(to)j(mail)d(a)i(message)h(to)g(all)d(dev)m(elop)s(ers,)i @@ -4061,10 +4114,10 @@ m(v)m(e)h(no)f(relationship)d(to)0 5215 y(the)24 b(w)m(ord)g Fo(lo)s(c)m(k)30 b Fs(in)23 b(the)h(sense)g(used)f(b)m(y)h Fr(r)n(cs)p Fs(|whic)m(h)e(refers)i(to)h(reserv)m(ed)f(c)m(hec)m(k)m (outs)j(\(see)e(Chapter)e(6)i([Multiple)0 5340 y(dev)m(elop)s(ers],)30 -b(page)h(33\).)p eop -%%Page: 39 41 -39 40 bop 0 -116 a Fs(Chapter)30 b(6:)41 b(Multiple)28 -b(dev)m(elop)s(ers)2565 b(39)125 366 y(An)m(y)30 b(n)m(um)m(b)s(er)g +b(page)h(35\).)p eop +%%Page: 41 43 +41 42 bop 0 -116 a Fs(Chapter)30 b(6:)41 b(Multiple)28 +b(dev)m(elop)s(ers)2565 b(41)125 366 y(An)m(y)30 b(n)m(um)m(b)s(er)g (of)h(p)s(eople)f(can)h(b)s(e)f(reading)g(from)g(a)h(giv)m(en)g(rep)s (ository)f(at)h(a)h(time;)f(only)f(when)f(someone)j(is)0 491 y(writing)c(do)j(the)f(lo)s(c)m(ks)g(prev)m(en)m(t)h(other)g(p)s @@ -4108,8 +4161,8 @@ Fn(rm)p Fs(\))e(to)i(discard)e(a)i(w)m(orking)e(directory)h(whic)m(h)f (is)g(no)h(longer)g(in)f(use,)i(but)0 5340 y Fr(cvs)f Fs(is)h(not)g(able)g(to)h(enforce)g(this)f(b)s(eha)m(vior.)p eop -%%Page: 40 42 -40 41 bop 0 -116 a Fs(40)2411 b(CVS|Concurren)m(t)29 +%%Page: 42 44 +42 43 bop 0 -116 a Fs(42)2411 b(CVS|Concurren)m(t)29 b(V)-8 b(ersions)30 b(System)0 366 y Fk(6.6.1)63 b(T)-10 b(elling)31 b(CVS)f(to)g(w)m(atc)m(h)e(certain)i(\014les)125 641 y Fs(T)-8 b(o)30 b(enable)g(the)h(w)m(atc)m(h)g(features,)g(y)m(ou) @@ -4160,9 +4213,9 @@ Fo(action)240 4915 y Fs(is)29 b(one)i(of)g(the)f(follo)m(wing:)240 5215 y Fn(edit)288 b Fs(Another)36 b(user)g(has)g(applied)e(the)i Fn(cvs)29 b(edit)35 b Fs(command)h(\(describ)s(ed)f(b)s(elo)m(w\))h(to) h(a)720 5340 y(\014le.)p eop -%%Page: 41 43 -41 42 bop 0 -116 a Fs(Chapter)30 b(6:)41 b(Multiple)28 -b(dev)m(elop)s(ers)2565 b(41)240 366 y Fn(unedit)192 +%%Page: 43 45 +43 44 bop 0 -116 a Fs(Chapter)30 b(6:)41 b(Multiple)28 +b(dev)m(elop)s(ers)2565 b(43)240 366 y Fn(unedit)192 b Fs(Another)35 b(user)e(has)i(applied)d(the)j Fn(cvs)30 b(unedit)i Fs(command)j(\(describ)s(ed)e(b)s(elo)m(w\))h(or)720 491 y(the)26 b Fn(cvs)j(release)24 b Fs(command)i(to)g(a)g(\014le,)g @@ -4193,7 +4246,7 @@ Fn(notify)p Fs(')41 b(as)i(one)f(edits)g(the)g(other)h(administrativ)m (\014les],)0 3020 y(page)28 b(19\).)41 b(This)26 b(\014le)g(follo)m(ws) h(the)h(usual)e(con)m(v)m(en)m(tions)i(for)f(administrativ)m(e)f (\014les)h(\(see)h(Section)f(C.3.1)i([syn)m(tax],)0 3144 -y(page)24 b(139\),)j(where)c(eac)m(h)i(line)d(is)h(a)h(regular)e +y(page)24 b(141\),)j(where)c(eac)m(h)i(line)d(is)h(a)h(regular)e (expression)h(follo)m(w)m(ed)g(b)m(y)h(a)g(command)f(to)h(execute.)40 b(The)23 b(command)0 3269 y(should)h(con)m(tain)i(a)h(single)d(o)s (currence)i(of)g(`)p Fn(\045s)p Fs(')g(whic)m(h)f(will)e(b)s(e)i @@ -4225,8 +4278,8 @@ Fs(do)s(es)g(not)h(notify)f(y)m(ou)i(for)e(y)m(our)h(o)m(wn)f(c)m f(on)h(whether)0 5340 y(the)j(user)f(name)h(of)g(the)g(p)s(erson)e (taking)i(the)g(action)g(whic)m(h)e(triggers)i(noti\014cation)f(matc)m (hes)i(the)f(user)f(name)p eop -%%Page: 42 44 -42 43 bop 0 -116 a Fs(42)2411 b(CVS|Concurren)m(t)29 +%%Page: 44 46 +44 45 bop 0 -116 a Fs(44)2411 b(CVS|Concurren)m(t)29 b(V)-8 b(ersions)30 b(System)0 366 y(of)j(the)g(p)s(erson)f(getting)i (noti\014cation.)48 b(In)32 b(fact,)j(in)d(general,)i(the)f(w)m(atc)m (hes)i(features)e(only)f(trac)m(k)i(one)g(edit)e(b)m(y)0 @@ -4287,9 +4340,9 @@ Fn(cvs)g(watch)f Fs(commands.)240 5215 y(If)i(w)m(atc)m(hes)i(are)f h(the)f(rep)s(ository)e(v)m(ersion)i(is)f(to)h(remo)m(v)m(e)h(the)f (\014le)f(and)h(then)f(use)h Fn(cvs)h(update)d Fs(to)j(get)p eop -%%Page: 43 45 -43 44 bop 0 -116 a Fs(Chapter)30 b(6:)41 b(Multiple)28 -b(dev)m(elop)s(ers)2565 b(43)240 366 y(a)32 b(new)g(cop)m(y)-8 +%%Page: 45 47 +45 46 bop 0 -116 a Fs(Chapter)30 b(6:)41 b(Multiple)28 +b(dev)m(elop)s(ers)2565 b(45)240 366 y(a)32 b(new)g(cop)m(y)-8 b(.)46 b(The)32 b(meaning)f(is)g(not)h(precisely)f(the)h(same;)h(remo)m (ving)f(and)f(up)s(dating)f(ma)m(y)j(also)240 491 y(bring)28 b(in)h(some)h(c)m(hanges)h(whic)m(h)d(ha)m(v)m(e)k(b)s(een)d(made)h(in) @@ -4339,8 +4392,8 @@ Fs(commands)g(to)i(remo)m(v)m(e)h(all)d(w)m(atc)m(hes,)k(and)c(that)i (will)c(restore)k(the)f(rep)s(ository)0 5340 y(to)31 b(a)g(state)h(whic)m(h)d Fr(cvs)g Fs(1.6)j(can)e(cop)s(e)h(with.)p eop -%%Page: 44 46 -44 45 bop 0 -116 a Fs(44)2411 b(CVS|Concurren)m(t)29 +%%Page: 46 48 +46 47 bop 0 -116 a Fs(46)2411 b(CVS|Concurren)m(t)29 b(V)-8 b(ersions)30 b(System)0 366 y Fm(6.7)68 b(Cho)t(osing)31 b(b)t(et)l(w)l(een)g(reserv)l(ed)h(or)e(unreserv)l(ed)h(c)l(hec)l(k)l (outs)125 640 y Fs(Reserv)m(ed)k(and)g(unreserv)m(ed)g(c)m(hec)m(k)m @@ -4394,7 +4447,7 @@ s(e)i(b)s(etter)0 3729 y(o\013)h(to)g(simply)d(a)m(v)m(oid)j(the)f (con\015icts)g(instead,)g(b)m(y)g(using)f(reserv)m(ed)i(c)m(hec)m(k)m (outs.)125 4003 y(The)36 b(w)m(atc)m(hes)i(features)f(describ)s(ed)e (ab)s(o)m(v)m(e)j(in)d(Section)h(6.6)i([W)-8 b(atc)m(hes],)42 -b(page)37 b(39)h(can)f(b)s(e)f(considered)f(to)0 4127 +b(page)37 b(41)h(can)f(b)s(e)f(considered)f(to)0 4127 y(b)s(e)c(an)h(in)m(termediate)f(mo)s(del)g(b)s(et)m(w)m(een)h(reserv)m (ed)g(c)m(hec)m(k)m(outs)i(and)d(unreserv)m(ed)g(c)m(hec)m(k)m(outs.)47 b(When)32 b(y)m(ou)g(go)g(to)0 4252 y(edit)39 b(a)i(\014le,)g(it)f(is)e @@ -4408,9 +4461,9 @@ b(Therefore,)36 b(for)g(some)g(groups)f(it)g(can)h(b)s(e)0 4626 y(considered)29 b(the)i(b)s(est)f(of)g(b)s(oth)g(the)g(reserv)m (ed)h(c)m(hec)m(k)m(out)i(and)d(unreserv)m(ed)f(c)m(hec)m(k)m(out)k(w)m (orlds.)p eop -%%Page: 45 47 -45 46 bop 0 -116 a Fs(Chapter)30 b(7:)41 b(Branc)m(hes)2984 -b(45)0 366 y Fp(7)80 b(Branc)l(hes)125 759 y Fs(So)28 +%%Page: 47 49 +47 48 bop 0 -116 a Fs(Chapter)30 b(7:)41 b(Branc)m(hes)2984 +b(47)0 366 y Fp(7)80 b(Branc)l(hes)125 759 y Fs(So)28 b(far,)h(all)f(revisions)f(sho)m(wn)h(in)f(this)h(man)m(ual)g(ha)m(v)m (e)i(b)s(een)e(on)g(the)h Fo(main)f(trunk)33 b Fs(of)c(the)g(revision)e (tree,)j(i.e.,)0 883 y(all)k(revision)g(n)m(um)m(b)s(ers)g(ha)m(v)m(e)i @@ -4467,14 +4520,14 @@ b(w)m(an)m(t)j(to)f(c)m(ho)s(ose)g(some)g(con)m(v)m(en)m(tion)h(for)e (CVS)0 5340 y(1.9)45 b(w)m(ould)e(b)s(e)g(tagged)j(with)d(the)h(name)g Fn(cvs1-9)p Fs(.)80 b(If)44 b(y)m(ou)g(c)m(ho)s(ose)h(a)g(consisten)m (t)f(con)m(v)m(en)m(tion,)49 b(then)44 b(y)m(ou)p eop -%%Page: 46 48 -46 47 bop 0 -116 a Fs(46)2411 b(CVS|Concurren)m(t)29 +%%Page: 48 50 +48 49 bop 0 -116 a Fs(48)2411 b(CVS|Concurren)m(t)29 b(V)-8 b(ersions)30 b(System)0 366 y(w)m(on't)j(constan)m(tly)h(b)s(e)e (guessing)g(whether)g(a)h(tag)h(is)d Fn(cvs-1-9)g Fs(or)i Fn(cvs1_9)e Fs(or)h(what.)48 b(Y)-8 b(ou)33 b(migh)m(t)g(ev)m(en)g(w)m (an)m(t)0 491 y(to)40 b(consider)d(enforcing)h(y)m(our)h(con)m(v)m(en)m (tion)h(in)e(the)h(taginfo)g(\014le)e(\(see)j(Section)f(16.3)h -([user-de\014ned)e(logging],)0 616 y(page)31 b(73\).)125 +([user-de\014ned)e(logging],)0 616 y(page)31 b(75\).)125 898 y(The)h(follo)m(wing)g(example)h(sho)m(ws)h(ho)m(w)f(y)m(ou)h(can)f (add)g(a)h(tag)h(to)f(a)g(\014le.)49 b(The)33 b(commands)g(m)m(ust)g(b) s(e)g(issued)0 1022 y(inside)e(y)m(our)i(w)m(orking)f(cop)m(y)i(of)g @@ -4506,25 +4559,25 @@ y(T)g(driver.c)240 4173 y(T)g(frontend.c)240 4277 y(T)g(parser.c)125 (to)h(all)f(the)h(\014les)0 4684 y(in)41 b(that)j(directory)-8 b(,)45 b(and)d(\(recursiv)m(ely\),)k(to)d(an)m(y)g(sub)s(directories)d (that)j(it)g(ma)m(y)g(con)m(tain.)78 b(See)42 b(Chapter)h(9)0 -4809 y([Recursiv)m(e)30 b(b)s(eha)m(vior],)g(page)h(55.\))125 +4809 y([Recursiv)m(e)30 b(b)s(eha)m(vior],)g(page)h(57.\))125 5091 y(The)d Fn(checkout)e Fs(command)j(has)f(a)h(\015ag,)h(`)p Fn(-r)p Fs(',)f(that)h(lets)e(y)m(ou)h(c)m(hec)m(k)i(out)e(a)g(certain) f(revision)f(of)i(a)g(mo)s(dule.)0 5215 y(This)h(\015ag)i(mak)m(es)h (it)f(easy)g(to)h(retriev)m(e)f(the)h(sources)f(that)g(mak)m(e)h(up)e (release)h(1.0)h(of)g(the)f(mo)s(dule)e(`)p Fn(tc)p Fs(')i(at)h(an)m(y) 0 5340 y(time)d(in)f(the)i(future:)p eop -%%Page: 47 49 -47 48 bop 0 -116 a Fs(Chapter)30 b(7:)41 b(Branc)m(hes)2984 -b(47)240 366 y Fn($)47 b(cvs)g(checkout)f(-r)h(release-1-0)e(tc)0 +%%Page: 49 51 +49 50 bop 0 -116 a Fs(Chapter)30 b(7:)41 b(Branc)m(hes)2984 +b(49)240 366 y Fn($)47 b(cvs)g(checkout)f(-r)h(release-1-0)e(tc)0 641 y Fs(This)32 b(is)h(useful,)h(for)g(instance,)h(if)e(someone)i (claims)e(that)h(there)g(is)g(a)g(bug)g(in)e(that)j(release,)h(but)d(y) m(ou)h(cannot)0 766 y(\014nd)29 b(the)h(bug)g(in)f(the)i(curren)m(t)f (w)m(orking)g(cop)m(y)-8 b(.)125 1041 y(Y)g(ou)42 b(can)g(also)f(c)m (hec)m(k)i(out)f(a)g(mo)s(dule)e(as)i(it)f(w)m(as)h(at)g(an)m(y)g(giv)m (en)g(date.)75 b(See)42 b(Section)f(A.6.1)i([c)m(hec)m(k)m(out)0 -1165 y(options],)30 b(page)h(98.)125 1440 y(When)j(y)m(ou)h(tag)h(more) -f(than)f(one)h(\014le)f(with)f(the)i(same)g(tag)h(y)m(ou)f(can)g(think) -f(ab)s(out)g(the)h(tag)h(as)f Fn(")p Fs(a)g(curv)m(e)0 +1165 y(options],)30 b(page)h(100.)125 1440 y(When)j(y)m(ou)h(tag)h +(more)f(than)f(one)h(\014le)f(with)f(the)i(same)g(tag)h(y)m(ou)f(can)g +(think)f(ab)s(out)g(the)h(tag)h(as)f Fn(")p Fs(a)g(curv)m(e)0 1565 y(dra)m(wn)e(through)h(a)g(matrix)f(of)i(\014lename)e(vs.)52 b(revision)32 b(n)m(um)m(b)s(er.)p Fn(")h Fs(Sa)m(y)h(w)m(e)h(ha)m(v)m (e)g(5)f(\014les)f(with)g(the)h(follo)m(wing)0 1689 y(revisions:)622 @@ -4555,11 +4608,11 @@ y Fm(7.2)68 b(What)31 b(branc)l(hes)f(are)h(go)t(o)t(d)f(for)125 (tc,)h(planning)c(to)0 5340 y(create)h(release)f(1.1)h(in)d(a)i(couple) f(of)g(mon)m(ths.)50 b(After)34 b(a)g(while)e(y)m(our)h(customers)h (start)g(to)g(complain)e(ab)s(out)i(a)p eop -%%Page: 48 50 -48 49 bop 0 -116 a Fs(48)2411 b(CVS|Concurren)m(t)29 +%%Page: 50 52 +50 51 bop 0 -116 a Fs(50)2411 b(CVS|Concurren)m(t)29 b(V)-8 b(ersions)30 b(System)0 366 y(fatal)d(bug.)39 b(Y)-8 b(ou)28 b(c)m(hec)m(k)g(out)g(release)f(1.0)h(\(see)g(Section)f -(7.1)h([T)-8 b(ags],)29 b(page)f(45\))g(and)f(\014nd)e(the)j(bug)e +(7.1)h([T)-8 b(ags],)29 b(page)f(47\))g(and)f(\014nd)e(the)j(bug)e (\(whic)m(h)g(turns)0 491 y(out)36 b(to)g(ha)m(v)m(e)h(a)f(trivial)e (\014x\).)56 b(Ho)m(w)m(ev)m(er,)39 b(the)d(curren)m(t)f(revision)f(of) i(the)f(sources)h(are)g(in)e(a)i(state)h(of)f(\015ux)f(and)0 @@ -4580,9 +4633,9 @@ g(select)f(to)h(either)f(incorp)s(orate)g(them)g(on)0 (create)h(a)g(branc)m(h.)41 b(The)30 b Fn(rtag)f Fs(command)i(is)f(m)m (uc)m(h)g(lik)m(e)g Fn(tag)p Fs(,)h(but)0 2293 y(it)d(do)s(es)h(not)g (require)f(that)h(y)m(ou)g(ha)m(v)m(e)h(a)g(w)m(orking)e(cop)m(y)h(of)g -(the)h(mo)s(dule.)38 b(See)29 b(Section)g(A.15)h([rtag],)h(page)e(116.) +(the)h(mo)s(dule.)38 b(See)29 b(Section)g(A.15)h([rtag],)h(page)e(118.) 0 2417 y(\(Y)-8 b(ou)31 b(can)g(also)f(use)g(the)h Fn(tag)e -Fs(command;)i(see)g(Section)f(A.17)i([tag],)g(page)f(118\).)240 +Fs(command;)i(see)g(Section)f(A.17)i([tag],)g(page)f(120\).)240 2676 y Fn($)47 b(cvs)g(rtag)g(-b)g(-r)g(release-1-0)e (release-1-0-patches)e(tc)125 2955 y Fs(The)d(`)p Fn(-b)p Fs(')h(\015ag)g(mak)m(es)h Fn(rtag)d Fs(create)k(a)e(branc)m(h)f @@ -4613,9 +4666,9 @@ b(\(branch:)j(1.7.2\))431 4821 y(Sticky)g(Date:)380 b(\(none\))431 b(Tags:)622 5236 y(release-1-0-patches)615 b(\(branch:)46 b(1.7.2\))622 5340 y(release-1-0)999 b(\(revision:)45 b(1.7\))p eop -%%Page: 49 51 -49 50 bop 0 -116 a Fs(Chapter)30 b(7:)41 b(Branc)m(hes)2984 -b(49)240 470 y Fn(========================)o(====)o(====)o(===)o(====)o +%%Page: 51 53 +51 52 bop 0 -116 a Fs(Chapter)30 b(7:)41 b(Branc)m(hes)2984 +b(51)240 470 y Fn(========================)o(====)o(====)o(===)o(====)o (====)o(===)o(====)o(====)o(===)o(====)o(====)o(==)240 574 y(File:)46 b(backend.c)427 b(Status:)46 b(Up-to-date)431 782 y(Version:)570 b(1.4)238 b(Tue)47 b(Dec)95 b(1)47 @@ -4646,7 +4699,7 @@ f(example)h(is)0 3318 y Fo(stic)m(ky)p Fs(,)32 b(that)g(is,)f(it)g 3442 y(cations,)i(they)g(are)f(committed)h(on)f(the)g(branc)m(h.)49 b(Y)-8 b(ou)34 b(can)f(later)h(merge)f(the)h(mo)s(di\014cations)d(in)m (to)j(the)f(main)0 3567 y(trunk.)40 b(See)30 b(Chapter)g(8)h -([Merging],)g(page)g(51.)125 3841 y(Y)-8 b(ou)30 b(can)h(use)f(the)h +([Merging],)g(page)g(53.)125 3841 y(Y)-8 b(ou)30 b(can)h(use)f(the)h Fn(status)d Fs(command)j(to)g(see)g(what)f(stic)m(ky)g(tags)i(or)e (dates)h(are)g(set:)240 4095 y Fn($)47 b(vi)h(driver.c)141 b(#)47 b Fs(Fix)30 b(the)h(bugs)240 4198 y Fn($)47 b(cvs)g(commit)f(-m) @@ -4663,8 +4716,8 @@ b(19:35:03)f(1992)431 5236 y(RCS)h(Version:)379 b(1.7.2.1)46 b(/usr/local/cvsroot/yoyody)o(ne/t)o(c/dr)o(ive)o(r.c,)o(v)431 5340 y(Sticky)g(Tag:)428 b(release-1-0-patches)43 b(\(branch:)j (1.7.2\))p eop -%%Page: 50 52 -50 51 bop 0 -116 a Fs(50)2411 b(CVS|Concurren)m(t)29 +%%Page: 52 54 +52 53 bop 0 -116 a Fs(52)2411 b(CVS|Concurren)m(t)29 b(V)-8 b(ersions)30 b(System)431 366 y Fn(Sticky)46 b(Date:)380 b(\(none\))431 470 y(Sticky)46 b(Options:)236 b(\(none\))431 678 y(Existing)45 b(Tags:)622 782 y(release-1-0-patches)615 @@ -4721,9 +4774,9 @@ y(Checking)g(out)g(file1)240 3870 y(RCS:)94 b (firs)o(t-di)o(r/f)o(ile1)o(,v)89 b(<--)95 b(file1)240 4804 y(new)47 b(revision:)e(1.3;)i(previous)e(revision:)h(1.2)240 4908 y(done)240 5012 y($)p eop -%%Page: 51 53 -51 52 bop 0 -116 a Fs(Chapter)30 b(8:)41 b(Merging)3018 -b(51)0 366 y Fp(8)80 b(Merging)125 788 y Fs(Y)-8 b(ou)22 +%%Page: 53 55 +53 54 bop 0 -116 a Fs(Chapter)30 b(8:)41 b(Merging)3018 +b(53)0 366 y Fp(8)80 b(Merging)125 788 y Fs(Y)-8 b(ou)22 b(can)g(include)d(the)j(c)m(hanges)h(made)e(b)s(et)m(w)m(een)i(an)m(y)f (t)m(w)m(o)h(revisions)d(in)m(to)h(y)m(our)h(w)m(orking)f(cop)m(y)-8 b(,)25 b(b)m(y)c Fo(merging)p Fs(.)0 912 y(Y)-8 b(ou)31 @@ -4763,10 +4816,10 @@ Fs(of)31 b(the)g(\014le.)240 4932 y Fn($)47 b(cvs)g(commit)f(-m)i 5215 y(A)40 b(con\015ict)h(can)f(result)g(from)g(a)h(merge)g(op)s (eration.)71 b(If)40 b(that)h(happ)s(ens,)h(y)m(ou)f(should)d(resolv)m (e)j(it)f(b)s(efore)0 5340 y(committing)30 b(the)g(new)g(revision.)39 -b(See)31 b(Section)f(6.3)i([Con\015icts)d(example],)i(page)g(35.)p +b(See)31 b(Section)f(6.3)i([Con\015icts)d(example],)i(page)g(37.)p eop -%%Page: 52 54 -52 53 bop 0 -116 a Fs(52)2411 b(CVS|Concurren)m(t)29 +%%Page: 54 56 +54 55 bop 0 -116 a Fs(54)2411 b(CVS|Concurren)m(t)29 b(V)-8 b(ersions)30 b(System)125 366 y(The)g Fn(checkout)e Fs(command)j(also)g(supp)s(orts)e(the)i(`)p Fn(-j)f Fo(branc)m(h)p Fs(')g(\015ag.)43 b(The)30 b(same)h(e\013ect)i(as)e(ab)s(o)m(v)m(e)h @@ -4812,9 +4865,9 @@ Fr(cvs)h Fs(merges)0 5215 y(the)35 b(c)m(hanges)g(from)g(the)f(\014rst) g(revision)f(to)i(the)g(second)g(revision.)52 b(F)-8 b(or)35 b(example,)g(in)f(this)f(case)j(the)f(simplest)0 5340 y(w)m(a)m(y)c(w)m(ould)e(b)s(e)p eop -%%Page: 53 55 -53 54 bop 0 -116 a Fs(Chapter)30 b(8:)41 b(Merging)3018 -b(53)240 366 y Fn(cvs)47 b(update)f(-j)h(1.2.2.2)f(-j)h(R1fix)g(m.c)190 +%%Page: 55 57 +55 56 bop 0 -116 a Fs(Chapter)30 b(8:)41 b(Merging)3018 +b(55)240 366 y Fn(cvs)47 b(update)f(-j)h(1.2.2.2)f(-j)h(R1fix)g(m.c)190 b(#)47 b Fs(Merge)32 b(c)m(hanges)f(from)f(1.2.2.2)j(to)e(the)2054 470 y Fn(#)47 b Fs(head)30 b(of)h(the)f(R1\014x)h(branc)m(h)125 744 y(The)23 b(problem)g(with)g(this)g(is)g(that)i(y)m(ou)g(need)f(to)h @@ -4853,16 +4906,16 @@ b(als.)125 4775 y(F)d(or)31 b(example:)240 5029 y Fn(cvs)47 b(update)f(-A)240 5132 y(touch)g(a)i(b)f(c)240 5236 y(cvs)g(add)g(a)g (b)h(c)f(;)h(cvs)f(ci)g(-m)g("added")f(a)h(b)h(c)240 5340 y(cvs)f(tag)g(-b)g(branchtag)p eop -%%Page: 54 56 -54 55 bop 0 -116 a Fs(54)2411 b(CVS|Concurren)m(t)29 +%%Page: 56 58 +56 57 bop 0 -116 a Fs(56)2411 b(CVS|Concurren)m(t)29 b(V)-8 b(ersions)30 b(System)240 366 y Fn(cvs)47 b(update)f(-r)h (branchtag)240 470 y(touch)f(d)i(;)f(cvs)g(add)g(d)240 574 y(rm)g(a)h(;)f(cvs)g(rm)g(a)240 678 y(cvs)g(ci)g(-m)g("added)f(d,)i (removed)d(a")240 782 y(cvs)i(update)f(-A)240 885 y(cvs)h(update)f (-jbranchtag)p eop -%%Page: 55 57 -55 56 bop 0 -116 a Fs(Chapter)30 b(9:)41 b(Recursiv)m(e)30 -b(b)s(eha)m(vior)2591 b(55)0 366 y Fp(9)80 b(Recursiv)l(e)30 +%%Page: 57 59 +57 58 bop 0 -116 a Fs(Chapter)30 b(9:)41 b(Recursiv)m(e)30 +b(b)s(eha)m(vior)2591 b(57)0 366 y Fp(9)80 b(Recursiv)l(e)30 b(b)t(eha)l(vior)125 738 y Fs(Almost)39 b(all)g(of)h(the)g(sub)s (commands)e(of)i Fr(cvs)f Fs(w)m(ork)h(recursiv)m(ely)f(when)f(y)m(ou)j (sp)s(ecify)d(a)j(directory)e(as)h(an)0 863 y(argumen)m(t.)h(F)-8 @@ -4898,12 +4951,12 @@ m(vior)g(of)g(the)h Fr(cvs)e Fs(sub)s(commands)g(can)h(b)s(e)g(turned)f (o\013)i(with)e(the)i(`)p Fn(-l)p Fs(')f(option.)240 5320 y Fn($)47 b(cvs)g(update)f(-l)429 b(#)48 b Fs(Don't)31 b(up)s(date)f(\014les)f(in)g(sub)s(directories)p eop -%%Page: 56 58 -56 57 bop 0 -116 a Fs(56)2411 b(CVS|Concurren)m(t)29 +%%Page: 58 60 +58 59 bop 0 -116 a Fs(58)2411 b(CVS|Concurren)m(t)29 b(V)-8 b(ersions)30 b(System)p eop -%%Page: 57 59 -57 58 bop 0 -116 a Fs(Chapter)30 b(10:)41 b(Adding)29 -b(\014les)g(to)i(a)g(directory)2252 b(57)0 366 y Fp(10)80 +%%Page: 59 61 +59 60 bop 0 -116 a Fs(Chapter)30 b(10:)41 b(Adding)29 +b(\014les)g(to)i(a)g(directory)2252 b(59)0 366 y Fp(10)80 b(Adding)30 b(\014les)g(to)g(a)g(directory)125 756 y Fs(T)-8 b(o)30 b(add)g(a)h(new)f(\014le)f(to)i(a)g(directory)-8 b(,)31 b(follo)m(w)e(these)i(steps.)75 1033 y Fq(\017)60 @@ -4916,7 +4969,7 @@ b(`)p Fn(cvs)i(add)f Fo(\014lename)5 b Fs(')28 b(to)g(tell)f Fr(cvs)g Fs(that)h(y)m(ou)g(w)m(an)m(t)h(to)f(v)m(ersion)g(con)m(trol)g (the)g(\014le.)39 b(If)27 b(the)h(\014le)f(con)m(tains)180 1462 y(binary)i(data,)i(sp)s(ecify)e(`)p Fn(-kb)p Fs(')h(\(see)h -(Chapter)f(18)h([Binary)f(\014les],)g(page)h(79\).)75 +(Chapter)f(18)h([Binary)f(\014les],)g(page)h(81\).)75 1615 y Fq(\017)60 b Fs(Use)35 b(`)p Fn(cvs)29 b(commit)g Fo(\014lename)5 b Fs(')34 b(to)h(actually)f(c)m(hec)m(k)i(in)d(the)i (\014le)e(in)m(to)h(the)h(rep)s(ository)-8 b(.)52 b(Other)34 @@ -4940,7 +4993,7 @@ f(directory)-8 b(.)39 b(T)-8 b(o)29 b(add)e(a)i(whole)e(new)h (ository)g(\(for)h(example,)g(\014les)f(receiv)m(ed)h(from)f(a)h (third-part)m(y)e(v)m(endor\),)j(use)f(the)240 3637 y Fn(import)29 b Fs(command)h(instead.)40 b(See)30 b(Section)h(A.11)g -([imp)s(ort],)f(page)h(108.)240 3914 y(The)h(added)g(\014les)g(are)i +([imp)s(ort],)f(page)h(110.)240 3914 y(The)h(added)g(\014les)g(are)i (not)f(placed)f(in)f(the)j(source)f(rep)s(ository)e(un)m(til)g(y)m(ou)j (use)e Fn(commit)f Fs(to)j(mak)m(e)240 4039 y(the)42 b(c)m(hange)g(p)s(ermanen)m(t.)73 b(Doing)41 b(an)g Fn(add)g @@ -4948,24 +5001,24 @@ Fs(on)g(a)h(\014le)e(that)i(w)m(as)g(remo)m(v)m(ed)g(with)e(the)i Fn(remove)240 4163 y Fs(command)c(will)e(undo)h(the)h(e\013ect)i(of)e (the)h Fn(remove)p Fs(,)f(unless)f(a)h Fn(commit)f Fs(command)h(in)m (terv)m(ened.)240 4288 y(See)31 b(Chapter)e(11)j([Remo)m(ving)e -(\014les],)g(page)h(59,)h(for)e(an)g(example.)240 4565 +(\014les],)g(page)h(61,)h(for)e(an)g(example.)240 4565 y(The)36 b(`)p Fn(-k)p Fs(')h(option)g(sp)s(eci\014es)f(the)h(default)f (w)m(a)m(y)i(that)f(this)f(\014le)g(will)f(b)s(e)h(c)m(hec)m(k)m(ed)j (out;)i(for)c(more)240 4689 y(information)29 b(see)i(Section)f(17.4)i -([Substitution)c(mo)s(des],)i(page)h(77.)240 4966 y(The)41 +([Substitution)c(mo)s(des],)i(page)h(79.)240 4966 y(The)41 b(`)p Fn(-m)p Fs(')g(option)f(sp)s(eci\014es)g(a)i(description)d(for)i (the)g(\014le.)72 b(This)39 b(description)h(app)s(ears)g(in)g(the)240 5091 y(history)35 b(log)h(\(if)g(it)f(is)h(enabled,)g(see)h(Section)f -(C.10)h([history)e(\014le],)i(page)g(147\).)60 b(It)36 +(C.10)h([history)e(\014le],)i(page)g(149\).)60 b(It)36 b(will)d(also)k(b)s(e)240 5215 y(sa)m(v)m(ed)31 b(in)f(the)g(v)m (ersion)g(history)f(inside)f(the)j(rep)s(ository)e(when)h(the)g(\014le) g(is)f(committed.)41 b(The)30 b Fn(log)240 5340 y Fs(command)h(displa)m (ys)f(this)g(description.)41 b(The)31 b(description)f(can)h(b)s(e)g(c)m (hanged)h(using)e(`)p Fn(admin)f(-t)p Fs('.)p eop -%%Page: 58 60 -58 59 bop 0 -116 a Fs(58)2411 b(CVS|Concurren)m(t)29 +%%Page: 60 62 +60 61 bop 0 -116 a Fs(60)2411 b(CVS|Concurren)m(t)29 b(V)-8 b(ersions)30 b(System)240 366 y(See)c(Section)h(A.5)g([admin],)f -(page)h(93.)40 b(If)26 b(y)m(ou)g(omit)g(the)h(`)p Fn(-m)j +(page)h(95.)40 b(If)26 b(y)m(ou)g(omit)g(the)h(`)p Fn(-m)j Fo(description)p Fs(')24 b(\015ag,)k(an)e(empt)m(y)h(string)240 491 y(will)h(b)s(e)h(used.)40 b(Y)-8 b(ou)31 b(will)d(not)j(b)s(e)e (prompted)h(for)g(a)h(description.)125 815 y(F)-8 b(or)31 @@ -4975,14 +5028,14 @@ y Fn($)47 b(cvs)g(add)g(backend.c)240 1172 y($)g(cvs)g(commit)f(-m)i ("Early)e(version.)f(Not)i(yet)g(compilable.")e(backend.c)125 1446 y Fs(When)d(y)m(ou)i(add)e(a)i(\014le)e(it)g(is)g(added)h(only)f (on)h(the)g(branc)m(h)g(whic)m(h)e(y)m(ou)j(are)f(w)m(orking)g(on)g -(\(see)h(Chap-)0 1570 y(ter)33 b(7)h([Branc)m(hes],)h(page)f(45\).)50 +(\(see)h(Chap-)0 1570 y(ter)33 b(7)h([Branc)m(hes],)h(page)f(47\).)50 b(Y)-8 b(ou)33 b(can)h(later)f(merge)h(the)f(additions)e(to)j(another)f (branc)m(h)g(if)f(y)m(ou)h(w)m(an)m(t)h(\(see)0 1695 y(Section)c(8.4)i([Merging)e(adds)g(and)g(remo)m(v)-5 -b(als],)31 b(page)g(53\).)p eop -%%Page: 59 61 -59 60 bop 0 -116 a Fs(Chapter)30 b(11:)41 b(Remo)m(ving)31 -b(\014les)2720 b(59)0 366 y Fp(11)80 b(Remo)l(ving)29 +b(als],)31 b(page)g(55\).)p eop +%%Page: 61 63 +61 62 bop 0 -116 a Fs(Chapter)30 b(11:)41 b(Remo)m(ving)31 +b(\014les)2720 b(61)0 366 y Fp(11)80 b(Remo)l(ving)29 b(\014les)125 732 y Fs(Mo)s(dules)37 b(c)m(hange.)66 b(New)39 b(\014les)e(are)i(added,)h(and)e(old)g(\014les)f(disapp)s (ear.)63 b(Still,)39 b(y)m(ou)g(w)m(an)m(t)g(to)g(b)s(e)f(able)g(to)0 @@ -5039,8 +5092,8 @@ y($)f(cvs)g(remove)240 4717 y(cvs)g(remove:)f(Removing)f(.)240 (files)f(permanently)240 5132 y($)h(cvs)g(ci)h(-m)f("Removed)e (unneeded)h(files")240 5236 y(cvs)h(commit:)f(Examining)f(.)240 5340 y(cvs)i(commit:)f(Committing)f(.)p eop -%%Page: 60 62 -60 61 bop 0 -116 a Fs(60)2411 b(CVS|Concurren)m(t)29 +%%Page: 62 64 +62 63 bop 0 -116 a Fs(62)2411 b(CVS|Concurren)m(t)29 b(V)-8 b(ersions)30 b(System)125 366 y(If)k(y)m(ou)h(c)m(hange)h(y)m (our)e(mind)f(y)m(ou)i(can)g(easily)e(resurrect)i(the)g(\014le)e(b)s (efore)i(y)m(ou)g(commit)f(it,)i(using)d(the)i Fn(add)0 @@ -5058,14 +5111,14 @@ b(\014le:)240 2226 y Fn($)47 b(rm)h(oj.c)240 2330 y($)f(cvs)g(update)f 2538 y(U)g(oj.c)125 2811 y Fs(When)30 b(y)m(ou)g(remo)m(v)m(e)i(a)f (\014le)f(it)g(is)f(remo)m(v)m(ed)i(only)f(on)g(the)h(branc)m(h)f(whic) m(h)f(y)m(ou)h(are)h(w)m(orking)f(on)g(\(see)i(Chap-)0 -2936 y(ter)i(7)h([Branc)m(hes],)h(page)f(45\).)53 b(Y)-8 +2936 y(ter)i(7)h([Branc)m(hes],)h(page)f(47\).)53 b(Y)-8 b(ou)35 b(can)f(later)g(merge)h(the)f(remo)m(v)-5 b(als)35 b(to)g(another)f(branc)m(h)f(if)h(y)m(ou)g(w)m(an)m(t)h(\(see)0 3061 y(Section)30 b(8.4)i([Merging)e(adds)g(and)g(remo)m(v)-5 -b(als],)31 b(page)g(53\).)p eop -%%Page: 61 63 -61 62 bop 0 -116 a Fs(Chapter)30 b(12:)41 b(Remo)m(ving)31 -b(directories)2462 b(61)0 366 y Fp(12)80 b(Remo)l(ving)29 +b(als],)31 b(page)g(55\).)p eop +%%Page: 63 65 +63 64 bop 0 -116 a Fs(Chapter)30 b(12:)41 b(Remo)m(ving)31 +b(directories)2462 b(63)0 366 y Fp(12)80 b(Remo)l(ving)29 b(directories)125 740 y Fs(In)i(concept)i(remo)m(ving)g(directories)e (is)g(somewhat)i(similar)d(to)j(remo)m(ving)f(\014les|y)m(ou)g(w)m(an)m (t)h(the)f(directory)0 865 y(to)26 b(not)g(exist)f(in)f(y)m(our)i @@ -5092,12 +5145,12 @@ b(w)m(a)m(y)j Fr(cvs)f Fs(will)0 2160 y(b)s(e)35 b(able)f(to)j (whether)g(the)g(particular)f(v)m(ersion)h(y)m(ou)0 2284 y(are)c(c)m(hec)m(king)g(out)g(con)m(tains)f(an)m(y)h(\014les)e(in)g (that)i(directory)-8 b(.)p eop -%%Page: 62 64 -62 63 bop 0 -116 a Fs(62)2411 b(CVS|Concurren)m(t)29 +%%Page: 64 66 +64 65 bop 0 -116 a Fs(64)2411 b(CVS|Concurren)m(t)29 b(V)-8 b(ersions)30 b(System)p eop -%%Page: 63 65 -63 64 bop 0 -116 a Fs(Chapter)30 b(13:)41 b(T)-8 b(rac)m(king)31 -b(third-part)m(y)e(sources)2168 b(63)0 366 y Fp(13)80 +%%Page: 65 67 +65 66 bop 0 -116 a Fs(Chapter)30 b(13:)41 b(T)-8 b(rac)m(king)31 +b(third-part)m(y)e(sources)2168 b(65)0 366 y Fp(13)80 b(T)-13 b(rac)l(king)30 b(third-part)l(y)g(sources)125 748 y Fs(If)25 b(y)m(ou)i(mo)s(dify)d(a)j(program)f(to)h(b)s(etter)f (\014t)g(y)m(our)g(site,)h(y)m(ou)g(probably)d(w)m(an)m(t)k(to)f @@ -5133,7 +5186,7 @@ Fo(release)h(tags)k Fs(are)c(useful.)38 b(The)29 b Fo(v)m(endor)h(tag)0 3559 y Fs(is)g(a)g(sym)m(b)s(olic)f(name)i(for)f(the)h(branc)m(h)f (\(whic)m(h)f(is)h(alw)m(a)m(ys)h(1.1.1,)i(unless)28 b(y)m(ou)j(use)f(the)h(`)p Fn(-b)f Fo(branc)m(h)p Fs(')g(\015ag|See)0 -3683 y(Section)j(A.11.1)h([imp)s(ort)e(options],)h(page)g(109.\).)50 +3683 y(Section)j(A.11.1)h([imp)s(ort)e(options],)h(page)g(111.\).)50 b(The)32 b Fo(release)h(tags)38 b Fs(are)33 b(sym)m(b)s(olic)e(names)i (for)f(a)i(particular)0 3808 y(release,)d(suc)m(h)f(as)h(`)p Fn(FSF_0_04)p Fs('.)125 4083 y(Note)k(that)f Fn(import)e @@ -5155,8 +5208,8 @@ b(start)h(b)m(y)g(imp)s(orting)d(the)i(source)h(to)g(y)m(our)f(rep)s (ository:)240 5236 y Fn($)47 b(cd)h(wdiff-0.04)240 5340 y($)f(cvs)g(import)f(-m)i("Import)d(of)j(FSF)f(v.)g(0.04")f(fsf/wdiff)f (FSF_DIST)h(WDIFF_0_04)p eop -%%Page: 64 66 -64 65 bop 0 -116 a Fs(64)2411 b(CVS|Concurren)m(t)29 +%%Page: 66 68 +66 67 bop 0 -116 a Fs(66)2411 b(CVS|Concurren)m(t)29 b(V)-8 b(ersions)30 b(System)125 366 y(The)e(v)m(endor)h(tag)i(is)d (named)h(`)p Fn(FSF_DIST)p Fs(')e(in)h(the)h(ab)s(o)m(v)m(e)i(example,) e(and)g(the)g(only)g(release)g(tag)h(assigned)f(is)0 @@ -5187,7 +5240,7 @@ Fn(wdiff)p Fs(',)f(merging)g(the)h(c)m(hanges)g(made)f(on)h(the)0 b(.)50 b(If)32 b(an)m(y)i(con\015icts)e(arise)h(during)e(the)0 3208 y(merge)37 b(they)f(should)e(b)s(e)i(resolv)m(ed)g(in)f(the)h (normal)g(w)m(a)m(y)h(\(see)g(Section)f(6.3)h([Con\015icts)f(example],) -i(page)e(35\).)0 3333 y(Then,)30 b(the)g(mo)s(di\014ed)e(\014les)i(ma)m +i(page)e(37\).)0 3333 y(Then,)30 b(the)g(mo)s(di\014ed)e(\014les)i(ma)m (y)h(b)s(e)e(committed.)125 3607 y(Using)j(a)i(date,)i(as)d(suggested)i (ab)s(o)m(v)m(e,)g(assumes)f(that)g(y)m(ou)g(do)f(not)h(imp)s(ort)e (more)i(than)f(one)h(release)g(of)g(a)0 3731 y(pro)s(duct)29 @@ -5207,32 +5260,32 @@ Fn(~/work.d/wdiff)p Fs(',)e(and)j(y)m(ou)g(w)m(an)m(t)h(to)g(rev)m(ert) g(to)f(the)h(v)m(endor's)f(v)m(ersion)f(for)h(all)f(the)0 5340 y(\014les)i(in)g(that)i(directory)-8 b(,)31 b(y)m(ou)g(w)m(ould)e (t)m(yp)s(e:)p eop -%%Page: 65 67 -65 66 bop 0 -116 a Fs(Chapter)30 b(13:)41 b(T)-8 b(rac)m(king)31 -b(third-part)m(y)e(sources)2168 b(65)240 366 y Fn($)47 +%%Page: 67 69 +67 68 bop 0 -116 a Fs(Chapter)30 b(13:)41 b(T)-8 b(rac)m(king)31 +b(third-part)m(y)e(sources)2168 b(67)240 366 y Fn($)47 b(cd)h(~/work.d/wdiff)240 470 y($)f(cvs)g(admin)g(-bWDIFF)f(.)0 744 y Fs(Y)-8 b(ou)25 b(m)m(ust)g(sp)s(ecify)e(the)i(`)p Fn(-bWDIFF)p Fs(')e(without)h(an)m(y)g(space)i(after)f(the)g(`)p Fn(-b)p Fs('.)38 b(See)25 b(Section)g(A.5.1)h([admin)d(options],)0 -869 y(page)31 b(93.)0 1317 y Fm(13.4)68 b(Ho)l(w)31 b(to)g(handle)g +869 y(page)31 b(95.)0 1317 y Fm(13.4)68 b(Ho)l(w)31 b(to)g(handle)g (binary)f(\014les)h(with)g(cvs)f(imp)t(ort)125 1591 y Fs(Use)j(the)g(`)p Fn(-k)p Fs(')h(wrapp)s(er)d(option)i(to)h(tell)e (imp)s(ort)f(whic)m(h)h(\014les)h(are)g(binary)-8 b(.)48 b(See)33 b(Section)g(C.2)h([W)-8 b(rapp)s(ers],)0 1716 -y(page)31 b(137.)p eop -%%Page: 66 68 -66 67 bop 0 -116 a Fs(66)2411 b(CVS|Concurren)m(t)29 +y(page)31 b(139.)p eop +%%Page: 68 70 +68 69 bop 0 -116 a Fs(68)2411 b(CVS|Concurren)m(t)29 b(V)-8 b(ersions)30 b(System)p eop -%%Page: 67 69 -67 68 bop 0 -116 a Fs(Chapter)30 b(14:)41 b(Mo)m(ving)31 -b(and)f(renaming)f(\014les)2244 b(67)0 366 y Fp(14)80 +%%Page: 69 71 +69 70 bop 0 -116 a Fs(Chapter)30 b(14:)41 b(Mo)m(ving)31 +b(and)f(renaming)f(\014les)2244 b(69)0 366 y Fp(14)80 b(Mo)l(ving)30 b(and)g(renaming)g(\014les)125 743 y Fs(Mo)m(ving)39 b(\014les)e(to)j(a)f(di\013eren)m(t)f(directory)g(or)h(renaming)f(them) g(is)g(not)h(di\016cult,)g(but)f(some)h(of)g(the)g(w)m(a)m(ys)0 867 y(in)e(whic)m(h)g(this)g(w)m(orks)h(ma)m(y)h(b)s(e)e(non-ob)m (vious.)64 b(\(Mo)m(ving)39 b(or)f(renaming)f(a)i(directory)e(is)h(ev)m (en)g(harder.)64 b(See)0 992 y(Chapter)30 b(15)h([Mo)m(ving)g -(directories],)f(page)h(71.\).)125 1266 y(The)e(examples)h(b)s(elo)m(w) +(directories],)f(page)h(73.\).)125 1266 y(The)e(examples)h(b)s(elo)m(w) g(assume)g(that)h(the)g(\014le)e Fo(old)k Fs(is)d(renamed)f(to)j Fo(new)p Fs(.)0 1720 y Fm(14.1)68 b(The)30 b(Normal)i(w)l(a)l(y)f(to)g (Rename)125 1994 y Fs(The)d(normal)f(w)m(a)m(y)j(to)f(mo)m(v)m(e)h(a)f @@ -5259,7 +5312,7 @@ Fn(cvs)29 b(log)g Fo(old)40 b Fs(will)33 b(giv)m(e)0 (um)m(b)s(ers)h(will)f(start)j(at)g(1.0)g(again,)g(so)f(if)g(that)h(b)s (others)e(y)m(ou,)i(use)0 3856 y(the)h(`)p Fn(-r)f(rev)p Fs(')f(option)h(to)h(commit)g(\(see)g(Section)f(A.7.1)i([commit)e -(options],)h(page)g(100\))0 4309 y Fm(14.2)68 b(Mo)l(ving)31 +(options],)h(page)g(102\))0 4309 y Fm(14.2)68 b(Mo)l(ving)31 b(the)g(history)g(\014le)125 4583 y Fs(This)g(metho)s(d)j(is)e(more)i (dangerous,)h(since)e(it)g(in)m(v)m(olv)m(es)h(mo)m(ving)f(\014les)g (inside)e(the)j(rep)s(ository)-8 b(.)50 b(Read)34 b(this)0 @@ -5267,8 +5320,8 @@ b(the)g(history)g(\014le)125 4583 y Fs(This)g(metho)s(d)j(is)e(more)i 4962 y Fn($)47 b(cd)h($CVSROOT/)p Fo(mo)s(dule)240 5065 y Fn($)f(mv)h Fo(old)p Fn(,v)e Fo(new)p Fn(,v)0 5340 y Fs(Adv)-5 b(an)m(tages:)p eop -%%Page: 68 70 -68 69 bop 0 -116 a Fs(68)2411 b(CVS|Concurren)m(t)29 +%%Page: 70 72 +70 71 bop 0 -116 a Fs(70)2411 b(CVS|Concurren)m(t)29 b(V)-8 b(ersions)30 b(System)75 366 y Fq(\017)60 b Fs(The)30 b(log)g(of)h(c)m(hanges)g(is)f(main)m(tained)f(in)m(tact.)75 516 y Fq(\017)60 b Fs(The)30 b(revision)e(n)m(um)m(b)s(ers)h(are)i(not) @@ -5312,29 +5365,29 @@ Fo(date)5 b Fs(')41 b(to)180 5040 y(retriev)m(e)31 b(the)f(revisions.) (tained)f(in)m(tact.)75 5340 y Fq(\017)60 b Fs(The)30 b(revision)e(n)m(um)m(b)s(ers)h(are)i(not)g(a\013ected.)p eop -%%Page: 69 71 -69 70 bop 0 -116 a Fs(Chapter)30 b(14:)41 b(Mo)m(ving)31 -b(and)f(renaming)f(\014les)2244 b(69)0 366 y(Disadv)-5 +%%Page: 71 73 +71 72 bop 0 -116 a Fs(Chapter)30 b(14:)41 b(Mo)m(ving)31 +b(and)f(renaming)f(\014les)2244 b(71)0 366 y(Disadv)-5 b(an)m(tages:)75 640 y Fq(\017)60 b Fs(Y)-8 b(ou)31 b(cannot)g(easily)e (see)i(the)g(history)e(of)i(the)f(\014le)g(across)h(the)f(rename.)75 790 y Fq(\017)60 b Fs(Unless)33 b(y)m(ou)h(use)g(the)h(`)p Fn(-r)30 b(rev)p Fs(')j(\(see)i(Section)f(A.7.1)h([commit)g(options],)g -(page)f(100\))i(\015ag)e(when)g Fo(new)41 b Fs(is)180 +(page)f(102\))i(\015ag)e(when)g Fo(new)41 b Fs(is)180 914 y(committed)31 b(its)e(revision)g(n)m(um)m(b)s(ers)g(will)f(start)i (at)i(1.0)f(again.)p eop -%%Page: 70 72 -70 71 bop 0 -116 a Fs(70)2411 b(CVS|Concurren)m(t)29 +%%Page: 72 74 +72 73 bop 0 -116 a Fs(72)2411 b(CVS|Concurren)m(t)29 b(V)-8 b(ersions)30 b(System)p eop -%%Page: 71 73 -71 72 bop 0 -116 a Fs(Chapter)30 b(15:)41 b(Mo)m(ving)31 -b(and)f(renaming)f(directories)1986 b(71)0 366 y Fp(15)80 +%%Page: 73 75 +73 74 bop 0 -116 a Fs(Chapter)30 b(15:)41 b(Mo)m(ving)31 +b(and)f(renaming)f(directories)1986 b(73)0 366 y Fp(15)80 b(Mo)l(ving)30 b(and)g(renaming)g(directories)125 740 y Fs(The)40 b(normal)f(w)m(a)m(y)j(to)f(rename)g(or)f(mo)m(v)m(e)j(a)e (directory)f(is)f(to)j(rename)e(or)h(mo)m(v)m(e)h(eac)m(h)g(\014le)d (within)g(it)h(as)0 865 y(describ)s(ed)29 b(in)h(Section)h(14.1)i -([Outside],)e(page)h(67.)44 b(Then)30 b(c)m(hec)m(k)j(out)f(with)e(the) +([Outside],)e(page)h(69.)44 b(Then)30 b(c)m(hec)m(k)j(out)f(with)e(the) h(`)p Fn(-P)p Fs(')g(option,)h(as)f(describ)s(ed)e(in)0 -989 y(Chapter)h(12)h([Remo)m(ving)g(directories],)f(page)h(61.)125 +989 y(Chapter)h(12)h([Remo)m(ving)g(directories],)f(page)h(63.)125 1263 y(If)f(y)m(ou)i(really)e(w)m(an)m(t)h(to)h(hac)m(k)g(the)f(rep)s (ository)f(to)i(rename)f(or)g(delete)h(a)f(directory)g(in)e(the)j(rep)s (ository)-8 b(,)31 b(y)m(ou)0 1388 y(can)g(do)f(it)g(lik)m(e)g(this:)49 @@ -5362,12 +5415,12 @@ k(to)f(w)m(ork)g(for)f(him,)0 3015 y(un)m(til)29 b(he)h(remo)m(v)m(es)i (unlik)m(ely)d(to)j(b)s(e)f(able)g(to)i(retriev)m(e)f(old)f(releases)g (correctly)-8 b(,)36 b(since)d(they)0 3538 y(probably)c(dep)s(end)f(on) i(the)h(name)f(of)h(the)g(directories.)p eop -%%Page: 72 74 -72 73 bop 0 -116 a Fs(72)2411 b(CVS|Concurren)m(t)29 +%%Page: 74 76 +74 75 bop 0 -116 a Fs(74)2411 b(CVS|Concurren)m(t)29 b(V)-8 b(ersions)30 b(System)p eop -%%Page: 73 75 -73 74 bop 0 -116 a Fs(Chapter)30 b(16:)41 b(History)30 -b(bro)m(wsing)2622 b(73)0 366 y Fp(16)80 b(History)31 +%%Page: 75 77 +75 76 bop 0 -116 a Fs(Chapter)30 b(16:)41 b(History)30 +b(bro)m(wsing)2622 b(75)0 366 y Fp(16)80 b(History)31 b(bro)l(wsing)125 742 y Fs(Once)c(y)m(ou)i(ha)m(v)m(e)g(used)e Fr(cvs)g Fs(to)i(store)f(a)h(v)m(ersion)e(con)m(trol)i(history|what)d (\014les)h(ha)m(v)m(e)i(c)m(hanged)g(when,)f(ho)m(w,)0 @@ -5379,14 +5432,14 @@ y Fs(Whenev)m(er)g(y)m(ou)f(commit)h(a)f(\014le)g(y)m(ou)g(sp)s(ecify)g (log)g(messages)h(whic)m(h)e(ha)m(v)m(e)i(b)s(een)e(sp)s(eci\014ed)f (for)i(ev)m(ery)h(revision)d(whic)m(h)h(has)h(b)s(een)0 1993 y(committed,)e(use)f(the)g Fn(cvs)g(log)f Fs(command)i(\(see)g -(Section)f(A.12)i([log],)f(page)g(110\).)0 2445 y Fm(16.2)68 +(Section)f(A.12)i([log],)f(page)g(113\).)0 2445 y Fm(16.2)68 b(The)30 b(history)h(database)125 2720 y Fs(Y)-8 b(ou)27 b(can)h(use)f(the)g(history)f(\014le)g(\(see)i(Section)f(C.10)h -([history)f(\014le],)g(page)h(147\))h(to)f(log)f(v)-5 +([history)f(\014le],)g(page)h(149\))h(to)f(log)f(v)-5 b(arious)26 b Fr(cvs)g Fs(actions.)0 2844 y(T)-8 b(o)30 b(retriev)m(e)g(the)g(information)d(from)i(the)h(history)f(\014le,)g (use)g(the)h Fn(cvs)f(history)f Fs(command)h(\(see)h(Section)g(A.10)0 -2969 y([history],)g(page)h(106\).)0 3421 y Fm(16.3)68 +2969 y([history],)g(page)h(108\).)0 3421 y Fm(16.3)68 b(User-de\014ned)31 b(logging)125 3696 y Fs(Y)-8 b(ou)32 b(can)g(customize)g Fr(cvs)e Fs(to)j(log)e(v)-5 b(arious)31 b(kinds)f(of)i(actions,)g(in)e(whatev)m(er)j(manner)e(y)m(ou)h(c)m(ho)s @@ -5399,7 +5452,7 @@ b(The)23 b(script)g(migh)m(t)h(app)s(end)f(a)h(message)i(to)f(a)0 (message)g(to)g(a)g(particular)d(newsgroup.)39 b(T)-8 b(o)30 b(log)f(commits,)h(use)f(the)g(`)p Fn(loginfo)p Fs(')f(\014le)g(\(see)0 4194 y(Section)36 b(C.7)g([loginfo],)h(page)g -(143\).)59 b(T)-8 b(o)36 b(log)g(commits,)h(c)m(hec)m(k)m(outs,)j(exp)s +(145\).)59 b(T)-8 b(o)36 b(log)g(commits,)h(c)m(hec)m(k)m(outs,)j(exp)s (orts,)d(and)f(tags,)i(resp)s(ectiv)m(ely)-8 b(,)38 b(y)m(ou)0 4318 y(can)e(also)h(use)e(the)i(`)p Fn(-i)p Fs(',)g(`)p Fn(-o)p Fs(',)h(`)p Fn(-e)p Fs(',)g(and)d(`)p Fn(-t)p @@ -5409,21 +5462,21 @@ y(giving)d(noti\014cations)h(to)h(v)-5 b(arious)35 b(users,)h(whic)m(h) e(requires)g(less)h(in)f(the)i(w)m(a)m(y)h(of)e(k)m(eeping)h(cen)m (tralized)f(scripts)0 4567 y(up)f(to)i(date,)h(use)e(the)h Fn(cvs)29 b(watch)g(add)34 b Fs(command)h(\(see)h(Section)g(6.6.2)g -([Getting)h(Noti\014ed],)f(page)g(40\);)j(this)0 4692 +([Getting)h(Noti\014ed],)f(page)g(42\);)j(this)0 4692 y(command)30 b(is)g(useful)e(ev)m(en)j(if)f(y)m(ou)g(are)h(not)g(using) e Fn(cvs)g(watch)g(on)p Fs(.)125 4966 y(The)c(`)p Fn(taginfo)p Fs(')f(\014le)h(de\014nes)g(programs)h(to)h(execute)g(when)e(someone)i (executes)g(a)f Fn(tag)f Fs(or)h Fn(rtag)f Fs(command.)0 5091 y(The)30 b(`)p Fn(taginfo)p Fs(')f(\014le)g(has)i(the)f(standard)g (form)g(for)g(administrativ)m(e)f(\014les)g(\(see)j(App)s(endix)c(C)i -([Administrativ)m(e)0 5215 y(\014les],)35 b(page)h(135\),)h(where)d +([Administrativ)m(e)0 5215 y(\014les],)35 b(page)h(137\),)h(where)d (eac)m(h)i(line)d(is)h(a)h(regular)f(expression)f(follo)m(w)m(ed)h(b)m (y)h(a)g(command)f(to)i(execute.)54 b(The)0 5340 y(argumen)m(ts)29 b(passed)g(to)h(the)f(command)g(are,)h(in)e(order,)h(the)g Fo(tagname)p Fs(,)i Fo(op)s(eration)e Fs(\()p Fn(add)f Fs(for)h Fn(tag)p Fs(,)g Fn(mov)f Fs(for)h Fn(tag)p eop -%%Page: 74 76 -74 75 bop 0 -116 a Fs(74)2411 b(CVS|Concurren)m(t)29 +%%Page: 76 78 +76 77 bop 0 -116 a Fs(76)2411 b(CVS|Concurren)m(t)29 b(V)-8 b(ersions)30 b(System)0 366 y Fn(-F)p Fs(,)h(and)g Fn(del)g Fs(for)g Fn(tag)f(-d)p Fs(\),)h Fo(rep)s(ository)p Fs(,)g(and)g(an)m(y)h(remaining)e(are)i(pairs)e(of)i @@ -5451,16 +5504,16 @@ b(line)g(1)35 b Fs(line.)56 b(This)33 b(rep)s(ort)j(do)s(esn't)f(tell)g (y)m(ou)h(an)m(ything)f(ab)s(out)h(lines)240 2828 y(whic)m(h)23 b(ha)m(v)m(e)i(b)s(een)e(deleted)h(or)f(replaced;)j(y)m(ou)e(need)g(to) h(use)e Fn(cvs)30 b(diff)22 b Fs(for)i(that)h(\(see)f(Section)g(A.8)240 -2953 y([di\013)7 b(],)30 b(page)h(103\).)125 3276 y(The)i(options)h(to) +2953 y([di\013)7 b(],)30 b(page)h(105\).)125 3276 y(The)i(options)h(to) h Fn(cvs)29 b(annotate)j Fs(are)j(listed)e(in)f(App)s(endix)g(B)i([In)m -(v)m(oking)h(CVS],)f(page)h(125,)h(and)e(can)h(b)s(e)0 +(v)m(oking)h(CVS],)f(page)h(127,)h(and)e(can)h(b)s(e)0 3401 y(used)41 b(to)h(select)g(the)f(\014les)g(and)f(revisions)g(to)i (annotate.)75 b(The)41 b(options)g(are)h(describ)s(ed)d(in)h(more)i (detail)e(in)0 3525 y(Section)30 b(A.4)h([Common)g(options],)f(page)h -(90.)p eop -%%Page: 75 77 -75 76 bop 0 -116 a Fs(Chapter)30 b(17:)41 b(Keyw)m(ord)30 -b(substitution)2437 b(75)0 366 y Fp(17)80 b(Keyw)l(ord)29 +(92.)p eop +%%Page: 77 79 +77 78 bop 0 -116 a Fs(Chapter)30 b(17:)41 b(Keyw)m(ord)30 +b(substitution)2437 b(77)0 366 y Fp(17)80 b(Keyw)l(ord)29 b(substitution)125 743 y Fs(As)k(long)g(as)h(y)m(ou)f(edit)g(source)h (\014les)e(inside)f(y)m(our)j(w)m(orking)e(cop)m(y)i(of)g(a)g(mo)s (dule)d(y)m(ou)j(can)g(alw)m(a)m(ys)g(\014nd)e(out)0 @@ -5483,16 +5536,16 @@ b(R)l(CS)31 b(Keyw)l(ords)125 2242 y Fs(This)d(is)i(a)g(list)f(of)i (the)f(k)m(eyw)m(ords)h(that)g Fr(r)n(cs)e Fs(curren)m(tly)h(\(in)f (release)i(5.6.0.1\))i(supp)s(orts:)0 2568 y Fn($Author: tholo $)96 b Fs(The)30 b(login)f(name)i(of)f(the)h(user)e(who)h(c)m(hec)m(k)m(ed)j -(in)c(the)h(revision.)0 2743 y Fn($Date: 1997/02/21 06:47:01 $)192 b Fs(The)30 +(in)c(the)h(revision.)0 2743 y Fn($Date: 1997/03/18 02:05:33 $)192 b Fs(The)30 b(date)h(and)f(time)g(\(UTC\))g(the)h(revision)d(w)m(as)j(c)m(hec)m(k)m -(ed)h(in.)0 2918 y Fn($Header: /cvs/OpenBSD/src/gnu/usr.bin/cvs/doc/cvs.ps,v 1.1.1.6 1997/02/21 06:47:01 tholo Exp $)96 b Fs(A)33 b(standard)g(header)g(con)m +(ed)h(in.)0 2918 y Fn($Header: /cvs/OpenBSD/src/gnu/usr.bin/cvs/doc/cvs.ps,v 1.1.1.7 1997/03/18 02:05:33 tholo Exp $)96 b Fs(A)33 b(standard)g(header)g(con)m (taining)f(the)i(full)d(pathname)i(of)g(the)h Fr(r)n(cs)e Fs(\014le,)h(the)h(revision)d(n)m(um)m(b)s(er,)480 3043 y(the)j(date)g(\(UTC\),)g(the)g(author,)g(the)g(state,)i(and)d(the)h (lo)s(c)m(k)m(er)g(\(if)f(lo)s(c)m(k)m(ed\).)51 b(Files)33 b(will)e(normally)480 3167 y(nev)m(er)g(b)s(e)e(lo)s(c)m(k)m(ed)i(when) -f(y)m(ou)g(use)g Fr(cvs)p Fs(.)0 3343 y Fn($Id: cvs.ps,v 1.1.1.6 1997/02/21 06:47:01 tholo Exp $)288 b -Fs(Same)30 b(as)h Fn($Header: /cvs/OpenBSD/src/gnu/usr.bin/cvs/doc/cvs.ps,v 1.1.1.6 1997/02/21 06:47:01 tholo Exp $)p Fs(,)d(except)k(that)f(the)f +f(y)m(ou)g(use)g Fr(cvs)p Fs(.)0 3343 y Fn($Id: cvs.ps,v 1.1.1.7 1997/03/18 02:05:33 tholo Exp $)288 b +Fs(Same)30 b(as)h Fn($Header: /cvs/OpenBSD/src/gnu/usr.bin/cvs/doc/cvs.ps,v 1.1.1.7 1997/03/18 02:05:33 tholo Exp $)p Fs(,)d(except)k(that)f(the)f Fr(r)n(cs)g Fs(\014lename)f(is)h(without)f(a)i(path.)0 3518 y Fn($Name: $)192 b Fs(T)-8 b(ag)31 b(name)g(used)e(to)i(c)m(hec)m (k)h(out)f(this)e(\014le.)0 3693 y Fn($Locker: $)96 b Fs(The)39 @@ -5500,8 +5553,8 @@ b(login)g(name)h(of)g(the)g(user)f(who)h(lo)s(c)m(k)m(ed)g(the)g (revision)e(\(empt)m(y)j(if)e(not)h(lo)s(c)m(k)m(ed,)j(and)c(th)m(us) 480 3818 y(almost)30 b(alw)m(a)m(ys)h(useless)f(when)f(y)m(ou)i(are)g (using)e Fr(cvs)p Fs(\).)0 3993 y Fn($Log: cvs.ps,v $ -(using)e Fr(cvs)p Fs(\).)0 3993 y Fn(Revision 1.1.1.6 1997/02/21 06:47:01 tholo -(using)e Fr(cvs)p Fs(\).)0 3993 y Fn(Missed files from new release from Cyclic Software +(using)e Fr(cvs)p Fs(\).)0 3993 y Fn(Revision 1.1.1.7 1997/03/18 02:05:33 tholo +(using)e Fr(cvs)p Fs(\).)0 3993 y Fn(Files missed from previous import (using)e Fr(cvs)p Fs(\).)0 3993 y Fn()240 b Fs(The)39 b(log)h(message)h(supplied)c(during)g(commit,)43 b(preceded)c(b)m(y)h (a)g(header)g(con)m(taining)f(the)h Fr(r)n(cs)480 4118 @@ -5514,29 +5567,29 @@ y(line)25 b(is)h(pre\014xed)g(with)g(a)h Fo(commen)m(t)h(leader)33 b Fs(whic)m(h)25 b Fr(r)n(cs)h Fs(guesses)i(from)e(the)h(\014le)f(name) h(extension.)480 4491 y(It)41 b(can)g(b)s(e)f(c)m(hanged)i(with)d Fn(cvs)30 b(admin)f(-c)p Fs(.)71 b(See)41 b(Section)g(A.5.1)h([admin)e -(options],)j(page)f(93.)480 4616 y(This)28 b(k)m(eyw)m(ord)i(is)f +(options],)j(page)f(95.)480 4616 y(This)28 b(k)m(eyw)m(ord)i(is)f (useful)f(for)h(accum)m(ulating)h(a)g(complete)g(c)m(hange)h(log)f(in)e (a)i(source)g(\014le,)f(but)g(for)480 4740 y(sev)m(eral)i(reasons)f(it) g(can)h(b)s(e)e(problematic.)40 b(See)31 b(Section)f(17.5)i([Log)f(k)m -(eyw)m(ord],)g(page)h(78.)0 4916 y Fn($RCSfile: cvs.ps,v $)480 5040 +(eyw)m(ord],)g(page)h(80.)0 4916 y Fn($RCSfile: cvs.ps,v $)480 5040 y Fs(The)e(name)g(of)h(the)f(R)m(CS)g(\014le)g(without)f(a)i(path.)0 -5215 y Fn($Revision: 1.1.1.6 $)480 5340 y Fs(The)f(revision)e(n)m(um)m(b)s(er)i +5215 y Fn($Revision: 1.1.1.7 $)480 5340 y Fs(The)f(revision)e(n)m(um)m(b)s(er)i (assigned)f(to)i(the)g(revision.)p eop -%%Page: 76 78 -76 77 bop 0 -116 a Fs(76)2411 b(CVS|Concurren)m(t)29 +%%Page: 78 80 +78 79 bop 0 -116 a Fs(78)2411 b(CVS|Concurren)m(t)29 b(V)-8 b(ersions)30 b(System)0 366 y Fn($Source: /cvs/OpenBSD/src/gnu/usr.bin/cvs/doc/cvs.ps,v $)96 b Fs(The)30 b(full)e(pathname)i(of)h(the)f(R)m(CS)g(\014le.)0 543 y Fn($State: Exp $)144 b Fs(The)39 b(state)i(assigned)e(to)h(the)g (revision.)67 b(States)41 b(can)f(b)s(e)f(assigned)g(with)f Fn(cvs)29 b(admin)g(-s)p Fs(|See)480 667 y(Section)h(A.5.1)i([admin)d -(options],)h(page)h(93.)0 1124 y Fm(17.2)68 b(Using)31 +(options],)h(page)h(95.)0 1124 y Fm(17.2)68 b(Using)31 b(k)l(eyw)l(ords)125 1399 y Fs(T)-8 b(o)26 b(include)f(a)i(k)m(eyw)m (ord)f(string)g(y)m(ou)h(simply)d(include)g(the)j(relev)-5 -b(an)m(t)26 b(text)i(string,)e(suc)m(h)h(as)f Fn($Id: cvs.ps,v 1.1.1.6 1997/02/21 06:47:01 tholo Exp $)p +b(an)m(t)26 b(text)i(string,)e(suc)m(h)h(as)f Fn($Id: cvs.ps,v 1.1.1.7 1997/03/18 02:05:33 tholo Exp $)p Fs(,)h(inside)d(the)0 1524 y(\014le,)i(and)f(commit)h(the)f(\014le.)39 b Fr(cvs)24 b Fs(will)f(automatically)j(expand)f(the)h(string)e(as)i (part)g(of)g(the)g(commit)f(op)s(eration.)125 1765 y(It)i(is)g(common)h -(to)g(em)m(b)s(ed)f Fn($Id: cvs.ps,v 1.1.1.6 1997/02/21 06:47:01 tholo Exp $)f Fs(string)h(in)f(the)i(C)f(source)h(co)s +(to)g(em)m(b)s(ed)f Fn($Id: cvs.ps,v 1.1.1.7 1997/03/18 02:05:33 tholo Exp $)f Fs(string)h(in)f(the)i(C)f(source)h(co)s (de.)40 b(This)25 b(example)j(sho)m(ws)f(the)h(\014rst)e(few)i(lines)0 1890 y(of)j(a)f(t)m(ypical)g(\014le,)g(after)h(k)m(eyw)m(ord)g (substitution)d(has)i(b)s(een)g(p)s(erformed:)240 2144 @@ -5562,7 +5615,7 @@ b(This)31 b(can)i(b)s(e)f(handy)f(for)h(text)i(\014les,)e(but)g(it)g (is)f(ev)m(en)j(more)e(useful)f(for)h(extracting)0 3815 y(k)m(eyw)m(ords)f(from)f(binary)e(\014les.)240 4069 y Fn($)47 b(ident)g(samp.c)240 4173 y(samp.c:)479 4276 -y($Id: cvs.ps,v 1.1.1.6 1997/02/21 06:47:01 tholo Exp $)240 +y($Id: cvs.ps,v 1.1.1.7 1997/03/18 02:05:33 tholo Exp $)240 4380 y($)g(gcc)g(samp.c)240 4484 y($)g(ident)g(a.out)240 4588 y(a.out:)479 4691 y($Id:)f(samp.c,v)g(1.5)h(1993/10/19)e(14:57:32) g(ceder)i(Exp)g($)125 4966 y Fs(S)p Fr(ccs)26 b Fs(is)h(another)h(p)s @@ -5576,10 +5629,10 @@ Fn(@\(#\))e Fs(it)g(is)h(easy)g(to)h(include)d(k)m(eyw)m(ords)j(that)f (are)h(detected)g(b)m(y)f(either)g(command.)0 5340 y(Simply)28 b(pre\014x)h(the)h Fr(r)n(cs)g Fs(k)m(eyw)m(ord)h(with)e(the)h(magic)h Fr(sccs)e Fs(phrase,)h(lik)m(e)f(this:)p eop -%%Page: 77 79 -77 78 bop 0 -116 a Fs(Chapter)30 b(17:)41 b(Keyw)m(ord)30 -b(substitution)2437 b(77)240 366 y Fn(static)46 b(char)h(*id="@\(#\))e -($Id: cvs.ps,v 1.1.1.6 1997/02/21 06:47:01 tholo Exp $";)0 +%%Page: 79 81 +79 80 bop 0 -116 a Fs(Chapter)30 b(17:)41 b(Keyw)m(ord)30 +b(substitution)2437 b(79)240 366 y Fn(static)46 b(char)h(*id="@\(#\))e +($Id: cvs.ps,v 1.1.1.7 1997/03/18 02:05:33 tholo Exp $";)0 786 y Fm(17.3)68 b(Av)l(oiding)31 b(substitution)125 1060 y Fs(Keyw)m(ord)h(substitution)f(has)i(its)g(disadv)-5 b(an)m(tages.)49 b(Sometimes)33 b(y)m(ou)g(migh)m(t)g(w)m(an)m(t)h(the) @@ -5591,7 +5644,7 @@ Fn($Author: tholo $)p Fs('.)125 1583 y(There)k(is)g(unfortunately)g (no)h(w)m(a)m(y)h(to)g(selectiv)m(ely)f(turn)f(o\013)i(k)m(eyw)m(ord)g (substitution.)49 b(Y)-8 b(ou)35 b(can)f(use)g(`)p Fn(-ko)p Fs(')0 1708 y(\(see)d(Section)g(17.4)g([Substitution)d(mo)s(des],)j -(page)g(77\))g(to)g(turn)f(o\013)h(k)m(eyw)m(ord)f(substitution)e(en)m +(page)g(79\))g(to)g(turn)f(o\013)h(k)m(eyw)m(ord)f(substitution)e(en)m (tirely)-8 b(.)125 1982 y(In)28 b(man)m(y)h(cases)h(y)m(ou)f(can)h(a)m (v)m(oid)f(using)f Fr(r)n(cs)g Fs(k)m(eyw)m(ords)h(in)f(the)h(source,)h (ev)m(en)g(though)e(they)i(app)s(ear)e(in)g(the)0 2106 @@ -5611,7 +5664,7 @@ Fs(;)e(the)h(latter)0 3298 y(is)e(set)h(b)m(y)g(the)g(-k)g(or)g(-A)g (options)f(to)i Fn(cvs)h(checkout)c Fs(or)i Fn(cvs)i(update)p Fs(.)38 b Fn(cvs)29 b(diff)d Fs(also)h(has)f(a)h(`)p Fn(-k)p Fs(')g(option.)39 b(F)-8 b(or)0 3423 y(some)31 -b(examples,)f(See)h(Chapter)e(18)j([Binary)d(\014les],)h(page)h(79.)125 +b(examples,)f(See)h(Chapter)e(18)j([Binary)d(\014les],)h(page)h(81.)125 3696 y(The)e(mo)s(des)h(a)m(v)-5 b(ailable)30 b(are:)0 3988 y(`)p Fn(-kkv)p Fs(')238 b(Generate)51 b(k)m(eyw)m(ord)f(strings)f (using)f(the)h(default)g(form,)55 b(e.g.)99 b Fn($Revision:)28 @@ -5625,8 +5678,8 @@ Fr(cvs)f Fs(is)g(used.)0 4557 y(`)p Fn(-kk)p Fs(')286 b(Generate)33 b(only)e(k)m(eyw)m(ord)h(names)g(in)e(k)m(eyw)m(ord)j (strings;)e(omit)h(their)e(v)-5 b(alues.)45 b(F)-8 b(or)32 b(example,)g(for)480 4682 y(the)g Fn(Revision)d Fs(k)m(eyw)m(ord,)j -(generate)h(the)f(string)e Fn($Revision: 1.1.1.6 $)f Fs(instead)h(of)i -Fn($Revision: 1.1.1.6 $)p Fs(.)480 4806 y(This)c(option)g(is)h(useful)e +(generate)h(the)f(string)e Fn($Revision: 1.1.1.7 $)f Fs(instead)h(of)i +Fn($Revision: 1.1.1.7 $)p Fs(.)480 4806 y(This)c(option)g(is)h(useful)e (to)j(ignore)f(di\013erences)g(due)f(to)j(k)m(eyw)m(ord)e(substitution) e(when)i(comparing)480 4931 y(di\013eren)m(t)k(revisions)e(of)j(a)g (\014le.)0 5091 y(`)p Fn(-ko)p Fs(')286 b(Generate)22 @@ -5634,12 +5687,12 @@ b(the)f(old)f(k)m(eyw)m(ord)h(string,)h(presen)m(t)f(in)e(the)i(w)m (orking)f(\014le)g(just)g(b)s(efore)h(it)f(w)m(as)h(c)m(hec)m(k)m(ed)i (in.)480 5215 y(F)-8 b(or)27 b(example,)g(for)g(the)f Fn(Revision)e Fs(k)m(eyw)m(ord,)k(generate)g(the)f(string)e -Fn($Revision: 1.1.1.6 $)c Fs(instead)480 5340 y(of)31 -b Fn($Revision: 1.1.1.6 $)g Fs(if)f(that)i(is)e(ho)m(w)i(the)f(string)g +Fn($Revision: 1.1.1.7 $)c Fs(instead)480 5340 y(of)31 +b Fn($Revision: 1.1.1.7 $)g Fs(if)f(that)i(is)e(ho)m(w)i(the)f(string)g (app)s(eared)f(when)h(the)g(\014le)g(w)m(as)g(c)m(hec)m(k)m(ed)j(in.)p eop -%%Page: 78 80 -78 79 bop 0 -116 a Fs(78)2411 b(CVS|Concurren)m(t)29 +%%Page: 80 82 +80 81 bop 0 -116 a Fs(80)2411 b(CVS|Concurren)m(t)29 b(V)-8 b(ersions)30 b(System)0 366 y(`)p Fn(-kb)p Fs(')286 b(Lik)m(e)37 b(`)p Fn(-ko)p Fs(',)h(but)e(also)h(inhibit)d(con)m(v)m (ersion)j(of)g(line)e(endings)h(b)s(et)m(w)m(een)h(the)g(canonical)g @@ -5650,12 +5703,12 @@ e(to)j(the)480 616 y(op)s(erating)33 b(system)g(in)f(use)h(on)g(the)g (use)h(linefeed)f(only)480 740 y(to)g(terminate)g(lines,)e(this)g(is)g (the)i(same)g(as)g(`)p Fn(-ko)p Fs('.)43 b(F)-8 b(or)32 b(more)g(information)e(on)h(binary)e(\014les,)i(see)480 -865 y(Chapter)f(18)h([Binary)f(\014les],)g(page)h(79.)0 +865 y(Chapter)f(18)h([Binary)f(\014les],)g(page)h(81.)0 1039 y(`)p Fn(-kv)p Fs(')286 b(Generate)28 b(only)e(k)m(eyw)m(ord)h(v) -5 b(alues)25 b(for)i(k)m(eyw)m(ord)g(strings.)38 b(F)-8 b(or)27 b(example,)h(for)e(the)h Fn(Revision)d Fs(k)m(ey-)480 1163 y(w)m(ord,)g(generate)h(the)e(string)f Fn(5.7)g -Fs(instead)h(of)g Fn($Revision: 1.1.1.6 $)p Fs(.)38 +Fs(instead)h(of)g Fn($Revision: 1.1.1.7 $)p Fs(.)38 b(This)21 b(can)j(help)d(generate)k(\014les)480 1288 y(in)f(programming)f(languages)i(where)g(it)f(is)g(hard)g(to)h(strip)f (k)m(eyw)m(ord)h(delimiters)e(lik)m(e)h Fn($Revision:)480 @@ -5665,23 +5718,23 @@ b(further)c(k)m(eyw)m(ord)i(substitution)e(cannot)i(b)s(e)f(p)s (v)m(ed,)h(so)e(this)f(option)h(should)f(b)s(e)g(used)h(with)f(care.) 480 1687 y(One)d(often)g(w)m(ould)f(lik)m(e)g(to)i(use)f(`)p Fn(-kv)p Fs(')f(with)g Fn(cvs)30 b(export)p Fs(|see)24 -b(Section)i(A.9)h([exp)s(ort],)h(page)e(105.)480 1811 +b(Section)i(A.9)h([exp)s(ort],)h(page)e(107.)480 1811 y(But)31 b(b)s(e)e(a)m(w)m(are)j(that)f(do)s(esn't)f(handle)f(an)h(exp) s(ort)h(con)m(taining)e(binary)g(\014les)g(correctly)-8 b(.)0 2259 y Fm(17.5)68 b(Problems)31 b(with)g(the)g($Log: cvs.ps,v $ -b(.)0 2259 y Fm(17.5)68 b(Problems)31 b(with)g(the)g(Revision 1.1.1.6 1997/02/21 06:47:01 tholo -b(.)0 2259 y Fm(17.5)68 b(Problems)31 b(with)g(the)g(Missed files from new release from Cyclic Software +b(.)0 2259 y Fm(17.5)68 b(Problems)31 b(with)g(the)g(Revision 1.1.1.7 1997/03/18 02:05:33 tholo +b(.)0 2259 y Fm(17.5)68 b(Problems)31 b(with)g(the)g(Files missed from previous import b(.)0 2259 y Fm(17.5)68 b(Problems)31 b(with)g(the)g()g(k)l(eyw)l (ord.)125 2533 y Fs(The)25 b Fn($Log: cvs.ps,v $ -(ord.)125 2533 y Fs(The)25 b Fn(Revision 1.1.1.6 1997/02/21 06:47:01 tholo -(ord.)125 2533 y Fs(The)25 b Fn(Missed files from new release from Cyclic Software +(ord.)125 2533 y Fs(The)25 b Fn(Revision 1.1.1.7 1997/03/18 02:05:33 tholo +(ord.)125 2533 y Fs(The)25 b Fn(Files missed from previous import (ord.)125 2533 y Fs(The)25 b Fn()f Fs(k)m(eyw)m(ord)i(is)f (somewhat)h(con)m(tro)m(v)m(ersial.)40 b(As)25 b(long)h(as)f(y)m(ou)h (are)g(w)m(orking)f(on)h(y)m(our)g(dev)m(elopmen)m(t)0 2658 y(system)36 b(the)h(information)d(is)i(easily)f(accessible)h(ev)m (en)h(if)e(y)m(ou)i(do)f(not)g(use)g(the)h Fn($Log: cvs.ps,v $ -(en)h(if)e(y)m(ou)i(do)f(not)g(use)g(the)h Fn(Revision 1.1.1.6 1997/02/21 06:47:01 tholo -(en)h(if)e(y)m(ou)i(do)f(not)g(use)g(the)h Fn(Missed files from new release from Cyclic Software +(en)h(if)e(y)m(ou)i(do)f(not)g(use)g(the)h Fn(Revision 1.1.1.7 1997/03/18 02:05:33 tholo +(en)h(if)e(y)m(ou)i(do)f(not)g(use)g(the)h Fn(Files missed from previous import (en)h(if)e(y)m(ou)i(do)f(not)g(use)g(the)h Fn()d Fs(k)m(eyw)m(ord|just)i(do)h(a)0 2782 y Fn(cvs)29 b(log)p Fs(.)40 b(Once)31 b(y)m(ou)f(exp)s(ort)g(the)h(\014le)f(the)g(history)f @@ -5689,8 +5742,8 @@ Fs(.)40 b(Once)31 b(y)m(ou)f(exp)s(ort)g(the)h(\014le)f(the)g(history)f 3056 y(A)39 b(more)h(serious)e(concern)i(is)e(that)i Fr(r)n(cs)f Fs(is)f(not)i(go)s(o)s(d)f(at)i(handling)36 b Fn($Log: cvs.ps,v $ -b Fn(Revision 1.1.1.6 1997/02/21 06:47:01 tholo -b Fn(Missed files from new release from Cyclic Software +b Fn(Revision 1.1.1.7 1997/03/18 02:05:33 tholo +b Fn(Files missed from previous import b Fn()i Fs(en)m(tries)i(when)e(a)i(branc)m(h)f(is)0 3181 y(merged)30 b(on)m(to)i(the)f(main)e(trunk.)39 b(Con\015icts)30 b(often)h(result)e(from)h(the)g(merging)g(op)s(eration.)125 @@ -5703,17 +5756,17 @@ Fn(")e Fs(the)h(log)g(en)m(tries)f(in)g(the)h(\014le)f(\(correcting)i (\014le.)40 b(This)29 b(ma)m(y)i(or)f(ma)m(y)h(not)g(b)s(e)e(a)i (problem)e(in)g(real)h(life.)125 3978 y(It)f(has)f(b)s(een)g(suggested) i(that)f(the)g Fn($Log: cvs.ps,v $ -i(that)f(the)g Fn(Revision 1.1.1.6 1997/02/21 06:47:01 tholo -i(that)f(the)g Fn(Missed files from new release from Cyclic Software +i(that)f(the)g Fn(Revision 1.1.1.7 1997/03/18 02:05:33 tholo +i(that)f(the)g Fn(Files missed from previous import i(that)f(the)g Fn()f Fs(k)m(eyw)m(ord)h(should)e(b)s(e)h(inserted) g Fo(last)j Fs(in)c(the)i(\014le,)g(and)f(not)h(in)f(the)0 4102 y(\014les)k(header,)h(if)e(it)i(is)e(to)i(b)s(e)f(used)g(at)i (all.)46 b(That)32 b(w)m(a)m(y)i(the)f(long)f(list)f(of)i(c)m(hange)h (messages)f(will)d(not)j(in)m(terfere)0 4227 y(with)c(ev)m(eryda)m(y)j (source)e(\014le)g(bro)m(wsing.)p eop -%%Page: 79 81 -79 80 bop 0 -116 a Fs(Chapter)30 b(18:)41 b(Handling)29 -b(binary)f(\014les)2469 b(79)0 366 y Fp(18)80 b(Handling)31 +%%Page: 81 83 +81 82 bop 0 -116 a Fs(Chapter)30 b(18:)41 b(Handling)29 +b(binary)f(\014les)2469 b(81)0 366 y Fp(18)80 b(Handling)31 b(binary)g(\014les)125 846 y Fs(There)24 b(are)h(t)m(w)m(o)h(issues)e (with)f(using)h Fr(cvs)g Fs(to)h(store)h(binary)d(\014les.)38 b(The)24 b(\014rst)g(is)g(that)i Fr(cvs)e Fs(b)m(y)g(default)g(con)m(v) @@ -5725,7 +5778,7 @@ g(example,)g(carriage)h(return)0 1219 y(follo)m(w)m(ed)i(b)m(y)g(line)f (feed)h(for)h(Windo)m(ws)e(NT\).)125 1515 y(The)i(second)i(is)e(that)i (a)g(binary)d(\014le)i(migh)m(t)g(happ)s(en)e(to)j(con)m(tain)g(data)g (whic)m(h)e(lo)s(oks)h(lik)m(e)f(a)i(k)m(eyw)m(ord)g(\(see)0 -1639 y(Chapter)d(17)h([Keyw)m(ord)f(substitution],)f(page)i(75\),)h(so) +1639 y(Chapter)d(17)h([Keyw)m(ord)f(substitution],)f(page)i(77\),)h(so) e(k)m(eyw)m(ord)h(expansion)f(m)m(ust)g(b)s(e)g(turned)f(o\013.)125 1934 y(The)d(`)p Fn(-kb)p Fs(')g(option)h(a)m(v)-5 b(ailable)26 b(with)g(some)h Fr(cvs)f Fs(commands)h(insures)d(that)k(neither)e(line) @@ -5740,13 +5793,13 @@ Fs(')f(instead;)h(if)f(y)m(ou)i(are)f(on)g(another)g(op)s(erating)f Fs(,)e(suc)m(h)h(as)0 2432 y(5.7)i(or)g(later,)f(whic)m(h)g(supp)s (orts)e(`)p Fn(-kb)p Fs('.)125 2727 y(Here)i(is)g(an)g(example)g(of)h (ho)m(w)f(y)m(ou)h(can)f(create)i(a)f(new)f(\014le)g(using)e(the)j(`)p -Fn(-kb)p Fs(')f(\015ag:)240 3002 y Fn($)47 b(echo)g('$Id: cvs.ps,v 1.1.1.6 1997/02/21 06:47:01 tholo Exp $')f(>)i +Fn(-kb)p Fs(')f(\015ag:)240 3002 y Fn($)47 b(echo)g('$Id: cvs.ps,v 1.1.1.7 1997/03/18 02:05:33 tholo Exp $')f(>)i (kotest)240 3106 y($)f(cvs)g(add)g(-kb)g(-m"A)g(test)f(file")h(kotest) 240 3209 y($)g(cvs)g(ci)h(-m"First)d(checkin;)h(contains)f(a)j (keyword")d(kotest)125 3504 y Fs(If)29 b(a)i(\014le)e(acciden)m(tally)h (gets)i(added)d(without)h(`)p Fn(-kb)p Fs(',)g(one)g(can)h(use)f(the)g Fn(cvs)g(admin)f Fs(command)h(to)h(reco)m(v)m(er.)0 3629 -y(F)-8 b(or)31 b(example:)240 3903 y Fn($)47 b(echo)g('$Id: cvs.ps,v 1.1.1.6 1997/02/21 06:47:01 tholo Exp $')f(>)i +y(F)-8 b(or)31 b(example:)240 3903 y Fn($)47 b(echo)g('$Id: cvs.ps,v 1.1.1.7 1997/03/18 02:05:33 tholo Exp $')f(>)i (kotest)240 4007 y($)f(cvs)g(add)g(-m"A)g(test)g(file")f(kotest)240 4111 y($)h(cvs)g(ci)h(-m"First)d(checkin;)h(contains)f(a)j(keyword")d (kotest)240 4215 y($)i(cvs)g(admin)g(-kb)g(kotest)240 @@ -5769,8 +5822,8 @@ Fs(')f(is)g Fn(cvs)e(update)g(-A)p Fs(.)44 b(If)31 b(y)m(ou)i(need)e 5340 y(in)j(a)i(new)f(cop)m(y)h(of)f(the)h(\014le,)f(as)g(sho)m(wn)g(b) m(y)g(the)h Fn(cvs)e(commit)g Fs(command)h(ab)s(o)m(v)m(e.)p eop -%%Page: 80 82 -80 81 bop 0 -116 a Fs(80)2411 b(CVS|Concurren)m(t)29 +%%Page: 82 84 +82 83 bop 0 -116 a Fs(82)2411 b(CVS|Concurren)m(t)29 b(V)-8 b(ersions)30 b(System)125 366 y(Ho)m(w)m(ev)m(er,)35 b(in)d(using)f Fn(cvs)f(admin)f(-k)j Fs(to)h(c)m(hange)h(the)g(k)m(eyw) m(ord)f(expansion,)f(b)s(e)h(a)m(w)m(are)h(that)f(the)g(k)m(eyw)m(ord)0 @@ -5788,11 +5841,11 @@ Fs(and)g Fn(cvs)f(import)g Fs(treat)j(a)f(\014le)f(as)h(binary)e(based) h(on)0 1263 y(its)c(name;)i(for)f(example)g(y)m(ou)g(could)f(sa)m(y)i (that)f(\014les)f(who)h(names)g(end)f(in)f(`)p Fn(.exe)p Fs(')i(are)g(binary)-8 b(.)39 b(See)28 b(Section)g(C.2)0 -1388 y([W)-8 b(rapp)s(ers],)30 b(page)i(137.)p eop -%%Page: 81 83 -81 82 bop 0 -116 a Fs(Chapter)30 b(19:)41 b(Ho)m(w)31 +1388 y([W)-8 b(rapp)s(ers],)30 b(page)i(139.)p eop +%%Page: 83 85 +83 84 bop 0 -116 a Fs(Chapter)30 b(19:)41 b(Ho)m(w)31 b(y)m(our)g(build)c(system)k(in)m(teracts)g(with)e(CVS)1586 -b(81)0 366 y Fp(19)80 b(Ho)l(w)29 b(y)l(our)h(build)h(system)d(in)l +b(83)0 366 y Fp(19)80 b(Ho)l(w)29 b(y)l(our)h(build)h(system)d(in)l (teracts)i(with)g(CVS)125 740 y Fs(As)24 b(men)m(tioned)h(in)e(the)i (in)m(tro)s(duction,)g Fr(cvs)f Fs(do)s(es)g(not)h(con)m(tain)g(soft)m (w)m(are)i(for)d(building)d(y)m(our)k(soft)m(w)m(are)h(from)0 @@ -5832,7 +5885,7 @@ Fs(or)c(something)g(similar.)38 b(The)29 b(b)s(est)g(w)m(a)m(y)0 2907 y(to)35 b(do)g(this)f(with)f Fr(cvs)h Fs(is)g(to)h(use)f(the)h Fn(tag)f Fs(command)h(to)g(record)g(whic)m(h)e(v)m(ersions)h(w)m(en)m (t)i(in)m(to)e(a)h(giv)m(en)g(build)0 3031 y(\(see)c(Section)g(7.1)g -([T)-8 b(ags],)32 b(page)f(45\).)125 3305 y(Using)f Fr(cvs)f +([T)-8 b(ags],)32 b(page)f(47\).)125 3305 y(Using)f Fr(cvs)f Fs(in)h(the)h(most)g(straigh)m(tforw)m(ard)g(manner)f(p)s(ossible,)e (eac)m(h)k(dev)m(elop)s(er)f(will)d(ha)m(v)m(e)k(a)f(cop)m(y)h(of)f (the)0 3430 y(en)m(tire)c(source)g(tree)g(whic)m(h)f(is)f(used)h(in)g @@ -5859,17 +5912,17 @@ Fn(make)p Fs(.)39 b(One)28 b(build)d(to)s(ol)k(whic)m(h)e(is)h (designed)f(to)0 4700 y(help)i(with)g(this)g(kind)g(of)h(thing)g(is)f (Odin)f(\(see)k Fn(ftp://ftp.cs.colorado.e)o(du/p)o(ub/d)o(ist)o(ribs)o (/odi)o(n)p Fs(\).)p eop -%%Page: 82 84 -82 83 bop 0 -116 a Fs(82)2411 b(CVS|Concurren)m(t)29 +%%Page: 84 86 +84 85 bop 0 -116 a Fs(84)2411 b(CVS|Concurren)m(t)29 b(V)-8 b(ersions)30 b(System)p eop -%%Page: 83 85 -83 84 bop 0 -116 a Fs(Chapter)30 b(20:)41 b(Compatibilit)m(y)28 -b(b)s(et)m(w)m(een)j(CVS)f(V)-8 b(ersions)1822 b(83)0 +%%Page: 85 87 +85 86 bop 0 -116 a Fs(Chapter)30 b(20:)41 b(Compatibilit)m(y)28 +b(b)s(et)m(w)m(een)j(CVS)f(V)-8 b(ersions)1822 b(85)0 366 y Fp(20)80 b(Compatibilit)l(y)31 b(b)t(et)l(w)l(een)d(CVS)h(V)-13 b(ersions)125 740 y Fs(The)39 b(rep)s(ository)g(format)i(is)e (compatible)h(going)g(bac)m(k)h(to)g Fr(cvs)f Fs(1.3.)71 b(But)40 b(see)h(Section)f(6.6.5)i([W)-8 b(atc)m(hes)0 -865 y(Compatibilit)m(y],)34 b(page)i(43,)i(if)c(y)m(ou)h(ha)m(v)m(e)i +865 y(Compatibilit)m(y],)34 b(page)i(45,)i(if)c(y)m(ou)h(ha)m(v)m(e)i (copies)e(of)g Fr(cvs)f Fs(1.6)i(or)f(older)g(and)f(y)m(ou)i(w)m(an)m (t)g(to)g(use)e(the)i(optional)0 989 y(dev)m(elop)s(er)30 b(comm)m(unication)g(features.)125 1263 y(The)h(w)m(orking)f(directory) @@ -5890,12 +5943,12 @@ Fs(1.5,)j(but)d(no)g(further)f(\(1.5)j(w)m(as)f(the)g(\014rst)0 (need)g(to)h(upgrade)e(b)s(oth)h(the)g(clien)m(t)g(and)f(the)h(serv)m (er)h(to)f(tak)m(e)i(adv)-5 b(an)m(tage)34 b(of)e(new)g(features)0 2284 y(and)e(bug\014xes,)g(ho)m(w)m(ev)m(er.)p eop -%%Page: 84 86 -84 85 bop 0 -116 a Fs(84)2411 b(CVS|Concurren)m(t)29 +%%Page: 86 88 +86 87 bop 0 -116 a Fs(86)2411 b(CVS|Concurren)m(t)29 b(V)-8 b(ersions)30 b(System)p eop -%%Page: 85 87 -85 86 bop 0 -116 a Fs(Chapter)30 b(21:)41 b(Revision)29 -b(managemen)m(t)2430 b(85)0 366 y Fp(21)80 b(Revision)31 +%%Page: 87 89 +87 88 bop 0 -116 a Fs(Chapter)30 b(21:)41 b(Revision)29 +b(managemen)m(t)2430 b(87)0 366 y Fp(21)80 b(Revision)31 b(managemen)l(t)125 740 y Fs(If)h(y)m(ou)h(ha)m(v)m(e)h(read)f(this)f (far,)h(y)m(ou)h(probably)d(ha)m(v)m(e)j(a)f(prett)m(y)h(go)s(o)s(d)e (grasp)h(on)g(what)g Fr(cvs)f Fs(can)h(do)g(for)f(y)m(ou.)0 @@ -5926,25 +5979,25 @@ e(after)i(making)f(sure)g(that)h(they)g(can)f(b)s(e)g(compiled.)64 b(Some)38 b(sites)0 3281 y(require)31 b(that)j(the)e(\014les)g(pass)g (a)h(test)h(suite.)47 b(P)m(olicies)31 b(lik)m(e)h(this)g(can)h(b)s(e)f (enforced)g(using)f(the)i(commitinfo)f(\014le)0 3405 -y(\(see)27 b(Section)f(C.4)h([commitinfo],)g(page)g(139\),)i(but)c(y)m +y(\(see)27 b(Section)f(C.4)h([commitinfo],)g(page)g(141\),)i(but)c(y)m (ou)i(should)d(think)h(t)m(wice)i(b)s(efore)e(y)m(ou)i(enforce)g(suc)m (h)f(a)g(con-)0 3530 y(v)m(en)m(tion.)45 b(By)32 b(making)f(the)h(dev)m (elopmen)m(t)g(en)m(vironmen)m(t)g(to)s(o)g(con)m(trolled)g(it)f(migh)m (t)g(b)s(ecome)h(to)s(o)h(regimen)m(ted)0 3654 y(and)d(th)m(us)g(coun)m (ter-pro)s(ductiv)m(e)g(to)h(the)g(real)f(goal,)h(whic)m(h)e(is)g(to)j (get)f(soft)m(w)m(are)h(written.)p eop -%%Page: 86 88 -86 87 bop 0 -116 a Fs(86)2411 b(CVS|Concurren)m(t)29 +%%Page: 88 90 +88 89 bop 0 -116 a Fs(88)2411 b(CVS|Concurren)m(t)29 b(V)-8 b(ersions)30 b(System)p eop -%%Page: 87 89 -87 88 bop 0 -116 a Fs(App)s(endix)28 b(A:)i(Guide)g(to)h(CVS)e -(commands)2255 b(87)0 366 y Fp(App)t(endix)30 b(A)81 +%%Page: 89 91 +89 90 bop 0 -116 a Fs(App)s(endix)28 b(A:)i(Guide)g(to)h(CVS)e +(commands)2255 b(89)0 366 y Fp(App)t(endix)30 b(A)81 b(Guide)29 b(to)h(CVS)g(commands)125 738 y Fs(This)c(app)s(endix)g (describ)s(es)h(the)h(o)m(v)m(erall)h(structure)f(of)h Fr(cvs)e Fs(commands,)i(and)f(describ)s(es)e(some)j(commands)0 862 y(in)h(detail)h(\(others)g(are)h(describ)s(ed)e(elsewhere;)h(for)g (a)h(quic)m(k)f(reference)h(to)g Fr(cvs)e Fs(commands,)i(see)g(App)s -(endix)d(B)0 987 y([In)m(v)m(oking)h(CVS],)h(page)g(125\).)0 +(endix)d(B)0 987 y([In)m(v)m(oking)h(CVS],)h(page)g(127\).)0 1433 y Fm(A.1)67 b(Ov)l(erall)32 b(structure)f(of)f(CVS)g(commands)125 1707 y Fs(The)f(o)m(v)m(erall)i(format)g(of)f(all)g Fr(cvs)f Fs(commands)h(is:)240 1960 y Fn(cvs)47 b([)g(cvs_options)e(])j @@ -5982,8 +6035,8 @@ Fn(command_options)c Fs(that)29 b(are)g(used)e(so)h(often)h(that)g(y)m 5340 y(some)32 b(other)f(means)h(to)g(mak)m(e)g(sure)f(y)m(ou)h(alw)m (a)m(ys)f(sp)s(ecify)f(that)i(option.)44 b(One)30 b(example)i(\(the)f (one)h(that)g(dro)m(v)m(e)p eop -%%Page: 88 90 -88 89 bop 0 -116 a Fs(88)2411 b(CVS|Concurren)m(t)29 +%%Page: 90 92 +90 91 bop 0 -116 a Fs(90)2411 b(CVS|Concurren)m(t)29 b(V)-8 b(ersions)30 b(System)0 366 y(the)g(implemen)m(tation)f(of)i (the)f(.cvsrc)h(supp)s(ort,)e(actually\))h(is)g(that)g(man)m(y)h(p)s (eople)e(\014nd)g(the)h(default)g(output)g(of)0 491 y(the)38 @@ -6024,14 +6077,14 @@ s(ecify)e(use)h(of)h(the)f Fn(")p Fs(old)p Fn(")f Fs(format,)i(so)g(y)m (ou)0 4208 y(w)m(ould)e(need)h(`)p Fn(cvs)g(-f)g(diff)f(foobar)p Fs('.)125 4551 y(In)23 b(place)g(of)h(the)g(command)g(name)f(y)m(ou)h (can)g(use)g Fn(cvs)f Fs(to)h(sp)s(ecify)f(global)g(options)g(\(see)h -(Section)g(A.3)g([Global)0 4675 y(options],)30 b(page)h(89\).)42 +(Section)g(A.3)g([Global)0 4675 y(options],)30 b(page)h(91\).)42 b(F)-8 b(or)31 b(example)f(the)h(follo)m(wing)e(line)g(in)g(`)p Fn(.cvsrc)p Fs(')240 4997 y Fn(cvs)47 b(-z6)125 5340 y Fs(causes)30 b Fr(cvs)g Fs(to)h(use)f(compression)f(lev)m(el)h(6)p eop -%%Page: 89 91 -89 90 bop 0 -116 a Fs(App)s(endix)28 b(A:)i(Guide)g(to)h(CVS)e -(commands)2255 b(89)0 366 y Fm(A.3)67 b(Global)31 b(options)125 +%%Page: 91 93 +91 92 bop 0 -116 a Fs(App)s(endix)28 b(A:)i(Guide)g(to)h(CVS)e +(commands)2255 b(91)0 366 y Fm(A.3)67 b(Global)31 b(options)125 641 y Fs(The)e(a)m(v)-5 b(ailable)30 b(`)p Fn(cvs_options)p Fs(')e(\(that)j(are)g(giv)m(en)f(to)i(the)e(left)g(of)h(`)p Fn(cvs_command)p Fs('\))d(are:)0 967 y Fn(-b)i Fo(bindir)113 @@ -6079,7 +6132,7 @@ Fr(cvs)p Fs(,)g(including)d(a)j(list)f(of)i(other)g(help)e(options.)0 3890 y Fn(-l)384 b Fs(Do)39 b(not)e(log)h(the)g(cvs)p 1248 3890 V 33 w(command)f(in)g(the)h(command)f(history)g(\(but)g (execute)i(it)e(an)m(yw)m(a)m(y\).)65 b(See)480 4014 -y(Section)30 b(A.10)i([history],)e(page)h(106,)h(for)e(information)f +y(Section)30 b(A.10)i([history],)e(page)h(108,)h(for)e(information)f (on)h(command)g(history)-8 b(.)0 4190 y Fn(-n)384 b Fs(Do)42 b(not)f(c)m(hange)i(an)m(y)e(\014les.)72 b(A)m(ttempt)43 b(to)f(execute)g(the)g(`)p Fn(cvs_command)p Fs(',)f(but)g(only)f(to)i @@ -6096,16 +6149,16 @@ b(new)e(w)m(orking)f(\014les)h(\014les)f(read-only)-8 b(.)65 b(Same)38 b(e\013ect)i(as)e(if)g(the)g Fn($CVSREAD)e Fs(en)m(vironmen)m(t)480 5215 y(v)-5 b(ariable)31 b(is)h(set)h(\(see)h (App)s(endix)c(D)j([En)m(vironmen)m(t)f(v)-5 b(ariables],)33 -b(page)g(149\).)49 b(The)33 b(default)e(is)h(to)480 5340 +b(page)g(151\).)49 b(The)33 b(default)e(is)h(to)480 5340 y(mak)m(e)27 b(w)m(orking)e(\014les)g(writable,)h(unless)e(w)m(atc)m (hes)j(are)g(on)e(\(see)i(Section)f(6.6)h([W)-8 b(atc)m(hes],)30 -b(page)c(39\).)p eop -%%Page: 90 92 -90 91 bop 0 -116 a Fs(90)2411 b(CVS|Concurren)m(t)29 +b(page)c(41\).)p eop +%%Page: 92 94 +92 93 bop 0 -116 a Fs(92)2411 b(CVS|Concurren)m(t)29 b(V)-8 b(ersions)30 b(System)0 366 y Fn(-s)g Fo(v)-5 b(ariable)5 b Fn(=)p Fo(v)-5 b(alue)480 491 y Fs(Set)31 b(a)f(user)g(v)-5 b(ariable)29 b(\(see)i(Section)g(C.11)g([V)-8 -b(ariables],)30 b(page)h(147\).)0 662 y Fn(-t)384 b Fs(T)-8 +b(ariables],)30 b(page)h(150\).)0 662 y Fn(-t)384 b Fs(T)-8 b(race)30 b(program)e(execution;)i(displa)m(y)c(messages)k(sho)m(wing)e (the)h(steps)f(of)h Fr(cvs)f Fs(activit)m(y)-8 b(.)41 b(P)m(articu-)480 786 y(larly)29 b(useful)f(with)i(`)p @@ -6123,8 +6176,8 @@ m(een)i(the)g(clien)m(t)f(and)f(the)i(serv)m(er.)55 b(Only)34 b(has)h(an)g(e\013ect)i(on)480 1844 y(the)i Fr(cvs)e Fs(clien)m(t.)65 b(As)39 b(of)g(this)e(writing,)i(this)f(is)f(only)h (implemen)m(ted)f(when)h(using)f(a)i(Kerb)s(eros)480 -1968 y(connection)45 b(\(see)h(Section)f(4.6.3)i([Kerb)s(eros)e(authen) -m(ticated],)50 b(page)c(26\).)86 b(Encryption)44 b(sup-)480 +1968 y(connection)45 b(\(see)h(Section)f(4.6.4)i([Kerb)s(eros)e(authen) +m(ticated],)50 b(page)c(27\).)86 b(Encryption)44 b(sup-)480 2093 y(p)s(ort)36 b(is)f(not)i(a)m(v)-5 b(ailable)35 b(b)m(y)i(default;)h(it)e(m)m(ust)h(b)s(e)e(enabled)h(using)e(a)j(sp)s (ecial)e(con\014gure)h(option,)480 2217 y(`)p Fn(--enable-encryption)p @@ -6163,16 +6216,16 @@ b(ate)27 b(cop)m(y)i(of)f(a)g(source)g(\014le;)g(that)480 (eci\014ed,)f(so)h(that)480 5215 y(further)28 b(up)s(dates)h(in)f(the)i (same)g(directory)f(will)e(use)j(the)f(same)h(date)h(\(for)e(more)h (information)e(on)480 5340 y(stic)m(ky)j(tags/dates,)h(see)f(Section)f -(7.4)i([Stic)m(ky)e(tags],)i(page)f(49\).)p eop -%%Page: 91 93 -91 92 bop 0 -116 a Fs(App)s(endix)28 b(A:)i(Guide)g(to)h(CVS)e -(commands)2255 b(91)480 366 y(`)p Fn(-D)p Fs(')30 b(is)f(a)m(v)-5 +(7.4)i([Stic)m(ky)e(tags],)i(page)f(51\).)p eop +%%Page: 93 95 +93 94 bop 0 -116 a Fs(App)s(endix)28 b(A:)i(Guide)g(to)h(CVS)e +(commands)2255 b(93)480 366 y(`)p Fn(-D)p Fs(')30 b(is)f(a)m(v)-5 b(ailable)29 b(with)g(the)h Fn(checkout)p Fs(,)e Fn(diff)p Fs(,)h Fn(export)p Fs(,)g Fn(history)p Fs(,)f Fn(rdiff)p Fs(,)h Fn(rtag)p Fs(,)g(and)h Fn(update)480 491 y Fs(commands.)60 b(\(The)37 b Fn(history)e Fs(command)i(uses)f(this)g(option)g(in)g(a)h (sligh)m(tly)e(di\013eren)m(t)i(w)m(a)m(y;)k(see)480 -616 y(Section)30 b(A.10.1)j([history)c(options],)h(page)h(106\).)480 +616 y(Section)30 b(A.10.1)j([history)c(options],)h(page)h(108\).)480 762 y(A)39 b(wide)f(v)-5 b(ariet)m(y)39 b(of)g(date)g(formats)h(are)f (supp)s(orted)e(b)m(y)i Fr(cvs)p Fs(.)65 b(The)38 b(most)h(standard)g (ones)g(are)480 887 y(ISO8601)25 b(\(from)f(the)g(In)m(ternational)g @@ -6224,10 +6277,10 @@ Fs(,)h Fn(rtag)p Fs(,)h(and)480 4278 y Fn(update)p Fs(.)480 Fs(command)g(also)h(has)g(a)g(`)p Fn(-f)p Fs(')g(option,)g(but)g(it)f (has)h(a)g(di\013eren)m(t)g(b)s(eha)m(vior)480 4549 y(for)g(that)h (command.)41 b(See)30 b(Section)g(A.7.1)i([commit)f(options],)f(page)h -(100.)0 4717 y Fn(-k)f Fo(k\015ag)165 b Fs(Alter)30 b(the)h(default)e +(102.)0 4717 y Fn(-k)f Fo(k\015ag)165 b Fs(Alter)30 b(the)h(default)e Fr(r)n(cs)h Fs(pro)s(cessing)f(of)h(k)m(eyw)m(ords.)42 b(See)30 b(Chapter)g(17)h([Keyw)m(ord)g(substitution],)480 -4842 y(page)36 b(75,)i(for)d(the)h(meaning)f(of)h Fo(k\015ag)p +4842 y(page)36 b(77,)i(for)d(the)h(meaning)f(of)h Fo(k\015ag)p Fs(.)56 b(Y)-8 b(our)36 b Fo(k\015ag)43 b Fs(sp)s(eci\014cation)35 b(is)f Fo(stic)m(ky)44 b Fs(when)34 b(y)m(ou)i(use)f(it)480 4966 y(to)k(create)h(a)f(priv)-5 b(ate)38 b(cop)m(y)h(of)g(a)g(source)g @@ -6238,8 +6291,8 @@ Fo(k\015ag)42 b Fs(with)33 b(the)i(\014le,)g(and)480 5215 y(con)m(tin)m(ues)k(to)g(use)f(it)g(with)f(future)h(up)s(date)g (commands)g(on)g(the)h(same)g(\014le)f(un)m(til)e(y)m(ou)j(sp)s(ecify) 480 5340 y(otherwise.)p eop -%%Page: 92 94 -92 93 bop 0 -116 a Fs(92)2411 b(CVS|Concurren)m(t)29 +%%Page: 94 96 +94 95 bop 0 -116 a Fs(94)2411 b(CVS|Concurren)m(t)29 b(V)-8 b(ersions)30 b(System)480 366 y(The)k(`)p Fn(-k)p Fs(')h(option)f(is)g(a)m(v)-5 b(ailable)34 b(with)g(the)h Fn(add)p Fs(,)g Fn(checkout)p Fs(,)f Fn(diff)p Fs(,)h @@ -6263,7 +6316,7 @@ Fn(import)p Fs(.)0 1937 y Fn(-n)384 b Fs(Do)28 b(not)f(run)e(an)m(y)j (c)m(hec)m(k)m(out/commit/tag)j(program.)39 b(\(A)28 b(program)e(can)i(b)s(e)e(sp)s(eci\014ed)f(to)j(run)d(on)480 2061 y(eac)m(h)j(of)g(these)f(activities,)h(in)e(the)h(mo)s(dules)f -(database)i(\(see)g(Section)f(C.1)g([mo)s(dules],)g(page)h(135\);)480 +(database)i(\(see)g(Section)f(C.1)g([mo)s(dules],)g(page)h(137\);)480 2186 y(this)h(option)h(b)m(ypasses)g(it\).)480 2333 y Fi(W)-8 b(arning:)41 b Fs(this)29 b(is)h(not)h(the)f(same)h(as)g(the)g (o)m(v)m(erall)f(`)p Fn(cvs)g(-n)p Fs(')g(option,)g(whic)m(h)g(y)m(ou)g @@ -6272,7 +6325,7 @@ Fi(W)-8 b(arning:)41 b Fs(this)29 b(is)h(not)h(the)f(same)h(as)g(the)g Fs(,)d Fn(commit)p Fs(,)h Fn(export)p Fs(,)g(and)h Fn(rtag)f Fs(commands.)0 2773 y Fn(-P)384 b Fs(Prune)29 b(empt)m(y)i (directories.)40 b(See)30 b(See)h(Chapter)f(12)h([Remo)m(ving)g -(directories],)f(page)h(61.)0 2942 y Fn(-p)384 b Fs(Pip)s(e)38 +(directories],)f(page)h(63.)0 2942 y Fn(-p)384 b Fs(Pip)s(e)38 b(the)h(\014les)f(retriev)m(ed)h(from)g(the)g(rep)s(ository)f(to)i (standard)e(output,)j(rather)e(than)g(writing)480 3067 y(them)30 b(in)f(the)i(curren)m(t)f(directory)-8 b(.)41 @@ -6303,10 +6356,10 @@ Fs(to)i(mak)m(e)480 4299 y(y)m(our)24 b(o)m(wn)f(cop)m(y)h(of)g(a)g (tin)m(ues)h(to)g(use)g(it)f(on)g(future)g(up)s(date)480 4424 y(commands,)29 b(un)m(til)e(y)m(ou)i(sp)s(ecify)f(otherwise)g (\(for)h(more)g(information)e(on)i(stic)m(ky)g(tags/dates,)i(see)480 -4548 y(Section)i(7.4)i([Stic)m(ky)f(tags],)i(page)e(49\).)51 +4548 y(Section)i(7.4)i([Stic)m(ky)f(tags],)i(page)e(51\).)51 b(The)33 b(tag)i(can)f(b)s(e)f(either)g(a)h(sym)m(b)s(olic)e(or)h(n)m (umeric)f(tag.)480 4673 y(See)f(Section)f(7.1)h([T)-8 -b(ags],)32 b(page)f(45.)480 4820 y(Sp)s(ecifying)23 b(the)j(`)p +b(ags],)32 b(page)f(47.)480 4820 y(Sp)s(ecifying)23 b(the)j(`)p Fn(-q)p Fs(')f(global)g(option)g(along)g(with)g(the)g(`)p Fn(-r)p Fs(')h(command)f(option)g(is)f(often)i(useful,)f(to)480 4944 y(suppress)g(the)j(w)m(arning)e(messages)j(when)d(the)i @@ -6315,9 +6368,9 @@ Fr(r)n(cs)e Fs(history)g(\014le)h(do)s(es)g(not)g(con)m(tain)h(the)g b Fs(this)32 b(is)g(not)i(the)f(same)h(as)f(the)h(o)m(v)m(erall)f(`cvs) h(-r')f(option,)h(whic)m(h)e(y)m(ou)i(can)f(sp)s(ecify)f(to)480 5340 y(the)f(left)f(of)g(a)h(cvs)f(command!)p eop -%%Page: 93 95 -93 94 bop 0 -116 a Fs(App)s(endix)28 b(A:)i(Guide)g(to)h(CVS)e -(commands)2255 b(93)480 366 y(`)p Fn(-r)p Fs(')27 b(is)g(a)m(v)-5 +%%Page: 95 97 +95 96 bop 0 -116 a Fs(App)s(endix)28 b(A:)i(Guide)g(to)h(CVS)e +(commands)2255 b(95)480 366 y(`)p Fn(-r)p Fs(')27 b(is)g(a)m(v)-5 b(ailable)27 b(with)f(the)i Fn(checkout)p Fs(,)e Fn(commit)p Fs(,)h Fn(diff)p Fs(,)g Fn(history)p Fs(,)g Fn(export)p Fs(,)f Fn(rdiff)p Fs(,)h Fn(rtag)p Fs(,)h(and)480 491 @@ -6361,25 +6414,25 @@ Fs(\014le.)0 4670 y Fn(-b[)p Fo(rev)8 b Fn(])156 b Fs(When)25 b(used)g(with)f(bare)i Fr(r)n(cs)p Fs(,)f(this)g(option)g(sets)h(the)f (default)g(branc)m(h)g(to)h Fo(rev)8 b Fs(;)27 b(in)e Fr(cvs)f Fs(stic)m(ky)i(tags)480 4795 y(\(see)37 b(Section)f(7.4)h -([Stic)m(ky)f(tags],)k(page)c(49\))i(are)e(a)h(b)s(etter)f(w)m(a)m(y)h +([Stic)m(ky)f(tags],)k(page)c(51\))i(are)e(a)h(b)s(etter)f(w)m(a)m(y)h (to)g(decide)e(whic)m(h)g(branc)m(h)h(y)m(ou)480 4919 y(w)m(an)m(t)g(to)f(w)m(ork)g(on.)54 b(There)34 b(is)g(one)h(use)f (with)g Fr(cvs)p Fs(:)48 b(to)36 b(rev)m(ert)f(to)h(the)f(v)m(endor's)g (v)m(ersion)f(when)480 5044 y(using)29 b(v)m(endor)h(branc)m(hes)g (\(see)h(Section)g(13.3)h([Rev)m(erting)e(lo)s(cal)g(c)m(hanges],)i -(page)f(64\).)0 5215 y Fn(-c)p Fo(string)155 b Fs(Useful)34 +(page)f(66\).)0 5215 y Fn(-c)p Fo(string)155 b Fs(Useful)34 b(with)g Fr(cvs)p Fs(.)54 b(Sets)35 b(the)h(commen)m(t)g(leader)f(to)h Fo(string)p Fs(.)54 b(The)34 b(commen)m(t)i(leader)f(is)f(prin)m(ted) 480 5340 y(b)s(efore)21 b(ev)m(ery)g(log)g(message)i(line)c(generated)j (b)m(y)f(the)g(k)m(eyw)m(ord)g Fn($Log: cvs.ps,v $ -(b)m(y)f(the)g(k)m(eyw)m(ord)g Fn(Revision 1.1.1.6 1997/02/21 06:47:01 tholo -(b)m(y)f(the)g(k)m(eyw)m(ord)g Fn(Missed files from new release from Cyclic Software +(b)m(y)f(the)g(k)m(eyw)m(ord)g Fn(Revision 1.1.1.7 1997/03/18 02:05:33 tholo +(b)m(y)f(the)g(k)m(eyw)m(ord)g Fn(Files missed from previous import (b)m(y)f(the)g(k)m(eyw)m(ord)g Fn()f Fs(\(see)i(Chapter)e(17)i ([Keyw)m(ord)p eop -%%Page: 94 96 -94 95 bop 0 -116 a Fs(94)2411 b(CVS|Concurren)m(t)29 +%%Page: 96 98 +96 97 bop 0 -116 a Fs(96)2411 b(CVS|Concurren)m(t)29 b(V)-8 b(ersions)30 b(System)480 366 y(substitution],)35 -b(page)i(75\).)58 b(This)33 b(is)i(useful)f(for)i(programming)e +b(page)i(77\).)58 b(This)33 b(is)i(useful)f(for)i(programming)e (languages)i(without)f(m)m(ulti-line)480 491 y(commen)m(ts.)56 b Fr(R)m(cs)34 b Fs(initially)e(guesses)j(the)g(v)-5 b(alue)35 b(of)g(the)g(commen)m(t)h(leader)f(from)f(the)i(\014le)e @@ -6400,7 +6453,7 @@ b(using)f(bare)g Fr(r)n(cs)p Fs(,)h(this)f(is)g(used)g(to)i(create)g Fo(subst)175 b Fs(Useful)44 b(with)h Fr(cvs)p Fs(.)85 b(Set)46 b(the)g(default)e(k)m(eyw)m(ord)i(substitution)e(to)i Fo(subst)p Fs(.)85 b(See)46 b(Chapter)f(17)480 1890 y([Keyw)m(ord)39 -b(substitution],)g(page)g(75.)67 b(Giving)38 b(an)g(explicit)f(`)p +b(substitution],)g(page)g(77.)67 b(Giving)38 b(an)g(explicit)f(`)p Fn(-k)p Fs(')i(option)f(to)i Fn(cvs)29 b(update)p Fs(,)40 b Fn(cvs)480 2015 y(export)p Fs(,)29 b(or)h Fn(cvs)g(checkout)e Fs(o)m(v)m(errides)i(this)f(default.)0 2178 y Fn(-l[)p @@ -6460,9 +6513,9 @@ Fs(')20 b(whic)m(h)f(asso)s(ciates)i Fo(name)26 b Fs(with)20 b(the)h(revision)d(n)m(um)m(b)s(ers)i(extracted)i(from)e(k)m(eyw)m(ord) h(strings)480 5340 y(in)29 b(the)i(corresp)s(onding)d(w)m(orking)i (\014les.)p eop -%%Page: 95 97 -95 96 bop 0 -116 a Fs(App)s(endix)28 b(A:)i(Guide)g(to)h(CVS)e -(commands)2255 b(95)0 366 y Fn(-o)p Fo(range)167 b Fs(P)m(oten)m +%%Page: 97 99 +97 98 bop 0 -116 a Fs(App)s(endix)28 b(A:)i(Guide)g(to)h(CVS)e +(commands)2255 b(97)0 366 y Fn(-o)p Fo(range)167 b Fs(P)m(oten)m (tially)34 b(useful,)g(but)g(dangerous,)h(with)e Fr(cvs)g Fs(\(see)i(b)s(elo)m(w\).)52 b(Deletes)35 b(\()p Fo(outdates)t Fs(\))h(the)e(revi-)480 491 y(sions)20 b(giv)m(en)h(b)m(y)g @@ -6484,7 +6537,7 @@ Fo(rev)42 b Fs(to)35 b(the)g(end)f(of)h(the)g(branc)m(h)f(con)m Fr(cvs)f Fs(handles)f(branc)m(hes)h Fo(rev)45 b Fs(cannot)39 b(b)s(e)e(sp)s(eci\014ed)e(sym)m(b)s(olically)g(if)i(it)g(is)g(a)480 1389 y(branc)m(h.)j(See)31 b(Section)f(E.1)h([Magic)g(branc)m(h)f(n)m -(um)m(b)s(ers],)f(page)j(153,)f(for)g(an)f(explanation.)480 +(um)m(b)s(ers],)f(page)j(155,)f(for)g(an)f(explanation.)480 1540 y(Mak)m(e)39 b(sure)d(that)i(no-one)f(has)g(c)m(hec)m(k)m(ed)i (out)e(a)h(cop)m(y)g(of)f(the)g(revision)f(y)m(ou)h(outdate.)62 b(Strange)480 1664 y(things)30 b(will)e(happ)s(en)i(if)g(he)g(starts)i @@ -6493,7 +6546,7 @@ b(Strange)480 1664 y(things)30 b(will)e(happ)s(en)i(if)g(he)g(starts)i b(option)h(is)g(not)h(a)f(go)s(o)s(d)h(w)m(a)m(y)g(to)g(tak)m(e)h(bac)m (k)g(a)f(b)s(ogus)e(commit;)41 b(commit)d(a)g(new)f(revision)480 1913 y(undoing)28 b(the)j(b)s(ogus)f(c)m(hange)h(instead)f(\(see)h -(Section)f(8.3)i([Merging)e(t)m(w)m(o)i(revisions],)d(page)i(53\).)0 +(Section)f(8.3)i([Merging)e(t)m(w)m(o)i(revisions],)d(page)i(55\).)0 2090 y Fn(-q)384 b Fs(Run)29 b(quietly;)h(do)g(not)g(prin)m(t)f (diagnostics.)0 2267 y Fn(-s)p Fo(state)5 b Fn([:)p Fo(rev)j Fn(])480 2391 y Fs(Useful)28 b(with)g Fr(cvs)p Fs(.)39 @@ -6512,12 +6565,12 @@ b(the)f(state)i(of)e(a)h(new)f(revision)f(is)g(set)i(to)g(`)p Fn(Exp)p Fs(')f(when)f(it)h(is)f(created.)41 b(The)24 b(state)j(is)d(visible)480 3014 y(in)32 b(the)i(output)f(from)h Fo(cvs)f(log)42 b Fs(\(see)34 b(Section)g(A.12)h([log],)g(page)f -(110\),)j(and)c(in)f(the)i(`)p Fn($Log: cvs.ps,v $ -(110\),)j(and)c(in)f(the)i(`)p Fn(Revision 1.1.1.6 1997/02/21 06:47:01 tholo -(110\),)j(and)c(in)f(the)i(`)p Fn(Missed files from new release from Cyclic Software -(110\),)j(and)c(in)f(the)i(`)p Fn()p Fs(')f(and)480 +(113\),)j(and)c(in)f(the)i(`)p Fn($Log: cvs.ps,v $ +(113\),)j(and)c(in)f(the)i(`)p Fn(Revision 1.1.1.7 1997/03/18 02:05:33 tholo +(113\),)j(and)c(in)f(the)i(`)p Fn(Files missed from previous import +(113\),)j(and)c(in)f(the)i(`)p Fn()p Fs(')f(and)480 3138 y(`)p Fn($State: Exp $)p Fs(')d(k)m(eyw)m(ords)i(\(see)g(Chapter)f(17)i -([Keyw)m(ord)e(substitution],)f(page)j(75\).)45 b(Note)33 +([Keyw)m(ord)e(substitution],)f(page)j(77\).)45 b(Note)33 b(that)f Fr(cvs)480 3263 y Fs(uses)i(the)g Fn(dead)g Fs(state)h(for)f(its)g(o)m(wn)h(purp)s(oses;)f(to)h(tak)m(e)h(a)f (\014le)f(to)h(or)f(from)g(the)g Fn(dead)g Fs(state)h(use)480 @@ -6536,7 +6589,7 @@ y Fo(\014le)42 b Fs(is)37 b(omitted,)j(obtain)e(the)g(text)h(from)e (p)s(ossible;)h(see)h(`)p Fn(-I)p Fs('.)480 4062 y(The)31 b(descriptiv)m(e)g(text)i(can)f(b)s(e)f(seen)h(in)f(the)h(output)f (from)h(`)p Fn(cvs)d(log)p Fs(')j(\(see)g(Section)g(A.12)h([log],)480 -4187 y(page)e(110\).)0 4364 y Fn(-t-)p Fo(string)107 +4187 y(page)e(113\).)0 4364 y Fn(-t-)p Fo(string)107 b Fs(Similar)25 b(to)j(`)p Fn(-t)p Fo(\014le)5 b Fs('.)39 b(W)-8 b(rite)29 b(descriptiv)m(e)e(text)h(from)g(the)g Fo(string)34 b Fs(in)m(to)28 b(the)g Fr(r)n(cs)f Fs(\014le,)h(deleting) @@ -6556,8 +6609,8 @@ b(unlo)s(c)m(k)42 b(the)i(latest)g(revision)d(on)i(that)480 5340 y(branc)m(h.)c(If)28 b Fo(rev)36 b Fs(is)27 b(omitted,)i(remo)m(v) m(e)h(the)e(latest)h(lo)s(c)m(k)f(held)f(b)m(y)h(the)g(caller.)39 b(Normally)-8 b(,)28 b(only)g(the)p eop -%%Page: 96 98 -96 97 bop 0 -116 a Fs(96)2411 b(CVS|Concurren)m(t)29 +%%Page: 98 100 +98 99 bop 0 -116 a Fs(98)2411 b(CVS|Concurren)m(t)29 b(V)-8 b(ersions)30 b(System)480 366 y(lo)s(c)m(k)m(er)e(of)g(a)g (revision)e(ma)m(y)i(unlo)s(c)m(k)e(it.)40 b(Someb)s(o)s(dy)26 b(else)h(unlo)s(c)m(king)f(a)i(revision)e(breaks)h(the)h(lo)s(c)m(k.) @@ -6609,8 +6662,8 @@ w(1)p 2051 4161 V 33 w(03)e(will)d(also)i(ha)m(v)m(e)i(to)f(b)s(e)e (restored)h(from)g(the)h(tap)s(es!)0 4583 y Fk(A.5.2.2)62 b(Commen)m(t)29 b(leaders)125 4858 y Fs(If)e(y)m(ou)g(use)h(the)f Fn($Log: cvs.ps,v $ -Fn(Revision 1.1.1.6 1997/02/21 06:47:01 tholo -Fn(Missed files from new release from Cyclic Software +Fn(Revision 1.1.1.7 1997/03/18 02:05:33 tholo +Fn(Files missed from previous import Fn()g Fs(k)m(eyw)m(ord)h(and)e(y)m(ou)i(do)g(not)g(agree)g(with)f (the)g(guess)h(for)f(commen)m(t)i(leader)e(that)h Fr(cvs)0 4982 y Fs(has)i(done,)h(y)m(ou)f(can)h(enforce)g(y)m(our)f(will)e(with) @@ -6618,9 +6671,9 @@ h Fn(cvs)g(admin)g(-c)p Fs(.)40 b(This)29 b(migh)m(t)h(b)s(e)g (suitable)f(for)h Fn(nroff)f Fs(source:)240 5236 y Fn($)47 b(cvs)g(admin)g(-c'.\\")f(')h(*.man)240 5340 y($)g(rm)h(*.man)p eop -%%Page: 97 99 -97 98 bop 0 -116 a Fs(App)s(endix)28 b(A:)i(Guide)g(to)h(CVS)e -(commands)2255 b(97)240 366 y Fn($)47 b(cvs)g(update)125 +%%Page: 99 101 +99 100 bop 0 -116 a Fs(App)s(endix)28 b(A:)i(Guide)g(to)h(CVS)e +(commands)2255 b(99)240 366 y Fn($)47 b(cvs)g(update)125 648 y Fs(The)31 b(t)m(w)m(o)i(last)e(steps)g(are)h(to)h(mak)m(e)f(sure) f(that)h(y)m(ou)g(get)h(the)f(v)m(ersions)f(with)f(correct)j(commen)m (t)f(leaders)f(in)0 772 y(y)m(our)f(w)m(orking)g(\014les.)0 @@ -6642,7 +6695,7 @@ b(.)125 2878 y(The)42 b Fo(mo)s(dules)i Fs(part)e(of)h(the)g(command)f (directories)e(or)h(\014les)f(in)g(the)i(rep)s(ository)-8 b(.)72 b(The)41 b(sym)m(b)s(olic)e(names)j(are)0 3127 y(de\014ned)29 b(in)g(the)i(`)p Fn(modules)p Fs(')e(\014le.)39 -b(See)31 b(Section)f(C.1)h([mo)s(dules],)e(page)i(135.)125 +b(See)31 b(Section)f(C.1)h([mo)s(dules],)e(page)i(137.)125 3408 y(Dep)s(ending)20 b(on)h(the)h(mo)s(dules)e(y)m(ou)i(sp)s(ecify)-8 b(,)22 b Fn(checkout)e Fs(ma)m(y)i(recursiv)m(ely)e(create)j (directories)e(and)g(p)s(opulate)0 3533 y(them)28 b(with)f(the)h @@ -6670,14 +6723,14 @@ Fn(-Q)p Fs(')f(global)g(option\).)125 4966 y(The)36 b(\014les)g (created)i(b)m(y)e Fn(checkout)f Fs(are)i(created)h(read-write,)g (unless)d(the)i(`)p Fn(-r)p Fs(')g(option)f(to)i Fr(cvs)e Fs(\(see)h(Sec-)0 5091 y(tion)30 b(A.3)i([Global)f(options],)g(page)g -(89\))i(is)d(sp)s(eci\014ed,)f(the)i Fn(CVSREAD)e Fs(en)m(vironmen)m(t) +(91\))i(is)d(sp)s(eci\014ed,)f(the)i Fn(CVSREAD)e Fs(en)m(vironmen)m(t) i(v)-5 b(ariable)30 b(is)g(sp)s(eci\014ed)f(\(see)0 5215 y(App)s(endix)c(D)k([En)m(vironmen)m(t)e(v)-5 b(ariables],)28 -b(page)g(149\),)j(or)d(a)g(w)m(atc)m(h)h(is)e(in)g(e\013ect)j(for)d +b(page)g(151\),)j(or)d(a)g(w)m(atc)m(h)h(is)e(in)g(e\013ect)j(for)d (that)i(\014le)e(\(see)i(Section)f(6.6)0 5340 y([W)-8 -b(atc)m(hes],)33 b(page)e(39\).)p eop -%%Page: 98 100 -98 99 bop 0 -116 a Fs(98)2411 b(CVS|Concurren)m(t)29 +b(atc)m(hes],)33 b(page)e(41\).)p eop +%%Page: 100 102 +100 101 bop 0 -116 a Fs(100)2366 b(CVS|Concurren)m(t)29 b(V)-8 b(ersions)30 b(System)125 366 y(Running)25 b Fn(checkout)h Fs(on)i(a)h(directory)f(that)g(w)m(as)h(already)f(built)e(b)m(y)i(a)g (prior)f Fn(checkout)f Fs(is)h(also)h(p)s(ermitted,)0 @@ -6686,18 +6739,18 @@ Fs(on)i(a)h(directory)f(that)g(w)m(as)h(already)f(built)e(b)m(y)i(a)g f(is,)h(an)m(y)e(new)0 616 y(directories)24 b(that)i(ha)m(v)m(e)h(b)s (een)d(created)j(in)d(the)h(rep)s(ository)f(will)f(app)s(ear)i(in)f(y)m (our)h(w)m(ork)g(area.)40 b(See)26 b(Section)f(A.18)0 -740 y([up)s(date],)30 b(page)h(120.)125 1017 y(F)-8 b(or)52 +740 y([up)s(date],)30 b(page)h(122.)125 1017 y(F)-8 b(or)52 b(the)f(output)g(pro)s(duced)f(b)m(y)h(the)h Fn(checkout)d Fs(command)i(see)h(Section)g(A.18.2)h([up)s(date)e(output],)0 -1142 y(page)31 b(122.)0 1584 y Fk(A.6.1)62 b(c)m(hec)m(k)m(out)28 +1142 y(page)31 b(124.)0 1584 y Fk(A.6.1)62 b(c)m(hec)m(k)m(out)28 b(options)125 1861 y Fs(These)23 b(standard)g(options)g(are)h(supp)s (orted)e(b)m(y)i Fn(checkout)d Fs(\(see)k(Section)e(A.4)i([Common)e -(options],)i(page)g(90,)0 1986 y(for)30 b(a)h(complete)g(description)d +(options],)i(page)g(92,)0 1986 y(for)30 b(a)h(complete)g(description)d (of)j(them\):)0 2291 y Fn(-D)f Fo(date)183 b Fs(Use)28 b(the)f(most)g(recen)m(t)i(revision)c(no)i(later)g(than)g Fo(date)p Fs(.)40 b(This)26 b(option)g(is)g(stic)m(ky)-8 b(,)29 b(and)d(implies)f(`)p Fn(-P)p Fs('.)480 2415 y(See)31 -b(Section)f(7.4)h([Stic)m(ky)g(tags],)h(page)f(49,)g(for)f(more)h +b(Section)f(7.4)h([Stic)m(ky)g(tags],)h(page)f(51,)g(for)f(more)h (information)e(on)h(stic)m(ky)g(tags/dates.)0 2595 y Fn(-f)384 b Fs(Only)42 b(useful)g(with)h(the)h(`)p Fn(-D)30 b Fo(date)5 b Fs(')44 b(or)g(`)p Fn(-r)30 b Fo(tag)8 @@ -6711,45 +6764,46 @@ b(future)480 3025 y(up)s(dates)42 b(of)g(this)g(\014le)g(in)f(this)h(w) m(orking)f(directory)i(will)d(use)i(the)h(same)g Fo(k\015ag)p Fs(.)78 b(The)42 b Fn(status)480 3149 y Fs(command)28 b(can)h(b)s(e)f(view)m(ed)g(to)h(see)g(the)g(stic)m(ky)g(options.)39 -b(See)29 b(Section)f(A.16)i([status],)g(page)f(117.)0 +b(See)29 b(Section)f(A.16)i([status],)g(page)f(119.)0 3330 y Fn(-l)384 b Fs(Lo)s(cal;)30 b(run)f(only)h(in)f(curren)m(t)h(w)m (orking)g(directory)-8 b(.)0 3510 y Fn(-n)384 b Fs(Do)27 b(not)g(run)e(an)m(y)h(c)m(hec)m(k)m(out)j(program)d(\(as)h(sp)s (eci\014ed)e(with)g(the)h(`)p Fn(-o)p Fs(')h(option)e(in)g(the)i(mo)s (dules)e(\014le;)480 3635 y(see)31 b(Section)f(C.1)h([mo)s(dules],)e -(page)i(135\).)0 3815 y Fn(-P)384 b Fs(Prune)29 b(empt)m(y)i +(page)i(137\).)0 3815 y Fn(-P)384 b Fs(Prune)29 b(empt)m(y)i (directories.)40 b(See)30 b(Chapter)g(15)h([Mo)m(ving)g(directories],)f -(page)h(71.)0 3996 y Fn(-p)384 b Fs(Pip)s(e)29 b(\014les)g(to)i(the)g +(page)h(73.)0 3996 y Fn(-p)384 b Fs(Pip)s(e)29 b(\014les)g(to)i(the)g (standard)e(output.)0 4176 y Fn(-r)h Fo(tag)229 b Fs(Use)32 b(revision)e Fo(tag)p Fs(.)45 b(This)30 b(option)g(is)h(stic)m(ky)-8 b(,)33 b(and)e(implies)d(`)p Fn(-P)p Fs('.)44 b(See)32 -b(Section)f(7.4)i([Stic)m(ky)e(tags],)480 4301 y(page)g(49,)h(for)e +b(Section)f(7.4)i([Stic)m(ky)e(tags],)480 4301 y(page)g(51,)h(for)e (more)g(information)f(on)h(stic)m(ky)h(tags/dates.)125 4606 y(In)e(addition)g(to)i(those,)g(y)m(ou)g(can)f(use)g(these)h(sp)s (ecial)e(command)h(options)g(with)f Fn(checkout)p Fs(:)0 4911 y Fn(-A)384 b Fs(Reset)30 b(an)m(y)f(stic)m(ky)g(tags,)h(dates,)g (or)f(`)p Fn(-k)p Fs(')g(options.)39 b(See)29 b(Section)g(7.4)h([Stic)m -(ky)f(tags],)h(page)g(49,)g(for)480 5035 y(more)h(information)d(on)i +(ky)f(tags],)h(page)g(51,)g(for)480 5035 y(more)h(information)d(on)i (stic)m(ky)h(tags/dates.)0 5215 y Fn(-c)384 b Fs(Cop)m(y)30 b(the)f(mo)s(dule)f(\014le,)i(sorted,)g(to)g(the)g(standard)f(output,)g (instead)g(of)h(creating)g(or)g(mo)s(difying)480 5340 y(an)m(y)h(\014les)e(or)h(directories)g(in)f(y)m(our)h(w)m(orking)g (directory)-8 b(.)p eop -%%Page: 99 101 -99 100 bop 0 -116 a Fs(App)s(endix)28 b(A:)i(Guide)g(to)h(CVS)e -(commands)2255 b(99)0 366 y Fn(-d)30 b Fo(dir)241 b Fs(Create)34 -b(a)g(directory)f(called)f Fo(dir)38 b Fs(for)33 b(the)h(w)m(orking)e -(\014les,)i(instead)e(of)i(using)d(the)j(mo)s(dule)e(name.)480 -491 y(Unless)d(y)m(ou)i(also)f(use)g(`)p Fn(-N)p Fs(',)h(the)g(paths)f -(created)h(under)e Fo(dir)35 b Fs(will)28 b(b)s(e)h(as)i(short)f(as)h -(p)s(ossible.)0 665 y Fn(-j)f Fo(tag)229 b Fs(With)39 -b(t)m(w)m(o)h(`)p Fn(-j)p Fs(')f(options,)i(merge)f(c)m(hanges)g(from)f -(the)g(revision)f(sp)s(eci\014ed)f(with)h(the)i(\014rst)e(`)p -Fn(-j)p Fs(')480 789 y(option)30 b(to)h(the)g(revision)d(sp)s -(eci\014ed)h(with)g(the)h(second)h(`)p Fn(j)p Fs(')f(option,)g(in)m(to) -h(the)f(w)m(orking)g(directory)-8 b(.)480 938 y(With)24 -b(one)g(`)p Fn(-j)p Fs(')g(option,)i(merge)e(c)m(hanges)i(from)d(the)i -(ancestor)g(revision)e(to)i(the)f(revision)f(sp)s(eci\014ed)480 +%%Page: 101 103 +101 102 bop 0 -116 a Fs(App)s(endix)28 b(A:)i(Guide)g(to)h(CVS)e +(commands)2210 b(101)0 366 y Fn(-d)30 b Fo(dir)241 b +Fs(Create)34 b(a)g(directory)f(called)f Fo(dir)38 b Fs(for)33 +b(the)h(w)m(orking)e(\014les,)i(instead)e(of)i(using)d(the)j(mo)s(dule) +e(name.)480 491 y(Unless)d(y)m(ou)i(also)f(use)g(`)p +Fn(-N)p Fs(',)h(the)g(paths)f(created)h(under)e Fo(dir)35 +b Fs(will)28 b(b)s(e)h(as)i(short)f(as)h(p)s(ossible.)0 +665 y Fn(-j)f Fo(tag)229 b Fs(With)39 b(t)m(w)m(o)h(`)p +Fn(-j)p Fs(')f(options,)i(merge)f(c)m(hanges)g(from)f(the)g(revision)f +(sp)s(eci\014ed)f(with)h(the)i(\014rst)e(`)p Fn(-j)p +Fs(')480 789 y(option)30 b(to)h(the)g(revision)d(sp)s(eci\014ed)h(with) +g(the)h(second)h(`)p Fn(j)p Fs(')f(option,)g(in)m(to)h(the)f(w)m +(orking)g(directory)-8 b(.)480 938 y(With)24 b(one)g(`)p +Fn(-j)p Fs(')g(option,)i(merge)e(c)m(hanges)i(from)d(the)i(ancestor)g +(revision)e(to)i(the)f(revision)f(sp)s(eci\014ed)480 1063 y(with)30 b(the)h(`)p Fn(-j)p Fs(')g(option,)f(in)m(to)h(the)g(w)m (orking)g(directory)-8 b(.)42 b(The)30 b(ancestor)i(revision)e(is)g (the)h(common)480 1187 y(ancestor)45 b(of)f(the)g(revision)f(whic)m(h)g @@ -6763,7 +6817,7 @@ e(the)i(c)m(hosen)g(revision)e(to)j(one)f(within)d(a)k(sp)s(eci\014c)d m(y)h(adding)f(a)i(colon)f(\(:\))42 b(to)31 b(the)g(tag:)41 b(`)p Fn(-j)p Fo(Sym)m(b)s(olic)p 2962 1710 28 4 v 31 w(T)-8 b(ag)8 b Fn(:)p Fo(Date)p 3386 1710 V 35 w(Sp)s(eci\014er)f -Fs('.)480 1859 y(See)31 b(Chapter)e(8)i([Merging],)g(page)g(51.)0 +Fs('.)480 1859 y(See)31 b(Chapter)e(8)i([Merging],)g(page)g(53.)0 2032 y Fn(-N)384 b Fs(Only)21 b(useful)h(together)i(with)e(`)p Fn(-d)30 b Fo(dir)7 b Fs('.)37 b(With)22 b(this)g(option,)i Fr(cvs)e Fs(will)f(not)i(shorten)g(mo)s(dule)e(paths)480 @@ -6774,7 +6828,7 @@ b(\(Normally)-8 b(,)38 b Fr(cvs)e Fs(shortens)g(paths)g(as)i(m)m(uc)m b Fs(Lik)m(e)34 b(`)p Fn(-c)p Fs(',)i(but)e(include)e(the)j(status)g (of)f(all)g(mo)s(dules,)g(and)g(sort)h(it)f(b)m(y)g(the)h(status)g (string.)52 b(See)480 2580 y(Section)32 b(C.1)g([mo)s(dules],)f(page)i -(135,)h(for)e(info)e(ab)s(out)i(the)g(`)p Fn(-s)p Fs(')g(option)f(that) +(137,)h(for)e(info)e(ab)s(out)i(the)g(`)p Fn(-s)p Fs(')g(option)f(that) i(is)e(used)g(inside)f(the)480 2704 y(mo)s(dules)f(\014le)g(to)i(set)g (the)g(mo)s(dule)d(status.)0 3118 y Fk(A.6.2)62 b(c)m(hec)m(k)m(out)28 b(examples)125 3392 y Fs(Get)j(a)g(cop)m(y)g(of)f(the)h(mo)s(dule)e(`)p @@ -6794,8 +6848,8 @@ b(:)g(:)q Fs(])75 5191 y Fq(\017)60 b Fs(Requires:)40 b(w)m(orking)29 b(directory)-8 b(,)31 b(rep)s(ository)-8 b(.)75 5340 y Fq(\017)60 b Fs(Changes:)40 b(rep)s(ository)-8 b(.)p eop -%%Page: 100 102 -100 101 bop 0 -116 a Fs(100)2366 b(CVS|Concurren)m(t)29 +%%Page: 102 104 +102 103 bop 0 -116 a Fs(102)2366 b(CVS|Concurren)m(t)29 b(V)-8 b(ersions)30 b(System)75 366 y Fq(\017)60 b Fs(Synon)m(ym:)40 b(ci)125 699 y Fi(W)-8 b(arning:)38 b Fs(The)27 b(`)p Fn(-f)j Fo(\014le)5 b Fs(')26 b(option)g(will)e(probably)h(b)s(e)h @@ -6822,19 +6876,19 @@ e(in)h(the)h(source)0 2444 y(rep)s(ository;)j(it)d(will)e(notify)i(y)m (ou,)i(and)e(exit)g(without)g(committing,)i(if)d(an)m(y)i(of)f(the)h (sp)s(eci\014ed)d(\014les)h(m)m(ust)i(b)s(e)0 2569 y(made)e(curren)m(t) f(\014rst)g(with)f Fn(update)g Fs(\(see)j(Section)e(A.18)i([up)s -(date],)g(page)g(120\).)61 b Fn(commit)35 b Fs(do)s(es)h(not)h(call)f +(date],)g(page)g(122\).)61 b Fn(commit)35 b Fs(do)s(es)h(not)h(call)f (the)0 2693 y Fn(update)29 b Fs(command)h(for)g(y)m(ou,)h(but)f(rather) g(lea)m(v)m(es)h(that)g(for)g(y)m(ou)f(to)h(do)g(when)e(the)i(time)f (is)f(righ)m(t.)125 2984 y(When)e(all)g(is)g(w)m(ell,)g(an)h(editor)f (is)g(in)m(v)m(ok)m(ed)h(to)h(allo)m(w)e(y)m(ou)h(to)h(en)m(ter)f(a)h (log)f(message)h(that)f(will)d(b)s(e)i(written)g(to)0 3109 y(one)32 b(or)h(more)f(logging)g(programs)g(\(see)h(Section)f(C.1) -g([mo)s(dules],)g(page)h(135,)h(and)e(see)h(Section)f(C.7)g([loginfo],) -0 3233 y(page)26 b(143\))h(and)e(placed)f(in)g(the)i +g([mo)s(dules],)g(page)h(137,)h(and)e(see)h(Section)f(C.7)g([loginfo],) +0 3233 y(page)26 b(145\))h(and)e(placed)f(in)g(the)i Fr(r)n(cs)e Fs(history)g(\014le)h(inside)e(the)i(rep)s(ository)-8 b(.)39 b(This)23 b(log)i(message)i(can)e(b)s(e)g(retriev)m(ed)0 3358 y(with)31 b(the)h Fn(log)f Fs(command;)i(See)f(Section)g(A.12)i -([log],)f(page)g(110.)47 b(Y)-8 b(ou)32 b(can)h(sp)s(ecify)d(the)i(log) +([log],)f(page)g(113.)47 b(Y)-8 b(ou)32 b(can)h(sp)s(ecify)d(the)i(log) h(message)g(on)f(the)0 3482 y(command)i(line)f(with)h(the)g(`)p Fn(-m)c Fo(message)5 b Fs(')36 b(option,)g(and)e(th)m(us)g(a)m(v)m(oid) h(the)g(editor)f(in)m(v)m(o)s(cation,)i(or)e(use)h(the)f(`)p @@ -6842,871 +6896,875 @@ Fn(-f)0 3607 y Fo(\014le)5 b Fs(')30 b(option)g(to)h(sp)s(ecify)e(that) i(the)f(argumen)m(t)h(\014le)f(con)m(tains)g(the)h(log)f(message.)0 4175 y Fk(A.7.1)62 b(commit)29 b(options)125 4466 y Fs(These)h (standard)h(options)f(are)i(supp)s(orted)d(b)m(y)i Fn(commit)f -Fs(\(see)i(Section)f(A.4)h([Common)f(options],)g(page)h(90,)0 +Fs(\(see)i(Section)f(A.4)h([Common)f(options],)g(page)h(92,)0 4590 y(for)e(a)h(complete)g(description)d(of)j(them\):)0 4923 y Fn(-l)384 b Fs(Lo)s(cal;)30 b(run)f(only)h(in)f(curren)m(t)h(w)m (orking)g(directory)-8 b(.)0 5132 y Fn(-n)384 b Fs(Do)31 b(not)g(run)e(an)m(y)h(mo)s(dule)f(program.)0 5340 y Fn(-R)384 b Fs(Commit)30 b(directories)f(recursiv)m(ely)-8 b(.)40 b(This)28 b(is)i(on)g(b)m(y)g(default.)p eop -%%Page: 101 103 -101 102 bop 0 -116 a Fs(App)s(endix)28 b(A:)i(Guide)g(to)h(CVS)e -(commands)2210 b(101)0 366 y Fn(-r)30 b Fo(revision)480 +%%Page: 103 105 +103 104 bop 0 -116 a Fs(App)s(endix)28 b(A:)i(Guide)g(to)h(CVS)e +(commands)2210 b(103)0 366 y Fn(-r)30 b Fo(revision)480 491 y Fs(Commit)e(to)i Fo(revision)p Fs(.)39 b Fo(revision)28 b Fs(m)m(ust)h(b)s(e)f(either)h(a)h(branc)m(h,)f(or)g(a)h(revision)d (on)i(the)h(main)e(trunk)480 616 y(that)41 b(is)e(higher)f(than)i(an)m (y)g(existing)f(revision)g(n)m(um)m(b)s(er.)68 b(Y)-8 b(ou)40 b(cannot)h(commit)f(to)h(a)f(sp)s(eci\014c)480 -740 y(revision)29 b(on)h(a)h(branc)m(h.)125 1036 y Fn(commit)d -Fs(also)j(supp)s(orts)d(these)j(options:)0 1332 y Fn(-F)f -Fo(\014le)237 b Fs(This)27 b(option)i(is)f(presen)m(t)h(in)e -Fr(cvs)h Fs(releases)h(1.3-s3)i(and)d(later.)41 b(Read)29 -b(the)g(log)g(message)h(from)f Fo(\014le)p Fs(,)480 1457 -y(instead)h(of)g(in)m(v)m(oking)g(an)g(editor.)0 1626 -y Fn(-f)384 b Fs(This)26 b(option)i(is)f(presen)m(t)h(in)f -Fr(cvs)g Fs(1.3-s3)j(and)e(later)g(releases)g(of)h Fr(cvs)p -Fs(.)39 b(Note)29 b(that)g(this)e(is)g(not)i(the)480 -1751 y(standard)i(b)s(eha)m(vior)g(of)g(the)h(`)p Fn(-f)p -Fs(')g(option)f(as)h(de\014ned)e(in)h(See)h(Section)f(A.4)i([Common)e -(options],)480 1875 y(page)g(90.)480 2022 y(F)-8 b(orce)33 -b Fr(cvs)d Fs(to)i(commit)f(a)h(new)e(revision)g(ev)m(en)i(if)e(y)m(ou) -i(ha)m(v)m(en't)g(made)f(an)m(y)h(c)m(hanges)g(to)g(the)g(\014le.)480 -2146 y(If)e(the)g(curren)m(t)h(revision)d(of)j Fo(\014le)j +740 y(revision)29 b(on)h(a)h(branc)m(h.)125 1054 y Fn(commit)d +Fs(also)j(supp)s(orts)d(these)j(options:)0 1367 y Fn(-F)f +Fo(\014le)237 b Fs(Read)31 b(the)f(log)h(message)g(from)f +Fo(\014le)p Fs(,)g(instead)f(of)i(in)m(v)m(oking)f(an)g(editor.)0 +1556 y Fn(-f)384 b Fs(Note)37 b(that)g(this)e(is)g(not)i(the)f +(standard)f(b)s(eha)m(vior)h(of)g(the)g(`)p Fn(-f)p Fs(')g(option)g(as) +g(de\014ned)f(in)g(See)h(Sec-)480 1681 y(tion)30 b(A.4)h([Common)f +(options],)g(page)i(92.)480 1837 y(F)-8 b(orce)33 b Fr(cvs)d +Fs(to)i(commit)f(a)h(new)e(revision)g(ev)m(en)i(if)e(y)m(ou)i(ha)m(v)m +(en't)g(made)f(an)m(y)h(c)m(hanges)g(to)g(the)g(\014le.)480 +1962 y(If)e(the)g(curren)m(t)h(revision)d(of)j Fo(\014le)j Fs(is)c(1.7,)h(then)g(the)f(follo)m(wing)f(t)m(w)m(o)j(commands)e(are)g -(equiv)-5 b(alen)m(t:)720 2272 y Fn($)47 b(cvs)g(commit)f(-f)i -Fo(\014le)720 2376 y Fn($)f(cvs)g(commit)f(-r)i(1.8)f -Fo(\014le)0 2545 y Fn(-f)30 b Fo(\014le)237 b Fs(This)30 -b(option)i(is)f(presen)m(t)h(in)f Fr(cvs)g Fs(releases)h(1.3,)i(1.3-s1) -g(and)e(1.3-s2.)47 b(Note)34 b(that)e(this)f(is)g(not)i(the)480 -2670 y(standard)e(b)s(eha)m(vior)g(of)g(the)h(`)p Fn(-f)p -Fs(')g(option)f(as)h(de\014ned)e(in)h(See)h(Section)f(A.4)i([Common)e -(options],)480 2794 y(page)g(90.)480 2941 y(Read)g(the)f(log)h(message) -g(from)f Fo(\014le)p Fs(,)g(instead)f(of)i(in)m(v)m(oking)f(an)g -(editor.)0 3110 y Fn(-m)g Fo(message)480 3235 y Fs(Use)h -Fo(message)36 b Fs(as)31 b(the)g(log)f(message,)i(instead)d(of)i(in)m -(v)m(oking)f(an)g(editor.)0 3640 y Fk(A.7.2)62 b(commit)29 -b(examples)0 4045 y(A.7.2.1)62 b(New)30 b(ma)7 b(jor)29 -b(release)i(n)m(um)m(b)s(er)125 4319 y Fs(By)k(default,)g -Fr(cvs)f Fs(will)e(assign)i(n)m(umeric)g(revisions)f(b)m(y)i(lea)m -(ving)f(the)h(\014rst)f(n)m(um)m(b)s(er)g(the)h(same)g(and)g(incre-)0 -4443 y(men)m(ting)30 b(the)h(second)g(n)m(um)m(b)s(er.)40 -b(F)-8 b(or)31 b(example,)f Fn(1.1)p Fs(,)g Fn(1.2)p -Fs(,)g Fn(1.3)p Fs(,)g(etc.)43 b(Normally)29 b(there)i(is)f(no)g -(reason)h(to)g(care)0 4568 y(ab)s(out)38 b(the)h(revision)d(n)m(um)m(b) -s(ers|it)h(is)g(easier)i(to)g(treat)g(them)g(as)f(in)m(ternal)f(n)m(um) -m(b)s(ers)g(that)i Fr(cvs)f Fs(main)m(tains,)0 4692 y(and)31 -b(tags)i(pro)m(vide)d(a)i(b)s(etter)g(w)m(a)m(y)h(to)f(distinguish)c(b) -s(et)m(w)m(een)k(things)e(lik)m(e)h(release)h(1)g(v)m(ersus)f(release)h -(2)g(of)g(y)m(our)0 4817 y(pro)s(duct)h(\(see)i(Section)f(7.1)h([T)-8 -b(ags],)36 b(page)f(45\).)53 b(Ho)m(w)m(ev)m(er,)37 b(if)c(y)m(ou)h(w)m -(an)m(t)h(to)g(set)f(the)h(n)m(umeric)d(revisions,)i(the)0 -4941 y(`)p Fn(-r)p Fs(')c(option)g(to)h Fn(cvs)f(commit)e -Fs(can)j(do)f(that.)125 5215 y(F)-8 b(or)40 b(example,)i(to)e(bring)e +(equiv)-5 b(alen)m(t:)720 2098 y Fn($)47 b(cvs)g(commit)f(-f)i +Fo(\014le)720 2202 y Fn($)f(cvs)g(commit)f(-r)i(1.8)f +Fo(\014le)480 2358 y Fs(The)29 b(`)p Fn(-f)p Fs(')g(option)g(disables)e +(recursion)h(\(i.e.,)i(it)f(implies)d(`)p Fn(-l)p Fs('\).)41 +b(T)-8 b(o)29 b(force)h Fr(cvs)f Fs(to)h(commit)f(a)g(new)480 +2483 y(revision)g(for)h(all)f(\014les)g(in)g(all)h(sub)s(directories,)e +(y)m(ou)i(m)m(ust)h(use)f(`)p Fn(-f)g(-R)p Fs('.)0 2672 +y Fn(-m)g Fo(message)480 2796 y Fs(Use)h Fo(message)36 +b Fs(as)31 b(the)g(log)f(message,)i(instead)d(of)i(in)m(v)m(oking)f(an) +g(editor.)0 3289 y Fk(A.7.2)62 b(commit)29 b(examples)0 +3770 y(A.7.2.1)62 b(New)30 b(ma)7 b(jor)29 b(release)i(n)m(um)m(b)s(er) +125 4051 y Fs(By)k(default,)g Fr(cvs)f Fs(will)e(assign)i(n)m(umeric)g +(revisions)f(b)m(y)i(lea)m(ving)f(the)h(\014rst)f(n)m(um)m(b)s(er)g +(the)h(same)g(and)g(incre-)0 4176 y(men)m(ting)30 b(the)h(second)g(n)m +(um)m(b)s(er.)40 b(F)-8 b(or)31 b(example,)f Fn(1.1)p +Fs(,)g Fn(1.2)p Fs(,)g Fn(1.3)p Fs(,)g(etc.)43 b(Normally)29 +b(there)i(is)f(no)g(reason)h(to)g(care)0 4300 y(ab)s(out)38 +b(the)h(revision)d(n)m(um)m(b)s(ers|it)h(is)g(easier)i(to)g(treat)g +(them)g(as)f(in)m(ternal)f(n)m(um)m(b)s(ers)g(that)i +Fr(cvs)f Fs(main)m(tains,)0 4425 y(and)31 b(tags)i(pro)m(vide)d(a)i(b)s +(etter)g(w)m(a)m(y)h(to)f(distinguish)c(b)s(et)m(w)m(een)k(things)e +(lik)m(e)h(release)h(1)g(v)m(ersus)f(release)h(2)g(of)g(y)m(our)0 +4549 y(pro)s(duct)h(\(see)i(Section)f(7.1)h([T)-8 b(ags],)36 +b(page)f(47\).)53 b(Ho)m(w)m(ev)m(er,)37 b(if)c(y)m(ou)h(w)m(an)m(t)h +(to)g(set)f(the)h(n)m(umeric)d(revisions,)i(the)0 4674 +y(`)p Fn(-r)p Fs(')c(option)g(to)h Fn(cvs)f(commit)e +Fs(can)j(do)f(that.)125 4955 y(F)-8 b(or)40 b(example,)i(to)e(bring)e (all)h(y)m(our)h(\014les)e(up)h(to)h(the)g Fr(r)n(cs)f Fs(revision)f(3.0)j(\(including)36 b(those)k(that)h(ha)m(v)m(en't)0 -5340 y(c)m(hanged\),)32 b(y)m(ou)e(migh)m(t)g(in)m(v)m(ok)m(e:)p -eop -%%Page: 102 104 -102 103 bop 0 -116 a Fs(102)2366 b(CVS|Concurren)m(t)29 -b(V)-8 b(ersions)30 b(System)240 366 y Fn($)47 b(cvs)g(commit)f(-r)i -(3.0)125 654 y Fs(Note)33 b(that)g(the)f(n)m(um)m(b)s(er)f(y)m(ou)h(sp) -s(ecify)f(with)f(`)p Fn(-r)p Fs(')i(m)m(ust)g(b)s(e)g(larger)f(than)h -(an)m(y)h(existing)e(revision)f(n)m(um)m(b)s(er.)0 778 -y(That)38 b(is,)h(if)d(revision)h(3.0)h(exists,)i(y)m(ou)e(cannot)h(`)p -Fn(cvs)29 b(commit)g(-r)h(1.3)p Fs('.)62 b(If)37 b(y)m(ou)i(w)m(an)m(t) -f(to)h(main)m(tain)e(sev)m(eral)0 903 y(releases)31 b(in)e(parallel,)f -(y)m(ou)j(need)f(to)h(use)f(a)h(branc)m(h)f(\(see)h(Chapter)f(7)h -([Branc)m(hes],)g(page)h(45\).)0 1438 y Fk(A.7.2.2)62 -b(Committing)29 b(to)i(a)f(branc)m(h)125 1725 y Fs(Y)-8 -b(ou)24 b(can)h(commit)f(to)h(a)g(branc)m(h)e(revision)g(\(one)i(that)g -(has)f(an)g(ev)m(en)h(n)m(um)m(b)s(er)e(of)h(dots\))h(with)e(the)h(`)p -Fn(-r)p Fs(')g(option.)0 1850 y(T)-8 b(o)36 b(create)h(a)f(branc)m(h)e -(revision,)h(use)g(the)h(`)p Fn(-b)p Fs(')f(option)g(of)h(the)f -Fn(rtag)f Fs(or)i Fn(tag)e Fs(commands)h(\(see)h(Section)g(A.17)0 -1974 y([tag],)43 b(page)d(118)g(or)f(see)g(Section)g(A.15)h([rtag],)j -(page)c(116\).)68 b(Then,)40 b(either)f Fn(checkout)d -Fs(or)j Fn(update)e Fs(can)j(b)s(e)0 2099 y(used)34 b(to)i(base)f(y)m -(our)g(sources)g(on)g(the)h(newly)d(created)k(branc)m(h.)54 +5079 y(c)m(hanged\),)32 b(y)m(ou)e(migh)m(t)g(in)m(v)m(ok)m(e:)240 +5340 y Fn($)47 b(cvs)g(commit)f(-r)i(3.0)p eop +%%Page: 104 106 +104 105 bop 0 -116 a Fs(104)2366 b(CVS|Concurren)m(t)29 +b(V)-8 b(ersions)30 b(System)125 366 y(Note)j(that)g(the)f(n)m(um)m(b)s +(er)f(y)m(ou)h(sp)s(ecify)f(with)f(`)p Fn(-r)p Fs(')i(m)m(ust)g(b)s(e)g +(larger)f(than)h(an)m(y)h(existing)e(revision)f(n)m(um)m(b)s(er.)0 +491 y(That)38 b(is,)h(if)d(revision)h(3.0)h(exists,)i(y)m(ou)e(cannot)h +(`)p Fn(cvs)29 b(commit)g(-r)h(1.3)p Fs('.)62 b(If)37 +b(y)m(ou)i(w)m(an)m(t)f(to)h(main)m(tain)e(sev)m(eral)0 +616 y(releases)31 b(in)e(parallel,)f(y)m(ou)j(need)f(to)h(use)f(a)h +(branc)m(h)f(\(see)h(Chapter)f(7)h([Branc)m(hes],)g(page)h(47\).)0 +1057 y Fk(A.7.2.2)62 b(Committing)29 b(to)i(a)f(branc)m(h)125 +1334 y Fs(Y)-8 b(ou)24 b(can)h(commit)f(to)h(a)g(branc)m(h)e(revision)g +(\(one)i(that)g(has)f(an)g(ev)m(en)h(n)m(um)m(b)s(er)e(of)h(dots\))h +(with)e(the)h(`)p Fn(-r)p Fs(')g(option.)0 1459 y(T)-8 +b(o)36 b(create)h(a)f(branc)m(h)e(revision,)h(use)g(the)h(`)p +Fn(-b)p Fs(')f(option)g(of)h(the)f Fn(rtag)f Fs(or)i +Fn(tag)e Fs(commands)h(\(see)h(Section)g(A.17)0 1583 +y([tag],)43 b(page)d(120)g(or)f(see)g(Section)g(A.15)h([rtag],)j(page)c +(118\).)68 b(Then,)40 b(either)f Fn(checkout)d Fs(or)j +Fn(update)e Fs(can)j(b)s(e)0 1708 y(used)34 b(to)i(base)f(y)m(our)g +(sources)g(on)g(the)h(newly)d(created)k(branc)m(h.)54 b(F)-8 b(rom)35 b(that)h(p)s(oin)m(t)e(on,)j(all)d Fn(commit)f -Fs(c)m(hanges)0 2223 y(made)g(within)e(these)i(w)m(orking)f(sources)i +Fs(c)m(hanges)0 1832 y(made)g(within)e(these)i(w)m(orking)f(sources)i (will)c(b)s(e)i(automatically)h(added)g(to)g(a)h(branc)m(h)e(revision,) -g(thereb)m(y)i(not)0 2348 y(disturbing)26 b(main-line)h(dev)m(elopmen)m +g(thereb)m(y)i(not)0 1957 y(disturbing)26 b(main-line)h(dev)m(elopmen)m (t)j(in)e(an)m(y)h(w)m(a)m(y)-8 b(.)42 b(F)-8 b(or)30 b(example,)g(if)e(y)m(ou)i(had)f(to)h(create)h(a)e(patc)m(h)h(to)g(the) -g(1.2)0 2473 y(v)m(ersion)g(of)g(the)h(pro)s(duct,)e(ev)m(en)i(though)g +g(1.2)0 2081 y(v)m(ersion)g(of)g(the)h(pro)s(duct,)e(ev)m(en)i(though)g (the)f(2.0)i(v)m(ersion)d(is)h(already)g(under)f(dev)m(elopmen)m(t,)i -(y)m(ou)f(migh)m(t)g(do:)240 2739 y Fn($)47 b(cvs)g(rtag)g(-b)g(-r)g -(FCS1_2)f(FCS1_2_Patch)f(product_module)240 2843 y($)i(cvs)g(checkout)f -(-r)h(FCS1_2_Patch)e(product_module)240 2947 y($)i(cd)h(product_module) -240 3050 y([[)f(hack)g(away)f(]])240 3154 y($)h(cvs)g(commit)0 -3442 y Fs(This)29 b(w)m(orks)h(automatically)g(since)g(the)g(`)p -Fn(-r)p Fs(')h(option)f(is)f(stic)m(ky)-8 b(.)0 3977 +(y)m(ou)f(migh)m(t)g(do:)240 2338 y Fn($)47 b(cvs)g(rtag)g(-b)g(-r)g +(FCS1_2)f(FCS1_2_Patch)f(product_module)240 2441 y($)i(cvs)g(checkout)f +(-r)h(FCS1_2_Patch)e(product_module)240 2545 y($)i(cd)h(product_module) +240 2649 y([[)f(hack)g(away)f(]])240 2753 y($)h(cvs)g(commit)0 +3030 y Fs(This)29 b(w)m(orks)h(automatically)g(since)g(the)g(`)p +Fn(-r)p Fs(')h(option)f(is)f(stic)m(ky)-8 b(.)0 3471 y Fk(A.7.2.3)62 b(Creating)30 b(the)h(branc)m(h)e(after)h(editing)125 -4264 y Fs(Sa)m(y)22 b(y)m(ou)g(ha)m(v)m(e)h(b)s(een)e(w)m(orking)g(on)h +3748 y Fs(Sa)m(y)22 b(y)m(ou)g(ha)m(v)m(e)h(b)s(een)e(w)m(orking)g(on)h (some)g(extremely)g(exp)s(erimen)m(tal)f(soft)m(w)m(are,)k(based)c(on)h -(whatev)m(er)h(revision)0 4389 y(y)m(ou)34 b(happ)s(ened)f(to)i(c)m +(whatev)m(er)h(revision)0 3873 y(y)m(ou)34 b(happ)s(ened)f(to)i(c)m (hec)m(k)m(out)h(last)e(w)m(eek.)53 b(If)34 b(others)g(in)f(y)m(our)h (group)f(w)m(ould)g(lik)m(e)g(to)i(w)m(ork)f(on)g(this)f(soft)m(w)m -(are)0 4513 y(with)d(y)m(ou,)i(but)e(without)g(disturbing)e(main-line)h +(are)0 3997 y(with)d(y)m(ou,)i(but)e(without)g(disturbing)e(main-line)h (dev)m(elopmen)m(t,)i(y)m(ou)h(could)e(commit)h(y)m(our)g(c)m(hange)h -(to)g(a)f(new)0 4638 y(branc)m(h.)38 b(Others)25 b(can)g(then)g(c)m +(to)g(a)f(new)0 4122 y(branc)m(h.)38 b(Others)25 b(can)g(then)g(c)m (hec)m(k)m(out)i(y)m(our)e(exp)s(erimen)m(tal)f(stu\013)h(and)f (utilize)g(the)h(full)e(b)s(ene\014t)h(of)h Fr(cvs)f -Fs(con\015ict)0 4762 y(resolution.)39 b(The)30 b(scenario)g(migh)m(t)h -(lo)s(ok)e(lik)m(e:)240 5029 y Fn([[)47 b(hacked)f(sources)g(are)h -(present)f(]])240 5132 y($)h(cvs)g(tag)g(-b)g(EXPR1)240 -5236 y($)g(cvs)g(update)f(-r)i(EXPR1)240 5340 y($)f(cvs)g(commit)p +Fs(con\015ict)0 4246 y(resolution.)39 b(The)30 b(scenario)g(migh)m(t)h +(lo)s(ok)e(lik)m(e:)240 4503 y Fn([[)47 b(hacked)f(sources)g(are)h +(present)f(]])240 4606 y($)h(cvs)g(tag)g(-b)g(EXPR1)240 +4710 y($)g(cvs)g(update)f(-r)i(EXPR1)240 4814 y($)f(cvs)g(commit)125 +5091 y Fs(The)23 b Fn(update)f Fs(command)h(will)e(mak)m(e)k(the)e(`)p +Fn(-r)30 b(EXPR1)p Fs(')23 b(option)g(stic)m(ky)h(on)f(all)g(\014les.) +37 b(Note)25 b(that)f(y)m(our)g(c)m(hanges)0 5215 y(to)k(the)f(\014les) +g(will)d(nev)m(er)k(b)s(e)e(remo)m(v)m(ed)j(b)m(y)e(the)g +Fn(update)f Fs(command.)39 b(The)27 b Fn(commit)e Fs(will)g +(automatically)i(commit)0 5340 y(to)k(the)g(correct)g(branc)m(h,)f(b)s +(ecause)h(the)f(`)p Fn(-r)p Fs(')g(is)g(stic)m(ky)-8 +b(.)41 b(Y)-8 b(ou)31 b(could)f(also)g(do)g(lik)m(e)g(this:)p eop -%%Page: 103 105 -103 104 bop 0 -116 a Fs(App)s(endix)28 b(A:)i(Guide)g(to)h(CVS)e -(commands)2210 b(103)125 366 y(The)23 b Fn(update)f Fs(command)h(will)e -(mak)m(e)k(the)e(`)p Fn(-r)30 b(EXPR1)p Fs(')23 b(option)g(stic)m(ky)h -(on)f(all)g(\014les.)37 b(Note)25 b(that)f(y)m(our)g(c)m(hanges)0 -491 y(to)k(the)f(\014les)g(will)d(nev)m(er)k(b)s(e)e(remo)m(v)m(ed)j(b) -m(y)e(the)g Fn(update)f Fs(command.)39 b(The)27 b Fn(commit)e -Fs(will)g(automatically)i(commit)0 616 y(to)k(the)g(correct)g(branc)m -(h,)f(b)s(ecause)h(the)f(`)p Fn(-r)p Fs(')g(is)g(stic)m(ky)-8 -b(.)41 b(Y)-8 b(ou)31 b(could)f(also)g(do)g(lik)m(e)g(this:)240 -870 y Fn([[)47 b(hacked)f(sources)g(are)h(present)f(]])240 -974 y($)h(cvs)g(tag)g(-b)g(EXPR1)240 1077 y($)g(cvs)g(commit)f(-r)i -(EXPR1)0 1353 y Fs(but)26 b(then,)h(only)e(those)i(\014les)e(that)i(w)m -(ere)g(c)m(hanged)g(b)m(y)f(y)m(ou)h(will)c(ha)m(v)m(e)28 -b(the)e(`)p Fn(-r)k(EXPR1)p Fs(')25 b(stic)m(ky)i(\015ag.)40 -b(If)26 b(y)m(ou)g(hac)m(k)0 1477 y(a)m(w)m(a)m(y)-8 -b(,)40 b(and)c(commit)g(without)f(sp)s(ecifying)f(the)j(`)p -Fn(-r)30 b(EXPR1)p Fs(')35 b(\015ag,)j(some)f(\014les)e(ma)m(y)i -(acciden)m(tally)e(end)h(up)f(on)0 1602 y(the)c(main)e(trunk.)125 -1877 y(T)-8 b(o)30 b(w)m(ork)h(with)e(y)m(ou)i(on)f(the)g(exp)s(erimen) +%%Page: 105 107 +105 106 bop 0 -116 a Fs(App)s(endix)28 b(A:)i(Guide)g(to)h(CVS)e +(commands)2210 b(105)240 366 y Fn([[)47 b(hacked)f(sources)g(are)h +(present)f(]])240 470 y($)h(cvs)g(tag)g(-b)g(EXPR1)240 +574 y($)g(cvs)g(commit)f(-r)i(EXPR1)0 852 y Fs(but)26 +b(then,)h(only)e(those)i(\014les)e(that)i(w)m(ere)g(c)m(hanged)g(b)m(y) +f(y)m(ou)h(will)c(ha)m(v)m(e)28 b(the)e(`)p Fn(-r)k(EXPR1)p +Fs(')25 b(stic)m(ky)i(\015ag.)40 b(If)26 b(y)m(ou)g(hac)m(k)0 +976 y(a)m(w)m(a)m(y)-8 b(,)40 b(and)c(commit)g(without)f(sp)s(ecifying) +f(the)j(`)p Fn(-r)30 b(EXPR1)p Fs(')35 b(\015ag,)j(some)f(\014les)e(ma) +m(y)i(acciden)m(tally)e(end)h(up)f(on)0 1101 y(the)c(main)e(trunk.)125 +1378 y(T)-8 b(o)30 b(w)m(ork)h(with)e(y)m(ou)i(on)f(the)g(exp)s(erimen) m(tal)g(c)m(hange,)h(others)g(w)m(ould)e(simply)f(do)240 -2131 y Fn($)47 b(cvs)g(checkout)f(-r)h(EXPR1)f(whatever_module)0 -2589 y Fm(A.8)67 b(di\013|Run)32 b(di\013s)e(b)t(et)l(w)l(een)i -(revisions)75 2865 y Fq(\017)60 b Fs(Synopsis:)39 b(di\013)29 -b([-l])h([rcsdi\013)p 1155 2865 28 4 v 32 w(options])g([[-r)g(rev1)h +1635 y Fn($)47 b(cvs)g(checkout)f(-r)h(EXPR1)f(whatever_module)0 +2116 y Fm(A.8)67 b(di\013|Run)32 b(di\013s)e(b)t(et)l(w)l(een)i +(revisions)75 2394 y Fq(\017)60 b Fs(Synopsis:)39 b(di\013)29 +b([-l])h([rcsdi\013)p 1155 2394 28 4 v 32 w(options])g([[-r)g(rev1)h Fn(|)f Fs(-D)h(date1])h([-r)e(rev2)h Fn(|)f Fs(-D)h(date2]])h([\014les) -p Fh(:)15 b(:)g(:)p Fs(])75 3015 y Fq(\017)60 b Fs(Requires:)40 +p Fh(:)15 b(:)g(:)p Fs(])75 2547 y Fq(\017)60 b Fs(Requires:)40 b(w)m(orking)29 b(directory)-8 b(,)31 b(rep)s(ository)-8 -b(.)75 3166 y Fq(\017)60 b Fs(Changes:)40 b(nothing.)125 -3467 y(The)h Fn(diff)f Fs(command)h(is)g(used)f(to)j(compare)f +b(.)75 2700 y Fq(\017)60 b Fs(Changes:)40 b(nothing.)125 +3006 y(The)h Fn(diff)f Fs(command)h(is)g(used)f(to)j(compare)f (di\013eren)m(t)f(revisions)e(of)j(\014les.)73 b(The)41 -b(default)g(action)h(is)e(to)0 3591 y(compare)32 b(y)m(our)f(w)m +b(default)g(action)h(is)e(to)0 3131 y(compare)32 b(y)m(our)f(w)m (orking)g(\014les)f(with)g(the)h(revisions)f(they)h(w)m(ere)h(based)f (on,)h(and)e(rep)s(ort)h(an)m(y)h(di\013erences)e(that)0 -3716 y(are)h(found.)125 3991 y(If)h(an)m(y)i(\014le)e(names)i(are)f +3255 y(are)h(found.)125 3533 y(If)h(an)m(y)i(\014le)e(names)i(are)f (giv)m(en,)h(only)f(those)h(\014les)e(are)i(compared.)49 b(If)33 b(an)m(y)h(directories)e(are)i(giv)m(en,)g(all)e(\014les)0 -4116 y(under)d(them)h(will)e(b)s(e)i(compared.)125 4391 +3657 y(under)d(them)h(will)e(b)s(e)i(compared.)125 3935 y(The)f(exit)i(status)g(will)c(b)s(e)j(0)h(if)f(no)g(di\013erences)g(w) m(ere)h(found,)e(1)i(if)e(some)i(di\013erences)f(w)m(ere)h(found,)e -(and)h(2)h(if)0 4515 y(an)m(y)g(error)f(o)s(ccurred.)0 -4940 y Fk(A.8.1)62 b(di\013)30 b(options)125 5215 y Fs(These)d +(and)h(2)h(if)0 4059 y(an)m(y)g(error)f(o)s(ccurred.)0 +4507 y Fk(A.8.1)62 b(di\013)30 b(options)125 4785 y Fs(These)d (standard)g(options)h(are)g(supp)s(orted)e(b)m(y)i Fn(diff)f -Fs(\(see)i(Section)e(A.4)i([Common)f(options],)g(page)h(90,)g(for)0 -5340 y(a)i(complete)g(description)d(of)j(them\):)p eop -%%Page: 104 106 -104 105 bop 0 -116 a Fs(104)2366 b(CVS|Concurren)m(t)29 -b(V)-8 b(ersions)30 b(System)0 366 y Fn(-D)g Fo(date)183 -b Fs(Use)44 b(the)f(most)h(recen)m(t)g(revision)e(no)h(later)g(than)g -Fo(date)p Fs(.)81 b(See)43 b(`)p Fn(-r)p Fs(')g(for)g(ho)m(w)h(this)e -(a\013ects)j(the)480 491 y(comparison.)480 636 y Fr(cvs)e -Fs(can)h(b)s(e)g(con\014gured)f(to)i(pass)e(the)i(`)p -Fn(-D)p Fs(')f(option)f(through)g(to)i Fn(rcsdiff)d Fs(\(whic)m(h)h(in) -g(turn)480 761 y(passes)26 b(it)g(on)g(to)h Fn(diff)p -Fs(.)38 b Fr(Gnu)26 b Fs(di\013)f(uses)g(`)p Fn(-D)p -Fs(')h(as)h(a)f(w)m(a)m(y)h(to)g(put)f Fn(cpp)p Fs(-st)m(yle)g(`)p -Fn(#define)p Fs(')e(statemen)m(ts)480 885 y(around)30 -b(the)h(output)g(di\013erences.)43 b(There)30 b(is)g(no)h(w)m(a)m(y)i -(short)d(of)i(testing)f(to)h(\014gure)e(out)i(ho)m(w)f -Fr(cvs)480 1010 y Fs(w)m(as)g(con\014gured.)40 b(In)29 -b(the)i(default)f(con\014guration)f Fr(cvs)h Fs(will)d(use)j(the)h(`)p -Fn(-D)f Fo(date)5 b Fs(')31 b(option.)0 1176 y Fn(-k)f -Fo(k\015ag)165 b Fs(Pro)s(cess)30 b Fr(r)n(cs)g Fs(k)m(eyw)m(ords)g -(according)h(to)g Fo(k\015ag)p Fs(.)41 b(See)30 b(co\(1\).)0 -1342 y Fn(-l)384 b Fs(Lo)s(cal;)30 b(run)f(only)h(in)f(curren)m(t)h(w)m -(orking)g(directory)-8 b(.)0 1508 y Fn(-R)384 b Fs(Examine)30 -b(directories)f(recursiv)m(ely)-8 b(.)40 b(This)28 b(option)i(is)g(on)g -(b)m(y)g(default.)0 1674 y Fn(-r)g Fo(tag)229 b Fs(Compare)28 +Fs(\(see)i(Section)e(A.4)i([Common)f(options],)g(page)h(92,)g(for)0 +4909 y(a)i(complete)g(description)d(of)j(them\):)0 5215 +y Fn(-D)f Fo(date)183 b Fs(Use)44 b(the)f(most)h(recen)m(t)g(revision)e +(no)h(later)g(than)g Fo(date)p Fs(.)81 b(See)43 b(`)p +Fn(-r)p Fs(')g(for)g(ho)m(w)h(this)e(a\013ects)j(the)480 +5340 y(comparison.)p eop +%%Page: 106 108 +106 107 bop 0 -116 a Fs(106)2366 b(CVS|Concurren)m(t)29 +b(V)-8 b(ersions)30 b(System)0 366 y Fn(-k)g Fo(k\015ag)165 +b Fs(Pro)s(cess)30 b Fr(r)n(cs)g Fs(k)m(eyw)m(ords)g(according)h(to)g +Fo(k\015ag)p Fs(.)41 b(See)30 b(co\(1\).)0 537 y Fn(-l)384 +b Fs(Lo)s(cal;)30 b(run)f(only)h(in)f(curren)m(t)h(w)m(orking)g +(directory)-8 b(.)0 707 y Fn(-R)384 b Fs(Examine)30 b(directories)f +(recursiv)m(ely)-8 b(.)40 b(This)28 b(option)i(is)g(on)g(b)m(y)g +(default.)0 877 y Fn(-r)g Fo(tag)229 b Fs(Compare)28 b(with)f(revision)f Fo(tag)p Fs(.)41 b(Zero,)29 b(one)f(or)g(t)m(w)m(o) i(`)p Fn(-r)p Fs(')d(options)h(can)g(b)s(e)g(presen)m(t.)40 -b(With)27 b(no)h(`)p Fn(-r)p Fs(')480 1799 y(option,)i(the)h(w)m +b(With)27 b(no)h(`)p Fn(-r)p Fs(')480 1002 y(option,)i(the)h(w)m (orking)f(\014le)g(will)e(b)s(e)i(compared)g(with)f(the)i(revision)e -(it)h(w)m(as)h(based)f(on.)42 b(With)30 b(one)480 1923 +(it)h(w)m(as)h(based)f(on.)42 b(With)30 b(one)480 1126 y(`)p Fn(-r)p Fs(',)d(that)g(revision)d(will)g(b)s(e)h(compared)h(to)h (y)m(our)f(curren)m(t)g(w)m(orking)f(\014le.)39 b(With)25 -b(t)m(w)m(o)j(`)p Fn(-r)p Fs(')e(options)480 2048 y(those)h(t)m(w)m(o)h +b(t)m(w)m(o)j(`)p Fn(-r)p Fs(')e(options)480 1251 y(those)h(t)m(w)m(o)h (revisions)d(will)g(b)s(e)h(compared)h(\(and)f(y)m(our)h(w)m(orking)f -(\014le)g(will)e(not)j(a\013ect)i(the)e(outcome)480 2173 -y(in)i(an)m(y)i(w)m(a)m(y\).)480 2318 y(One)f(or)g(b)s(oth)g(`)p +(\014le)g(will)e(not)j(a\013ect)i(the)e(outcome)480 1375 +y(in)i(an)m(y)i(w)m(a)m(y\).)480 1523 y(One)f(or)g(b)s(oth)g(`)p Fn(-r)p Fs(')g(options)g(can)h(b)s(e)e(replaced)h(b)m(y)g(a)h(`)p Fn(-D)f Fo(date)5 b Fs(')32 b(option,)e(describ)s(ed)e(ab)s(o)m(v)m(e.) -125 2613 y(An)m(y)h(other)g(options)f(that)i(are)g(found)d(are)j -(passed)f(through)f(to)i Fn(rcsdiff)p Fs(,)e(whic)m(h)f(in)h(turn)g -(passes)h(them)g(to)0 2737 y Fn(diff)p Fs(.)46 b(The)33 -b(exact)h(meaning)e(of)h(the)g(options)f(dep)s(ends)e(on)j(whic)m(h)e -Fn(diff)h Fs(y)m(ou)h(are)g(using.)46 b(The)32 b(long)h(options)0 -2862 y(in)m(tro)s(duced)d(in)h Fr(gnu)h Fs(di\013)e(2.0)k(are)e(not)g -(y)m(et)h(supp)s(orted)d(in)h Fr(cvs)p Fs(.)45 b(See)32 -b(the)g(do)s(cumen)m(tation)g(for)f(y)m(our)h Fn(diff)f -Fs(to)0 2986 y(see)g(whic)m(h)e(options)h(are)h(supp)s(orted.)0 -3385 y Fk(A.8.2)62 b(di\013)30 b(examples)125 3659 y -Fs(The)f(follo)m(wing)g(line)f(pro)s(duces)h(a)i(Unidi\013)c(\(`)p -Fn(-u)p Fs(')k(\015ag\))f(b)s(et)m(w)m(een)h(revision)e(1.14)i(and)f -(1.19)h(of)g(`)p Fn(backend.c)p Fs('.)0 3783 y(Due)41 -b(to)g(the)f(`)p Fn(-kk)p Fs(')g(\015ag)h(no)f(k)m(eyw)m(ords)g(are)h -(substituted,)g(so)g(di\013erences)e(that)i(only)f(dep)s(end)e(on)i(k)m -(eyw)m(ord)0 3908 y(substitution)28 b(are)j(ignored.)240 -4161 y Fn($)47 b(cvs)g(diff)g(-kk)g(-u)g(-r)g(1.14)g(-r)g(1.19)g -(backend.c)125 4435 y Fs(Supp)s(ose)27 b(the)i(exp)s(erimen)m(tal)e -(branc)m(h)i(EXPR1)g(w)m(as)g(based)f(on)h(a)g(set)h(of)f(\014les)f -(tagged)i(RELEASE)p 3581 4435 28 4 v 32 w(1)p 3658 4435 -V 33 w(0.)40 b(T)-8 b(o)0 4560 y(see)31 b(what)f(has)g(happ)s(ened)f -(on)h(that)h(branc)m(h,)f(the)h(follo)m(wing)e(can)h(b)s(e)g(used:)240 -4813 y Fn($)47 b(cvs)g(diff)g(-r)g(RELEASE_1_0)e(-r)i(EXPR1)125 -5087 y Fs(A)30 b(command)g(lik)m(e)g(this)f(can)i(b)s(e)f(used)f(to)i -(pro)s(duce)e(a)i(con)m(text)h(di\013)d(b)s(et)m(w)m(een)i(t)m(w)m(o)h -(releases:)240 5340 y Fn($)47 b(cvs)g(diff)g(-c)g(-r)g(RELEASE_1_0)e -(-r)i(RELEASE_1_1)e(>)i(diffs)p eop -%%Page: 105 107 -105 106 bop 0 -116 a Fs(App)s(endix)28 b(A:)i(Guide)g(to)h(CVS)e -(commands)2210 b(105)125 366 y(If)29 b(y)m(ou)h(are)h(main)m(taining)d -(ChangeLogs,)j(a)f(command)g(lik)m(e)f(the)h(follo)m(wing)f(just)g(b)s -(efore)h(y)m(ou)g(commit)g(y)m(our)0 491 y(c)m(hanges)k(ma)m(y)f(help)f -(y)m(ou)h(write)f(the)h(ChangeLog)g(en)m(try)-8 b(.)49 -b(All)31 b(lo)s(cal)h(mo)s(di\014cations)f(that)j(ha)m(v)m(e)g(not)f(y) -m(et)h(b)s(een)0 616 y(committed)d(will)c(b)s(e)j(prin)m(ted.)240 -869 y Fn($)47 b(cvs)g(diff)g(-u)g(|)h(less)0 1306 y Fm(A.9)67 +0 1693 y Fn(--ifdef=)p Fo(arg)480 1818 y Fs(Output)36 +b(in)f(ifdef)h(format.)61 b(Consult)35 b(the)i(do)s(cumen)m(tation)g +(of)g(y)m(our)g(underlying)d(di\013)h(program)480 1942 +y(concerning)30 b(the)g(`)p Fn(-D)p Fs(')h(option)e(to)j(di\013,)d(for) +h(more)h(information)d(on)j(this)e(format.)125 2239 y(The)h(follo)m +(wing)e(options)i(are)h(passed)f(through)g(to)h Fn(rcsdiff)p +Fs(,)e(whic)m(h)g(in)g(turn)h(passes)g(them)g(to)i Fn(diff)p +Fs(.)39 b(The)0 2364 y(exact)g(meaning)d(of)h(the)g(options)g(dep)s +(ends)e(on)i(whic)m(h)f Fn(diff)g Fs(y)m(ou)h(are)g(using.)60 +b(See)37 b(the)g(do)s(cumen)m(tation)g(for)0 2488 y(y)m(our)30 +b Fn(diff)g Fs(for)g(details.)125 2762 y Fn(-a)21 b(-b)h(-B)g(-c)f(-C) +30 b Fo(nlines)24 b Fn(-d)e(-e)f(-f)h(-h)g(-H)g(-i)f(-n)h(-N)g(-p)f(-s) +h(-t)g(-u)g(-U)f Fo(nlines)j Fn(-F)30 b Fo(regexp)25 +b Fn(-I)30 b Fo(regexp)25 b Fn(-L)30 b Fo(lab)s(el)0 +2887 y Fn(-T)d(-V)j Fo(arg)35 b Fn(-W)30 b Fo(columns)g +Fn(-w)d(-y)g(-0)g(-1)g(-2)f(-3)h(-4)g(-5)g(-6)g(-7)g(-8)g(-9)g +(--binary)e(--brief)g(--changed-group-)0 3011 y(format=)p +Fo(arg)56 b Fn(--context[=)p Fo(lines)t Fn(])45 b(--ed)k(--expand-tabs) +e(--forward-ed)g(--horizon-lines=)p Fo(arg)54 b Fn(--)0 +3136 y(ignore-all-space)47 b(--ignore-blank-lines)e(--ignore-case)i +(--ignore-matching-lines=)p Fo(r)o(egexp)0 3260 y Fn +(--ignore-space-change)29 b(--initial-tab)j(--label=)p +Fo(lab)s(el)j Fn(--left-column)c(--minimal)i(--new-file)0 +3385 y(--new-line-format=)p Fo(arg)76 b Fn(--old-line-format=)p +Fo(arg)g Fn(--paginate)70 b(--rcs)h(--report-identical-)0 +3509 y(files)61 b(--code-c-function)c(--side-by-side)h +(--show-function-line=)p Fo(regexp)i Fn(--speed-large-)0 +3634 y(files)48 b(--suppress-common-lines)42 b(--text)48 +b(--unchanged-group-forma)o(t=)p Fo(arg)j Fn(--unified[=)p +Fo(lines)t Fn(])0 3758 y(--width=)p Fo(columns)0 4165 +y Fk(A.8.2)62 b(di\013)30 b(examples)125 4439 y Fs(The)f(follo)m(wing)g +(line)f(pro)s(duces)h(a)i(Unidi\013)c(\(`)p Fn(-u)p Fs(')k(\015ag\))f +(b)s(et)m(w)m(een)h(revision)e(1.14)i(and)f(1.19)h(of)g(`)p +Fn(backend.c)p Fs('.)0 4564 y(Due)41 b(to)g(the)f(`)p +Fn(-kk)p Fs(')g(\015ag)h(no)f(k)m(eyw)m(ords)g(are)h(substituted,)g(so) +g(di\013erences)e(that)i(only)f(dep)s(end)e(on)i(k)m(eyw)m(ord)0 +4688 y(substitution)28 b(are)j(ignored.)240 4941 y Fn($)47 +b(cvs)g(diff)g(-kk)g(-u)g(-r)g(1.14)g(-r)g(1.19)g(backend.c)125 +5215 y Fs(Supp)s(ose)27 b(the)i(exp)s(erimen)m(tal)e(branc)m(h)i(EXPR1) +g(w)m(as)g(based)f(on)h(a)g(set)h(of)f(\014les)f(tagged)i(RELEASE)p +3581 5215 28 4 v 32 w(1)p 3658 5215 V 33 w(0.)40 b(T)-8 +b(o)0 5340 y(see)31 b(what)f(has)g(happ)s(ened)f(on)h(that)h(branc)m +(h,)f(the)h(follo)m(wing)e(can)h(b)s(e)g(used:)p eop +%%Page: 107 109 +107 108 bop 0 -116 a Fs(App)s(endix)28 b(A:)i(Guide)g(to)h(CVS)e +(commands)2210 b(107)240 366 y Fn($)47 b(cvs)g(diff)g(-r)g(RELEASE_1_0) +e(-r)i(EXPR1)125 640 y Fs(A)30 b(command)g(lik)m(e)g(this)f(can)i(b)s +(e)f(used)f(to)i(pro)s(duce)e(a)i(con)m(text)h(di\013)d(b)s(et)m(w)m +(een)i(t)m(w)m(o)h(releases:)240 894 y Fn($)47 b(cvs)g(diff)g(-c)g(-r)g +(RELEASE_1_0)e(-r)i(RELEASE_1_1)e(>)i(diffs)125 1168 +y Fs(If)29 b(y)m(ou)h(are)h(main)m(taining)d(ChangeLogs,)j(a)f(command) +g(lik)m(e)f(the)h(follo)m(wing)f(just)g(b)s(efore)h(y)m(ou)g(commit)g +(y)m(our)0 1292 y(c)m(hanges)k(ma)m(y)f(help)f(y)m(ou)h(write)f(the)h +(ChangeLog)g(en)m(try)-8 b(.)49 b(All)31 b(lo)s(cal)h(mo)s +(di\014cations)f(that)j(ha)m(v)m(e)g(not)f(y)m(et)h(b)s(een)0 +1417 y(committed)d(will)c(b)s(e)j(prin)m(ted.)240 1670 +y Fn($)47 b(cvs)g(diff)g(-u)g(|)h(less)0 2107 y Fm(A.9)67 b(exp)t(ort|Exp)t(ort)32 b(sources)e(from)h(CVS,)f(similar)i(to)f(c)l -(hec)l(k)l(out)75 1580 y Fq(\017)60 b Fs(Synopsis:)39 +(hec)l(k)l(out)75 2381 y Fq(\017)60 b Fs(Synopsis:)39 b(exp)s(ort)30 b([-\015Nn])g([-r)g(rev)p Fn(|)p Fs(-D)h(date])h([-k)e (subst])g([-d)g(dir])f(mo)s(dule)p Fh(:)15 b(:)g(:)75 -1727 y Fq(\017)60 b Fs(Requires:)40 b(rep)s(ository)-8 -b(.)75 1874 y Fq(\017)60 b Fs(Changes:)40 b(curren)m(t)31 -b(directory)-8 b(.)125 2170 y(This)28 b(command)i(is)g(a)h(v)-5 +2528 y Fq(\017)60 b Fs(Requires:)40 b(rep)s(ository)-8 +b(.)75 2675 y Fq(\017)60 b Fs(Changes:)40 b(curren)m(t)31 +b(directory)-8 b(.)125 2971 y(This)28 b(command)i(is)g(a)h(v)-5 b(arian)m(t)30 b(of)h Fn(checkout)p Fs(;)d(use)j(it)f(when)f(y)m(ou)i (w)m(an)m(t)g(a)g(cop)m(y)g(of)g(the)g(source)f(for)h(mo)s(dule)0 -2295 y(without)f(the)h Fr(cvs)f Fs(administrativ)m(e)f(directories.)42 +3095 y(without)f(the)h Fr(cvs)f Fs(administrativ)m(e)f(directories.)42 b(F)-8 b(or)31 b(example,)g(y)m(ou)g(migh)m(t)g(use)g -Fn(export)e Fs(to)i(prepare)g(source)0 2419 y(for)g(shipmen)m(t)e +Fn(export)e Fs(to)i(prepare)g(source)0 3220 y(for)g(shipmen)m(t)e (o\013-site.)43 b(This)29 b(command)i(requires)e(that)j(y)m(ou)f(sp)s (ecify)f(a)h(date)g(or)g(tag)h(\(with)e(`)p Fn(-D)p Fs(')h(or)g(`)p -Fn(-r)p Fs('\),)h(so)0 2544 y(that)f(y)m(ou)g(can)f(coun)m(t)h(on)g +Fn(-r)p Fs('\),)h(so)0 3344 y(that)f(y)m(ou)g(can)f(coun)m(t)h(on)g (repro)s(ducing)d(the)i(source)h(y)m(ou)f(ship)f(to)i(others.)125 -2818 y(One)20 b(often)h(w)m(ould)f(lik)m(e)g(to)i(use)e(`)p +3618 y(One)20 b(often)h(w)m(ould)f(lik)m(e)g(to)i(use)e(`)p Fn(-kv)p Fs(')h(with)f Fn(cvs)29 b(export)p Fs(.)36 b(This)19 b(causes)i(an)m(y)h Fr(r)n(cs)e Fs(k)m(eyw)m(ords)h(to)g(b)s(e)g -(expanded)0 2942 y(suc)m(h)34 b(that)h(an)f(imp)s(ort)e(done)i(at)h +(expanded)0 3743 y(suc)m(h)34 b(that)h(an)f(imp)s(ort)e(done)i(at)h (some)g(other)f(site)g(will)e(not)j(lose)f(the)g(k)m(eyw)m(ord)h -(revision)d(information.)51 b(But)0 3067 y(b)s(e)31 b(a)m(w)m(are)h +(revision)d(information.)51 b(But)0 3868 y(b)s(e)31 b(a)m(w)m(are)h (that)g(do)s(esn't)f(handle)f(an)h(exp)s(ort)g(con)m(taining)g(binary)f (\014les)g(correctly)-8 b(.)44 b(Also)31 b(b)s(e)g(a)m(w)m(are)i(that)e -(after)0 3191 y(ha)m(ving)f(used)g(`)p Fn(-kv)p Fs(',)g(one)h(can)g(no) +(after)0 3992 y(ha)m(ving)f(used)g(`)p Fn(-kv)p Fs(',)g(one)h(can)g(no) g(longer)f(use)g(the)h Fn(ident)e Fs(command)h(\(whic)m(h)g(is)g(part)g -(of)h(the)f Fr(r)n(cs)g Fs(suite|see)0 3316 y(iden)m(t\(1\)\))j(whic)m +(of)h(the)f Fr(r)n(cs)g Fs(suite|see)0 4117 y(iden)m(t\(1\)\))j(whic)m (h)f(lo)s(oks)g(for)g Fr(r)n(cs)f Fs(k)m(eyw)m(ord)i(strings.)46 b(If)32 b(y)m(ou)h(w)m(an)m(t)h(to)f(b)s(e)f(able)g(to)h(use)f -Fn(ident)f Fs(y)m(ou)i(m)m(ust)g(not)0 3440 y(use)d(`)p -Fn(-kv)p Fs('.)0 3845 y Fk(A.9.1)62 b(exp)s(ort)31 b(options)125 -4119 y Fs(These)f(standard)h(options)f(are)i(supp)s(orted)d(b)m(y)i +Fn(ident)f Fs(y)m(ou)i(m)m(ust)g(not)0 4241 y(use)d(`)p +Fn(-kv)p Fs('.)0 4645 y Fk(A.9.1)62 b(exp)s(ort)31 b(options)125 +4919 y Fs(These)f(standard)h(options)f(are)i(supp)s(orted)d(b)m(y)i Fn(export)f Fs(\(see)i(Section)f(A.4)h([Common)f(options],)g(page)h -(90,)0 4243 y(for)e(a)h(complete)g(description)d(of)j(them\):)0 -4539 y Fn(-D)f Fo(date)183 b Fs(Use)31 b(the)f(most)h(recen)m(t)g -(revision)e(no)h(later)h(than)f Fo(date)p Fs(.)0 4708 -y Fn(-f)384 b Fs(If)30 b(no)h(matc)m(hing)g(revision)e(is)h(found,)g -(retriev)m(e)i(the)f(most)g(recen)m(t)h(revision)d(\(instead)h(of)i -(ignoring)480 4833 y(the)f(\014le\).)0 5002 y Fn(-l)384 -b Fs(Lo)s(cal;)30 b(run)f(only)h(in)f(curren)m(t)h(w)m(orking)g -(directory)-8 b(.)0 5171 y Fn(-n)384 b Fs(Do)31 b(not)g(run)e(an)m(y)h -(c)m(hec)m(k)m(out)j(program.)0 5340 y Fn(-R)384 b Fs(Exp)s(ort)30 +(92,)0 5044 y(for)e(a)h(complete)g(description)d(of)j(them\):)0 +5340 y Fn(-D)f Fo(date)183 b Fs(Use)31 b(the)f(most)h(recen)m(t)g +(revision)e(no)h(later)h(than)f Fo(date)p Fs(.)p eop +%%Page: 108 110 +108 109 bop 0 -116 a Fs(108)2366 b(CVS|Concurren)m(t)29 +b(V)-8 b(ersions)30 b(System)0 366 y Fn(-f)384 b Fs(If)30 +b(no)h(matc)m(hing)g(revision)e(is)h(found,)g(retriev)m(e)i(the)f(most) +g(recen)m(t)h(revision)d(\(instead)h(of)i(ignoring)480 +491 y(the)f(\014le\).)0 667 y Fn(-l)384 b Fs(Lo)s(cal;)30 +b(run)f(only)h(in)f(curren)m(t)h(w)m(orking)g(directory)-8 +b(.)0 842 y Fn(-n)384 b Fs(Do)31 b(not)g(run)e(an)m(y)h(c)m(hec)m(k)m +(out)j(program.)0 1018 y Fn(-R)384 b Fs(Exp)s(ort)30 b(directories)f(recursiv)m(ely)-8 b(.)40 b(This)28 b(is)i(on)g(b)m(y)g -(default.)p eop -%%Page: 106 108 -106 107 bop 0 -116 a Fs(106)2366 b(CVS|Concurren)m(t)29 -b(V)-8 b(ersions)30 b(System)0 366 y Fn(-r)g Fo(tag)229 -b Fs(Use)31 b(revision)d Fo(tag)p Fs(.)125 663 y(In)h(addition,)g -(these)i(options)f(\(that)h(are)g(common)f(to)h Fn(checkout)d -Fs(and)i Fn(export)p Fs(\))f(are)i(also)f(supp)s(orted:)0 -960 y Fn(-d)g Fo(dir)241 b Fs(Create)34 b(a)g(directory)f(called)f -Fo(dir)38 b Fs(for)33 b(the)h(w)m(orking)e(\014les,)i(instead)e(of)i -(using)d(the)j(mo)s(dule)e(name.)480 1084 y(Unless)d(y)m(ou)i(also)f -(use)g(`)p Fn(-N)p Fs(',)h(the)g(paths)f(created)h(under)e -Fo(dir)35 b Fs(will)28 b(b)s(e)h(as)i(short)f(as)h(p)s(ossible.)0 -1254 y Fn(-k)f Fo(subst)145 b Fs(Set)31 b(k)m(eyw)m(ord)f(expansion)g +(default.)0 1193 y Fn(-r)g Fo(tag)229 b Fs(Use)31 b(revision)d +Fo(tag)p Fs(.)125 1493 y(In)h(addition,)g(these)i(options)f(\(that)h +(are)g(common)f(to)h Fn(checkout)d Fs(and)i Fn(export)p +Fs(\))f(are)i(also)f(supp)s(orted:)0 1793 y Fn(-d)g Fo(dir)241 +b Fs(Create)34 b(a)g(directory)f(called)f Fo(dir)38 b +Fs(for)33 b(the)h(w)m(orking)e(\014les,)i(instead)e(of)i(using)d(the)j +(mo)s(dule)e(name.)480 1918 y(Unless)d(y)m(ou)i(also)f(use)g(`)p +Fn(-N)p Fs(',)h(the)g(paths)f(created)h(under)e Fo(dir)35 +b Fs(will)28 b(b)s(e)h(as)i(short)f(as)h(p)s(ossible.)0 +2094 y Fn(-k)f Fo(subst)145 b Fs(Set)31 b(k)m(eyw)m(ord)f(expansion)g (mo)s(de)g(\(see)h(Section)f(17.4)i([Substitution)c(mo)s(des],)i(page)h -(77\).)0 1424 y Fn(-N)384 b Fs(Only)21 b(useful)h(together)i(with)e(`)p +(79\).)0 2269 y Fn(-N)384 b Fs(Only)21 b(useful)h(together)i(with)e(`)p Fn(-d)30 b Fo(dir)7 b Fs('.)37 b(With)22 b(this)g(option,)i Fr(cvs)e Fs(will)f(not)i(shorten)g(mo)s(dule)e(paths)480 -1549 y(in)36 b(y)m(our)g(w)m(orking)g(directory)-8 b(.)61 +2394 y(in)36 b(y)m(our)g(w)m(orking)g(directory)-8 b(.)61 b(\(Normally)-8 b(,)38 b Fr(cvs)e Fs(shortens)g(paths)g(as)i(m)m(uc)m -(h)e(as)i(p)s(ossible)c(when)480 1673 y(y)m(ou)d(sp)s(ecify)e(an)h -(explicit)f(target)j(directory)-8 b(.\))0 2112 y Fm(A.10)68 +(h)e(as)i(p)s(ossible)c(when)480 2518 y(y)m(ou)d(sp)s(ecify)e(an)h +(explicit)f(target)j(directory)-8 b(.\))0 2972 y Fm(A.10)68 b(history|Sho)l(w)31 b(status)g(of)g(\014les)g(and)f(users)75 -2386 y Fq(\017)60 b Fs(Synopsis:)39 b(history)29 b([-rep)s(ort])h +3246 y Fq(\017)60 b Fs(Synopsis:)39 b(history)29 b([-rep)s(ort])h ([-\015ags])i([-options)e(args])h([\014les)p Fh(:)15 -b(:)g(:)p Fs(])75 2534 y Fq(\017)60 b Fs(Requires:)40 +b(:)g(:)p Fs(])75 3397 y Fq(\017)60 b Fs(Requires:)40 b(the)30 b(\014le)g(`)p Fn($CVSROOT/CVSROOT/history)o -Fs(')75 2681 y Fq(\017)60 b Fs(Changes:)40 b(nothing.)125 -2977 y Fr(cvs)34 b Fs(can)i(k)m(eep)h(a)f(history)e(\014le)h(that)h +Fs(')75 3547 y Fq(\017)60 b Fs(Changes:)40 b(nothing.)125 +3847 y Fr(cvs)34 b Fs(can)i(k)m(eep)h(a)f(history)e(\014le)h(that)h (trac)m(ks)h(eac)m(h)g(use)e(of)h(the)g Fn(checkout)p Fs(,)f Fn(commit)p Fs(,)h Fn(rtag)p Fs(,)g Fn(update)p -Fs(,)g(and)0 3102 y Fn(release)28 b Fs(commands.)41 b(Y)-8 +Fs(,)g(and)0 3971 y Fn(release)28 b Fs(commands.)41 b(Y)-8 b(ou)31 b(can)f(use)g Fn(history)f Fs(to)i(displa)m(y)d(this)i -(information)e(in)h(v)-5 b(arious)30 b(formats.)125 3376 +(information)e(in)h(v)-5 b(arious)30 b(formats.)125 4246 y(Logging)g(m)m(ust)g(b)s(e)g(enabled)g(b)m(y)g(creating)h(the)f (\014le)g(`)p Fn($CVSROOT/CVSROOT/history)o Fs('.)125 -3650 y Fi(W)-8 b(arning:)39 b Fn(history)25 b Fs(uses)i(`)p +4520 y Fi(W)-8 b(arning:)39 b Fn(history)25 b Fs(uses)i(`)p Fn(-f)p Fs(',)h(`)p Fn(-l)p Fs(',)g(`)p Fn(-n)p Fs(',)h(and)d(`)p Fn(-p)p Fs(')i(in)e(w)m(a)m(ys)i(that)g(con\015ict)f(with)f(the)i -(normal)e(use)h(inside)0 3774 y Fr(cvs)i Fs(\(see)j(Section)e(A.4)h -([Common)f(options],)g(page)i(90\).)0 4181 y Fk(A.10.1)62 -b(history)31 b(options)125 4455 y Fs(Sev)m(eral)f(options)g(\(sho)m(wn) +(normal)e(use)h(inside)0 4645 y Fr(cvs)i Fs(\(see)j(Section)e(A.4)h +([Common)f(options],)g(page)i(92\).)0 5065 y Fk(A.10.1)62 +b(history)31 b(options)125 5340 y Fs(Sev)m(eral)f(options)g(\(sho)m(wn) g(ab)s(o)m(v)m(e)h(as)g(`)p Fn(-report)p Fs('\))e(con)m(trol)i(what)f -(kind)f(of)h(rep)s(ort)g(is)f(generated:)0 4751 y Fn(-c)384 -b Fs(Rep)s(ort)30 b(on)g(eac)m(h)i(time)e(commit)g(w)m(as)h(used)f -(\(i.e.,)h(eac)m(h)g(time)f(the)h(rep)s(ository)e(w)m(as)i(mo)s -(di\014ed\).)0 4921 y Fn(-e)384 b Fs(Ev)m(erything)30 -b(\(all)f(record)i(t)m(yp)s(es\);)g(equiv)-5 b(alen)m(t)29 -b(to)j(sp)s(ecifying)c(`)p Fn(-xMACFROGWUT)p Fs('.)0 -5091 y Fn(-m)i Fo(mo)s(dule)480 5215 y Fs(Rep)s(ort)e(on)g(a)h -(particular)e(mo)s(dule.)38 b(\(Y)-8 b(ou)29 b(can)g(meaningfully)c -(use)k(`)p Fn(-m)p Fs(')f(more)g(than)g(once)h(on)g(the)480 -5340 y(command)h(line.\))p eop -%%Page: 107 109 -107 108 bop 0 -116 a Fs(App)s(endix)28 b(A:)i(Guide)g(to)h(CVS)e -(commands)2210 b(107)0 366 y Fn(-o)384 b Fs(Rep)s(ort)30 -b(on)g(c)m(hec)m(k)m(ed-out)j(mo)s(dules.)0 537 y Fn(-T)384 -b Fs(Rep)s(ort)30 b(on)g(all)g(tags.)0 707 y Fn(-x)g -Fo(t)m(yp)s(e)180 b Fs(Extract)43 b(a)f(particular)e(set)i(of)g(record) -g(t)m(yp)s(es)g Fo(t)m(yp)s(e)47 b Fs(from)41 b(the)h -Fr(cvs)f Fs(history)-8 b(.)74 b(The)42 b(t)m(yp)s(es)g(are)480 -831 y(indicated)29 b(b)m(y)h(single)f(letters,)i(whic)m(h)e(y)m(ou)i -(ma)m(y)g(sp)s(ecify)e(in)g(com)m(bination.)480 979 y(Certain)h -(commands)g(ha)m(v)m(e)h(a)g(single)e(record)h(t)m(yp)s(e:)480 -1149 y Fn(F)432 b Fs(release)480 1319 y Fn(O)g Fs(c)m(hec)m(k)m(out)480 -1489 y Fn(E)g Fs(exp)s(ort)480 1659 y Fn(T)g Fs(rtag)480 -1829 y(One)30 b(of)g(four)g(record)g(t)m(yp)s(es)h(ma)m(y)g(result)e -(from)h(an)g(up)s(date:)480 1999 y Fn(C)432 b Fs(A)21 -b(merge)g(w)m(as)f(necessary)h(but)f(collisions)e(w)m(ere)j(detected)g -(\(requiring)e(man)m(ual)g(merg-)960 2124 y(ing\).)480 -2294 y Fn(G)432 b Fs(A)30 b(merge)h(w)m(as)g(necessary)g(and)f(it)g -(succeeded.)480 2464 y Fn(U)432 b Fs(A)30 b(w)m(orking)g(\014le)g(w)m -(as)g(copied)g(from)g(the)h(rep)s(ository)-8 b(.)480 -2634 y Fn(W)432 b Fs(The)28 b(w)m(orking)f(cop)m(y)i(of)f(a)h(\014le)e -(w)m(as)h(deleted)g(during)e(up)s(date)i(\(b)s(ecause)g(it)g(w)m(as)g -(gone)960 2759 y(from)i(the)g(rep)s(ository\).)480 2929 -y(One)g(of)g(three)h(record)f(t)m(yp)s(es)h(results)e(from)h(commit:) -480 3099 y Fn(A)432 b Fs(A)30 b(\014le)g(w)m(as)h(added)e(for)i(the)f -(\014rst)g(time.)480 3269 y Fn(M)432 b Fs(A)30 b(\014le)g(w)m(as)h(mo)s -(di\014ed.)480 3439 y Fn(R)432 b Fs(A)30 b(\014le)g(w)m(as)h(remo)m(v)m -(ed.)125 3736 y(The)i(options)g(sho)m(wn)g(as)i(`)p Fn(-flags)p +(kind)f(of)h(rep)s(ort)g(is)f(generated:)p eop +%%Page: 109 111 +109 110 bop 0 -116 a Fs(App)s(endix)28 b(A:)i(Guide)g(to)h(CVS)e +(commands)2210 b(109)0 366 y Fn(-c)384 b Fs(Rep)s(ort)30 +b(on)g(eac)m(h)i(time)e(commit)g(w)m(as)h(used)f(\(i.e.,)h(eac)m(h)g +(time)f(the)h(rep)s(ository)e(w)m(as)i(mo)s(di\014ed\).)0 +535 y Fn(-e)384 b Fs(Ev)m(erything)30 b(\(all)f(record)i(t)m(yp)s +(es\);)g(equiv)-5 b(alen)m(t)29 b(to)j(sp)s(ecifying)c(`)p +Fn(-xMACFROGWUT)p Fs('.)0 703 y Fn(-m)i Fo(mo)s(dule)480 +827 y Fs(Rep)s(ort)e(on)g(a)h(particular)e(mo)s(dule.)38 +b(\(Y)-8 b(ou)29 b(can)g(meaningfully)c(use)k(`)p Fn(-m)p +Fs(')f(more)g(than)g(once)h(on)g(the)480 952 y(command)h(line.\))0 +1120 y Fn(-o)384 b Fs(Rep)s(ort)30 b(on)g(c)m(hec)m(k)m(ed-out)j(mo)s +(dules.)0 1288 y Fn(-T)384 b Fs(Rep)s(ort)30 b(on)g(all)g(tags.)0 +1457 y Fn(-x)g Fo(t)m(yp)s(e)180 b Fs(Extract)43 b(a)f(particular)e +(set)i(of)g(record)g(t)m(yp)s(es)g Fo(t)m(yp)s(e)47 b +Fs(from)41 b(the)h Fr(cvs)f Fs(history)-8 b(.)74 b(The)42 +b(t)m(yp)s(es)g(are)480 1581 y(indicated)29 b(b)m(y)h(single)f +(letters,)i(whic)m(h)e(y)m(ou)i(ma)m(y)g(sp)s(ecify)e(in)g(com)m +(bination.)480 1727 y(Certain)h(commands)g(ha)m(v)m(e)h(a)g(single)e +(record)h(t)m(yp)s(e:)480 1896 y Fn(F)432 b Fs(release)480 +2064 y Fn(O)g Fs(c)m(hec)m(k)m(out)480 2232 y Fn(E)g +Fs(exp)s(ort)480 2400 y Fn(T)g Fs(rtag)480 2568 y(One)30 +b(of)g(four)g(record)g(t)m(yp)s(es)h(ma)m(y)g(result)e(from)h(an)g(up)s +(date:)480 2737 y Fn(C)432 b Fs(A)21 b(merge)g(w)m(as)f(necessary)h +(but)f(collisions)e(w)m(ere)j(detected)g(\(requiring)e(man)m(ual)g +(merg-)960 2861 y(ing\).)480 3029 y Fn(G)432 b Fs(A)30 +b(merge)h(w)m(as)g(necessary)g(and)f(it)g(succeeded.)480 +3197 y Fn(U)432 b Fs(A)30 b(w)m(orking)g(\014le)g(w)m(as)g(copied)g +(from)g(the)h(rep)s(ository)-8 b(.)480 3366 y Fn(W)432 +b Fs(The)28 b(w)m(orking)f(cop)m(y)i(of)f(a)h(\014le)e(w)m(as)h +(deleted)g(during)e(up)s(date)i(\(b)s(ecause)g(it)g(w)m(as)g(gone)960 +3490 y(from)i(the)g(rep)s(ository\).)480 3658 y(One)g(of)g(three)h +(record)f(t)m(yp)s(es)h(results)e(from)h(commit:)480 +3827 y Fn(A)432 b Fs(A)30 b(\014le)g(w)m(as)h(added)e(for)i(the)f +(\014rst)g(time.)480 3995 y Fn(M)432 b Fs(A)30 b(\014le)g(w)m(as)h(mo)s +(di\014ed.)480 4163 y Fn(R)432 b Fs(A)30 b(\014le)g(w)m(as)h(remo)m(v)m +(ed.)125 4459 y(The)i(options)g(sho)m(wn)g(as)i(`)p Fn(-flags)p Fs(')d(constrain)i(or)f(expand)h(the)g(rep)s(ort)f(without)g(requiring) -e(option)j(argu-)0 3860 y(men)m(ts:)0 4157 y Fn(-a)384 +e(option)j(argu-)0 4583 y(men)m(ts:)0 4879 y Fn(-a)384 b Fs(Sho)m(w)21 b(data)h(for)f(all)g(users)f(\(the)i(default)f(is)g(to) h(sho)m(w)f(data)h(only)f(for)g(the)h(user)f(executing)g -Fn(history)p Fs(\).)0 4327 y Fn(-l)384 b Fs(Sho)m(w)30 -b(last)g(mo)s(di\014cation)f(only)-8 b(.)0 4497 y Fn(-w)384 +Fn(history)p Fs(\).)0 5047 y Fn(-l)384 b Fs(Sho)m(w)30 +b(last)g(mo)s(di\014cation)f(only)-8 b(.)0 5215 y Fn(-w)384 b Fs(Sho)m(w)33 b(only)f(the)h(records)g(for)g(mo)s(di\014cations)e (done)i(from)g(the)g(same)g(w)m(orking)g(directory)f(where)480 -4622 y Fn(history)c Fs(is)i(executing.)125 4919 y(The)f(options)h(sho)m -(wn)g(as)g(`)p Fn(-options)f Fo(args)t Fs(')i(constrain)e(the)i(rep)s -(ort)f(based)g(on)g(an)g(argumen)m(t:)0 5215 y Fn(-b)g -Fo(str)247 b Fs(Sho)m(w)34 b(data)h(bac)m(k)g(to)g(a)g(record)f(con)m -(taining)g(the)g(string)g Fo(str)40 b Fs(in)33 b(either)h(the)g(mo)s -(dule)f(name,)j(the)480 5340 y(\014le)29 b(name,)i(or)g(the)f(rep)s -(ository)f(path.)p eop -%%Page: 108 110 -108 109 bop 0 -116 a Fs(108)2366 b(CVS|Concurren)m(t)29 -b(V)-8 b(ersions)30 b(System)0 366 y Fn(-D)g Fo(date)183 -b Fs(Sho)m(w)27 b(data)h(since)e Fo(date)p Fs(.)40 b(This)26 -b(is)g(sligh)m(tly)f(di\013eren)m(t)i(from)g(the)g(normal)f(use)h(of)g -(`)p Fn(-D)j Fo(date)5 b Fs(',)29 b(whic)m(h)480 491 -y(selects)i(the)f(new)m(est)h(revision)e(older)h(than)g -Fo(date)p Fs(.)0 697 y Fn(-p)g Fo(rep)s(ository)480 821 -y Fs(Sho)m(w)35 b(data)h(for)f(a)h(particular)e(source)h(rep)s(ository) -g(\(y)m(ou)h(can)f(sp)s(ecify)f(sev)m(eral)i(`)p Fn(-p)p -Fs(')f(options)g(on)480 946 y(the)c(same)f(command)g(line\).)0 -1151 y Fn(-r)g Fo(rev)230 b Fs(Sho)m(w)43 b(records)f(referring)g(to)i +5340 y Fn(history)c Fs(is)i(executing.)p eop +%%Page: 110 112 +110 111 bop 0 -116 a Fs(110)2366 b(CVS|Concurren)m(t)29 +b(V)-8 b(ersions)30 b(System)125 366 y(The)f(options)h(sho)m(wn)g(as)g +(`)p Fn(-options)f Fo(args)t Fs(')i(constrain)e(the)i(rep)s(ort)f +(based)g(on)g(an)g(argumen)m(t:)0 688 y Fn(-b)g Fo(str)247 +b Fs(Sho)m(w)34 b(data)h(bac)m(k)g(to)g(a)g(record)f(con)m(taining)g +(the)g(string)g Fo(str)40 b Fs(in)33 b(either)h(the)g(mo)s(dule)f +(name,)j(the)480 812 y(\014le)29 b(name,)i(or)g(the)f(rep)s(ository)f +(path.)0 1009 y Fn(-D)h Fo(date)183 b Fs(Sho)m(w)27 b(data)h(since)e +Fo(date)p Fs(.)40 b(This)26 b(is)g(sligh)m(tly)f(di\013eren)m(t)i(from) +g(the)g(normal)f(use)h(of)g(`)p Fn(-D)j Fo(date)5 b Fs(',)29 +b(whic)m(h)480 1134 y(selects)i(the)f(new)m(est)h(revision)e(older)h +(than)g Fo(date)p Fs(.)0 1331 y Fn(-p)g Fo(rep)s(ository)480 +1455 y Fs(Sho)m(w)35 b(data)h(for)f(a)h(particular)e(source)h(rep)s +(ository)g(\(y)m(ou)h(can)f(sp)s(ecify)f(sev)m(eral)i(`)p +Fn(-p)p Fs(')f(options)g(on)480 1580 y(the)c(same)f(command)g(line\).)0 +1777 y Fn(-r)g Fo(rev)230 b Fs(Sho)m(w)43 b(records)f(referring)g(to)i (revisions)d(since)h(the)h(revision)f(or)h(tag)h(named)e -Fo(rev)51 b Fs(app)s(ears)42 b(in)480 1276 y(individual)26 +Fo(rev)51 b Fs(app)s(ears)42 b(in)480 1901 y(individual)26 b Fr(r)n(cs)j Fs(\014les.)40 b(Eac)m(h)31 b Fr(r)n(cs)e Fs(\014le)h(is)f(searc)m(hed)i(for)f(the)h(revision)d(or)j(tag.)0 -1481 y Fn(-t)f Fo(tag)229 b Fs(Sho)m(w)38 b(records)g(since)f(tag)i +2098 y Fn(-t)f Fo(tag)229 b Fs(Sho)m(w)38 b(records)g(since)f(tag)i Fo(tag)48 b Fs(w)m(as)38 b(last)g(added)g(to)g(the)h(the)f(history)f -(\014le.)63 b(This)37 b(di\013ers)f(from)480 1606 y(the)31 +(\014le.)63 b(This)37 b(di\013ers)f(from)480 2223 y(the)31 b(`)p Fn(-r)p Fs(')g(\015ag)g(ab)s(o)m(v)m(e)h(in)d(that)j(it)e(reads)g (only)g(the)h(history)f(\014le,)g(not)h(the)g Fr(r)n(cs)f -Fs(\014les,)g(and)g(is)g(m)m(uc)m(h)480 1730 y(faster.)0 -1936 y Fn(-u)g Fo(name)142 b Fs(Sho)m(w)30 b(records)g(for)g(user)g -Fo(name)p Fs(.)0 2525 y Fm(A.11)68 b(imp)t(ort|Imp)t(ort)31 +Fs(\014les,)g(and)g(is)g(m)m(uc)m(h)480 2347 y(faster.)0 +2544 y Fn(-u)g Fo(name)142 b Fs(Sho)m(w)30 b(records)g(for)g(user)g +Fo(name)p Fs(.)0 3094 y Fm(A.11)68 b(imp)t(ort|Imp)t(ort)31 b(sources)f(in)l(to)i(CVS,)e(using)g(v)l(endor)h(branc)l(hes)75 -2815 y Fq(\017)60 b Fs(Synopsis:)39 b(imp)s(ort)28 b([-options])j(rep)s +3379 y Fq(\017)60 b Fs(Synopsis:)39 b(imp)s(ort)28 b([-options])j(rep)s (ository)e(v)m(endortag)j(releasetag)p Fh(:)15 b(:)g(:)75 -2980 y Fq(\017)60 b Fs(Requires:)40 b(Rep)s(ository)-8 +3540 y Fq(\017)60 b Fs(Requires:)40 b(Rep)s(ository)-8 b(,)30 b(source)g(distribution)d(directory)-8 b(.)75 -3145 y Fq(\017)60 b Fs(Changes:)40 b(rep)s(ository)-8 -b(.)125 3475 y(Use)34 b Fn(import)e Fs(to)j(incorp)s(orate)e(an)h(en)m +3701 y Fq(\017)60 b Fs(Changes:)40 b(rep)s(ository)-8 +b(.)125 4022 y(Use)34 b Fn(import)e Fs(to)j(incorp)s(orate)e(an)h(en)m (tire)f(source)h(distribution)d(from)i(an)h(outside)f(source)h(\(e.g.,) -j(a)d(source)0 3599 y(v)m(endor\))d(in)m(to)h(y)m(our)f(source)g(rep)s +j(a)d(source)0 4147 y(v)m(endor\))d(in)m(to)h(y)m(our)f(source)g(rep)s (ository)g(directory)-8 b(.)43 b(Y)-8 b(ou)32 b(can)f(use)g(this)f -(command)h(b)s(oth)g(for)g(initial)e(creation)0 3724 +(command)h(b)s(oth)g(for)g(initial)e(creation)0 4271 y(of)i(a)h(rep)s(ository)-8 b(,)31 b(and)g(for)g(wholesale)g(up)s (dates)f(to)i(the)g(mo)s(dule)d(from)i(the)h(outside)e(source.)44 -b(See)31 b(Chapter)g(13)0 3849 y([T)-8 b(rac)m(king)31 -b(sources],)g(page)g(63,)g(for)f(a)h(discussion)d(on)i(this)f(sub)5 -b(ject.)125 4138 y(The)30 b Fo(rep)s(ository)38 b Fs(argumen)m(t)32 +b(See)31 b(Chapter)g(13)0 4396 y([T)-8 b(rac)m(king)31 +b(sources],)g(page)g(65,)g(for)f(a)h(discussion)d(on)i(this)f(sub)5 +b(ject.)125 4681 y(The)30 b Fo(rep)s(ository)38 b Fs(argumen)m(t)32 b(giv)m(es)f(a)h(directory)e(name)h(\(or)h(a)f(path)g(to)h(a)g -(directory\))f(under)e(the)i Fr(cvs)g Fs(ro)s(ot)0 4263 +(directory\))f(under)e(the)i Fr(cvs)g Fs(ro)s(ot)0 4806 y(directory)f(for)g(rep)s(ositories;)f(if)g(the)i(directory)f(did)e -(not)j(exist,)f(imp)s(ort)f(creates)j(it.)125 4552 y(When)j(y)m(ou)g +(not)j(exist,)f(imp)s(ort)f(creates)j(it.)125 5091 y(When)j(y)m(ou)g (use)g(imp)s(ort)f(for)h(up)s(dates)f(to)i(source)g(that)g(has)f(b)s (een)f(mo)s(di\014ed)f(in)h(y)m(our)i(source)f(rep)s(ository)0 -4677 y(\(since)23 b(a)h(prior)d(imp)s(ort\),)j(it)f(will)e(notify)h(y)m +5215 y(\(since)23 b(a)h(prior)d(imp)s(ort\),)j(it)f(will)e(notify)h(y)m (ou)i(of)g(an)m(y)f(\014les)f(that)i(con\015ict)g(in)e(the)h(t)m(w)m(o) -i(branc)m(hes)e(of)g(dev)m(elopmen)m(t;)0 4801 y(use)30 +i(branc)m(hes)e(of)g(dev)m(elopmen)m(t;)0 5340 y(use)30 b(`)p Fn(checkout)e(-j)p Fs(')i(to)i(reconcile)e(the)g(di\013erences,)g -(as)h(imp)s(ort)d(instructs)h(y)m(ou)i(to)g(do.)125 5091 -y(If)25 b Fr(cvs)g Fs(decides)g(a)h(\014le)f(should)f(b)s(e)h(ignored)g -(\(see)h(Section)g(C.9)g([cvsignore],)i(page)e(146\),)j(it)c(do)s(es)h -(not)g(imp)s(ort)0 5215 y(it)40 b(and)g(prin)m(ts)g(`)p -Fn(I)30 b Fs(')41 b(follo)m(w)m(ed)f(b)m(y)h(the)g(\014lename)f(\(see)i -(Section)e(A.11.2)j([imp)s(ort)c(output],)44 b(page)d(110,)k(for)c(a)0 -5340 y(complete)31 b(description)d(of)j(the)f(output\).)p -eop -%%Page: 109 111 -109 110 bop 0 -116 a Fs(App)s(endix)28 b(A:)i(Guide)g(to)h(CVS)e -(commands)2210 b(109)125 366 y(If)32 b(the)h(\014le)f(`)p -Fn($CVSROOT/CVSROOT/cvswrapper)o(s)p Fs(')27 b(exists,)34 -b(an)m(y)f(\014le)f(whose)h(names)g(matc)m(h)h(the)f(sp)s(eci\014ca-)0 -491 y(tions)c(in)f(that)j(\014le)d(will)f(b)s(e)i(treated)i(as)f(pac)m -(k)-5 b(ages)32 b(and)d(the)g(appropriate)g(\014ltering)f(will)f(b)s(e) -i(p)s(erformed)f(on)i(the)0 616 y(\014le/directory)f(b)s(efore)h(b)s -(eing)f(imp)s(orted,)g(See)i(Section)f(C.2)h([W)-8 b(rapp)s(ers],)30 -b(page)h(137.)125 890 y(The)h(outside)g(source)i(is)e(sa)m(v)m(ed)i(in) -e(a)h(\014rst-lev)m(el)g Fr(r)n(cs)f Fs(branc)m(h,)h(b)m(y)g(default)f +(as)h(imp)s(ort)d(instructs)h(y)m(ou)i(to)g(do.)p eop +%%Page: 111 113 +111 112 bop 0 -116 a Fs(App)s(endix)28 b(A:)i(Guide)g(to)h(CVS)e +(commands)2210 b(111)125 366 y(If)25 b Fr(cvs)g Fs(decides)g(a)h +(\014le)f(should)f(b)s(e)h(ignored)g(\(see)h(Section)g(C.9)g +([cvsignore],)i(page)e(148\),)j(it)c(do)s(es)h(not)g(imp)s(ort)0 +491 y(it)40 b(and)g(prin)m(ts)g(`)p Fn(I)30 b Fs(')41 +b(follo)m(w)m(ed)f(b)m(y)h(the)g(\014lename)f(\(see)i(Section)e(A.11.2) +j([imp)s(ort)c(output],)44 b(page)d(112,)k(for)c(a)0 +616 y(complete)31 b(description)d(of)j(the)f(output\).)125 +904 y(If)i(the)h(\014le)f(`)p Fn($CVSROOT/CVSROOT/cvswrapper)o(s)p +Fs(')27 b(exists,)34 b(an)m(y)f(\014le)f(whose)h(names)g(matc)m(h)h +(the)f(sp)s(eci\014ca-)0 1029 y(tions)c(in)f(that)j(\014le)d(will)f(b)s +(e)i(treated)i(as)f(pac)m(k)-5 b(ages)32 b(and)d(the)g(appropriate)g +(\014ltering)f(will)f(b)s(e)i(p)s(erformed)f(on)i(the)0 +1154 y(\014le/directory)f(b)s(efore)h(b)s(eing)f(imp)s(orted,)g(See)i +(Section)f(C.2)h([W)-8 b(rapp)s(ers],)30 b(page)h(139.)125 +1443 y(The)h(outside)g(source)i(is)e(sa)m(v)m(ed)i(in)e(a)h +(\014rst-lev)m(el)g Fr(r)n(cs)f Fs(branc)m(h,)h(b)m(y)g(default)f (1.1.1.)51 b(Up)s(dates)33 b(are)g(lea)m(v)m(es)i(of)0 -1014 y(this)d(branc)m(h;)i(for)f(example,)g(\014les)f(from)h(the)g +1567 y(this)d(branc)m(h;)i(for)f(example,)g(\014les)f(from)h(the)g (\014rst)g(imp)s(orted)e(collection)i(of)g(source)g(will)d(b)s(e)j -(revision)e(1.1.1.1,)0 1139 y(then)f(\014les)f(from)h(the)h(\014rst)e +(revision)e(1.1.1.1,)0 1692 y(then)f(\014les)f(from)h(the)h(\014rst)e (imp)s(orted)g(up)s(date)h(will)d(b)s(e)j(revision)f(1.1.1.2,)k(and)d -(so)g(on.)125 1413 y(A)m(t)h(least)g(three)f(argumen)m(ts)h(are)g +(so)g(on.)125 1981 y(A)m(t)h(least)g(three)f(argumen)m(ts)h(are)g (required.)39 b Fo(rep)s(ository)e Fs(is)29 b(needed)h(to)h(iden)m -(tify)e(the)i(collection)f(of)h(source.)0 1537 y Fo(v)m(endortag)g +(tify)e(the)i(collection)f(of)h(source.)0 2105 y Fo(v)m(endortag)g Fs(is)22 b(a)g(tag)i(for)e(the)h(en)m(tire)f(branc)m(h)g(\(e.g.,)j(for) e(1.1.1\).)40 b(Y)-8 b(ou)23 b(m)m(ust)f(also)g(sp)s(ecify)f(at)i -(least)g(one)f Fo(releasetag)0 1662 y Fs(to)31 b(iden)m(tify)e(the)h +(least)g(one)f Fo(releasetag)0 2230 y Fs(to)31 b(iden)m(tify)e(the)h (\014les)g(at)h(the)f(lea)m(v)m(es)i(created)g(eac)m(h)f(time)f(y)m(ou) -h(execute)h Fn(import)p Fs(.)125 1936 y(Note)j(that)f +h(execute)h Fn(import)p Fs(.)125 2519 y(Note)j(that)f Fn(import)e Fs(do)s(es)h Fo(not)j Fs(c)m(hange)f(the)f(directory)f(in)g (whic)m(h)f(y)m(ou)i(in)m(v)m(ok)m(e)h(it.)50 b(In)33 -b(particular,)g(it)g(do)s(es)0 2060 y(not)d(set)h(up)e(that)i +b(particular,)g(it)g(do)s(es)0 2643 y(not)d(set)h(up)e(that)i (directory)f(as)g(a)h Fr(cvs)e Fs(w)m(orking)h(directory;)g(if)f(y)m (ou)i(w)m(an)m(t)g(to)g(w)m(ork)f(with)f(the)h(sources)h(imp)s(ort)0 -2185 y(them)f(\014rst)f(and)g(then)g(c)m(hec)m(k)j(them)d(out)h(in)m +2768 y(them)f(\014rst)f(and)g(then)g(c)m(hec)m(k)j(them)d(out)h(in)m (to)g(a)g(di\013eren)m(t)f(directory)h(\(see)g(Section)g(3.1)h -([Getting)f(the)g(source],)0 2309 y(page)h(11\).)0 2715 -y Fk(A.11.1)62 b(imp)s(ort)31 b(options)125 2989 y Fs(This)f(standard)h +([Getting)f(the)g(source],)0 2892 y(page)h(11\).)0 3442 +y Fk(A.11.1)62 b(imp)s(ort)31 b(options)125 3731 y Fs(This)f(standard)h (option)g(is)g(supp)s(orted)f(b)m(y)i Fn(import)f Fs(\(see)h(Section)g -(A.4)h([Common)f(options],)g(page)h(90,)g(for)0 3114 -y(a)e(complete)g(description\):)0 3411 y Fn(-m)f Fo(message)480 -3535 y Fs(Use)h Fo(message)36 b Fs(as)31 b(log)f(information,)f -(instead)h(of)h(in)m(v)m(oking)e(an)h(editor.)125 3832 +(A.4)h([Common)f(options],)g(page)h(92,)g(for)0 3855 +y(a)e(complete)g(description\):)0 4184 y Fn(-m)f Fo(message)480 +4309 y Fs(Use)h Fo(message)36 b Fs(as)31 b(log)f(information,)f +(instead)h(of)h(in)m(v)m(oking)e(an)h(editor.)125 4638 y(There)f(are)i(three)g(additional)d(sp)s(ecial)h(options.)0 -4128 y Fn(-b)h Fo(branc)m(h)83 b Fs(Sp)s(ecify)34 b(a)i(\014rst-lev)m +4966 y Fn(-b)h Fo(branc)m(h)83 b Fs(Sp)s(ecify)34 b(a)i(\014rst-lev)m (el)f(branc)m(h)g(other)g(than)h(1.1.1.)58 b(Unless)34 b(the)i(`)p Fn(-b)30 b Fo(branc)m(h)p Fs(')35 b(\015ag)h(is)f(giv)m -(en,)i(re-)480 4253 y(visions)h(will)g Fo(alw)m(a)m(ys)44 +(en,)i(re-)480 5091 y(visions)h(will)g Fo(alw)m(a)m(ys)44 b Fs(b)s(e)c(made)g(to)h(the)g(branc)m(h)e(1.1.1|ev)m(en)k(if)c(a)i -Fo(v)m(endortag)49 b Fs(that)41 b(matc)m(hes)480 4378 +Fo(v)m(endortag)49 b Fs(that)41 b(matc)m(hes)480 5215 y(another)36 b(branc)m(h)f(is)f(giv)m(en!)56 b(What)36 b(happ)s(ens)e(in)g(that)i(case,)i(is)d(that)h(the)g(tag)g(will)d(b)s -(e)i(reset)h(to)480 4502 y(1.1.1.)43 b(W)-8 b(arning:)40 +(e)i(reset)h(to)480 5340 y(1.1.1.)43 b(W)-8 b(arning:)40 b(This)28 b(b)s(eha)m(vior)i(migh)m(t)g(c)m(hange)h(in)f(the)g(future.) -0 4672 y Fn(-k)g Fo(subst)145 b Fs(Indicate)31 b(the)g(R)m(CS)g(k)m -(eyw)m(ord)h(expansion)e(mo)s(de)h(desired.)42 b(This)30 -b(setting)h(will)e(apply)h(to)i(all)e(\014les)480 4796 -y(created)c(during)c(the)j(imp)s(ort,)f(but)g(not)g(to)i(an)m(y)e -(\014les)g(that)h(previously)d(existed)i(in)g(the)g(rep)s(ository)-8 -b(.)480 4921 y(See)31 b(Section)f(17.4)i([Substitution)c(mo)s(des],)i -(page)h(77,)h(for)e(a)g(list)f(of)i(v)-5 b(alid)29 b(`)p -Fn(-k)p Fs(')h(settings.)0 5091 y Fn(-I)g Fo(name)142 +p eop +%%Page: 112 114 +112 113 bop 0 -116 a Fs(112)2366 b(CVS|Concurren)m(t)29 +b(V)-8 b(ersions)30 b(System)0 366 y Fn(-k)g Fo(subst)145 +b Fs(Indicate)31 b(the)g(R)m(CS)g(k)m(eyw)m(ord)h(expansion)e(mo)s(de)h +(desired.)42 b(This)30 b(setting)h(will)e(apply)h(to)i(all)e(\014les) +480 491 y(created)c(during)c(the)j(imp)s(ort,)f(but)g(not)g(to)i(an)m +(y)e(\014les)g(that)h(previously)d(existed)i(in)g(the)g(rep)s(ository) +-8 b(.)480 616 y(See)31 b(Section)f(17.4)i([Substitution)c(mo)s(des],)i +(page)h(79,)h(for)e(a)g(list)f(of)i(v)-5 b(alid)29 b(`)p +Fn(-k)p Fs(')h(settings.)0 801 y Fn(-I)g Fo(name)142 b Fs(Sp)s(ecify)41 b(\014le)g(names)i(that)g(should)e(b)s(e)g(ignored)h (during)e(imp)s(ort.)76 b(Y)-8 b(ou)43 b(can)g(use)f(this)f(option)480 -5215 y(rep)s(eatedly)-8 b(.)53 b(T)-8 b(o)34 b(a)m(v)m(oid)h(ignoring)e +926 y(rep)s(eatedly)-8 b(.)53 b(T)-8 b(o)34 b(a)m(v)m(oid)h(ignoring)e (an)m(y)i(\014les)e(at)j(all)d(\(ev)m(en)i(those)g(ignored)f(b)m(y)g -(default\),)h(sp)s(ecify)480 5340 y(`-I)c(!'.)p eop -%%Page: 110 112 -110 111 bop 0 -116 a Fs(110)2366 b(CVS|Concurren)m(t)29 -b(V)-8 b(ersions)30 b(System)480 366 y Fo(name)56 b Fs(can)c(b)s(e)e(a) -i(\014le)e(name)h(pattern)h(of)f(the)g(same)h(t)m(yp)s(e)f(that)h(y)m -(ou)g(can)f(sp)s(ecify)f(in)g(the)480 491 y(`)p Fn(.cvsignore)p -Fs(')28 b(\014le.)40 b(See)31 b(Section)f(C.9)g([cvsignore],)h(page)g -(146.)0 677 y Fn(-W)f Fo(sp)s(ec)184 b Fs(Sp)s(ecify)42 -b(\014le)g(names)i(that)g(should)e(b)s(e)h(\014ltered)f(during)f(imp)s -(ort.)79 b(Y)-8 b(ou)44 b(can)g(use)f(this)f(option)480 -801 y(rep)s(eatedly)-8 b(.)480 957 y Fo(sp)s(ec)59 b -Fs(can)54 b(b)s(e)f(a)h(\014le)f(name)h(pattern)g(of)g(the)g(same)g(t)m -(yp)s(e)g(that)h(y)m(ou)f(can)g(sp)s(ecify)e(in)h(the)480 -1081 y(`)p Fn(.cvswrappers)p Fs(')28 b(\014le.)39 b(See)31 -b(Section)f(C.2)h([W)-8 b(rapp)s(ers],)30 b(page)h(137.)0 -1548 y Fk(A.11.2)62 b(imp)s(ort)31 b(output)125 1827 -y Fn(import)41 b Fs(k)m(eeps)i(y)m(ou)g(informed)e(of)i(its)f(progress) -g(b)m(y)h(prin)m(ting)d(a)j(line)e(for)i(eac)m(h)h(\014le,)h(preceded)d -(b)m(y)h(one)0 1952 y(c)m(haracter)32 b(indicating)c(the)j(status)f(of) -h(the)g(\014le:)0 2262 y Fn(U)f Fo(\014le)285 b Fs(The)43 -b(\014le)g(already)g(exists)g(in)f(the)i(rep)s(ository)e(and)h(has)g -(not)h(b)s(een)e(lo)s(cally)g(mo)s(di\014ed;)49 b(a)43 -b(new)480 2387 y(revision)29 b(has)h(b)s(een)f(created)j(\(if)e -(necessary\).)0 2573 y Fn(N)g Fo(\014le)285 b Fs(The)30 +(default\),)h(sp)s(ecify)480 1051 y(`-I)c(!'.)480 1206 +y Fo(name)56 b Fs(can)c(b)s(e)e(a)i(\014le)e(name)h(pattern)h(of)f(the) +g(same)h(t)m(yp)s(e)f(that)h(y)m(ou)g(can)f(sp)s(ecify)f(in)g(the)480 +1330 y(`)p Fn(.cvsignore)p Fs(')28 b(\014le.)40 b(See)31 +b(Section)f(C.9)g([cvsignore],)h(page)g(148.)0 1516 y +Fn(-W)f Fo(sp)s(ec)184 b Fs(Sp)s(ecify)42 b(\014le)g(names)i(that)g +(should)e(b)s(e)h(\014ltered)f(during)f(imp)s(ort.)79 +b(Y)-8 b(ou)44 b(can)g(use)f(this)f(option)480 1641 y(rep)s(eatedly)-8 +b(.)480 1796 y Fo(sp)s(ec)59 b Fs(can)54 b(b)s(e)f(a)h(\014le)f(name)h +(pattern)g(of)g(the)g(same)g(t)m(yp)s(e)g(that)h(y)m(ou)f(can)g(sp)s +(ecify)e(in)h(the)480 1920 y(`)p Fn(.cvswrappers)p Fs(')28 +b(\014le.)39 b(See)31 b(Section)f(C.2)h([W)-8 b(rapp)s(ers],)30 +b(page)h(139.)0 2388 y Fk(A.11.2)62 b(imp)s(ort)31 b(output)125 +2667 y Fn(import)41 b Fs(k)m(eeps)i(y)m(ou)g(informed)e(of)i(its)f +(progress)g(b)m(y)h(prin)m(ting)d(a)j(line)e(for)i(eac)m(h)h(\014le,)h +(preceded)d(b)m(y)h(one)0 2792 y(c)m(haracter)32 b(indicating)c(the)j +(status)f(of)h(the)g(\014le:)0 3102 y Fn(U)f Fo(\014le)285 +b Fs(The)43 b(\014le)g(already)g(exists)g(in)f(the)i(rep)s(ository)e +(and)h(has)g(not)h(b)s(een)e(lo)s(cally)g(mo)s(di\014ed;)49 +b(a)43 b(new)480 3227 y(revision)29 b(has)h(b)s(een)f(created)j(\(if)e +(necessary\).)0 3413 y Fn(N)g Fo(\014le)285 b Fs(The)30 b(\014le)f(is)h(a)h(new)e(\014le)h(whic)m(h)f(has)h(b)s(een)g(added)f -(to)i(the)g(rep)s(ository)-8 b(.)0 2758 y Fn(C)30 b Fo(\014le)285 +(to)i(the)g(rep)s(ository)-8 b(.)0 3599 y Fn(C)30 b Fo(\014le)285 b Fs(The)27 b(\014le)g(already)g(exists)g(in)g(the)h(rep)s(ository)e (but)h(has)h(b)s(een)e(lo)s(cally)h(mo)s(di\014ed;)f(y)m(ou)i(will)d -(ha)m(v)m(e)k(to)480 2883 y(merge)i(the)f(c)m(hanges.)0 -3069 y Fn(I)g Fo(\014le)285 b Fs(The)30 b(\014le)f(is)h(b)s(eing)f -(ignored)g(\(see)j(Section)e(C.9)g([cvsignore],)h(page)g(146\).)0 -3255 y Fn(L)f Fo(\014le)285 b Fs(The)23 b(\014le)g(is)f(a)i(sym)m(b)s -(olic)e(link;)i(at)h(the)e(momen)m(t)i(\(and)e(for)g(the)h(forseeable)g -(future\),)g(sym)m(b)s(olic)e(links)480 3379 y(are)38 -b(ignored.)60 b(\(V)-8 b(arious)37 b(options)g(in)f(the)h(`)p -Fn(modules)p Fs(')f(\014le)g(can)i(b)s(e)e(used)h(to)h(recreate)h(sym)m -(b)s(olic)480 3504 y(links)28 b(on)i(c)m(hec)m(k)m(out,)j(up)s(date,)d -(etc.;)i(see)f(Section)f(C.1)h([mo)s(dules],)e(page)i(135.\))0 -3970 y Fk(A.11.3)62 b(imp)s(ort)31 b(examples)125 4250 -y Fs(See)f(Chapter)g(13)h([T)-8 b(rac)m(king)31 b(sources],)g(page)g -(63,)g(and)f(See)h(Section)f(5.1.1)i([F)-8 b(rom)31 b(\014les],)f(page) -h(29.)0 4750 y Fm(A.12)68 b(log|Prin)l(t)32 b(out)e(log)i(information)f -(for)g(\014les)75 5030 y Fq(\017)60 b Fs(Synopsis:)39 -b(log)30 b([options])g([\014les)p Fh(:)15 b(:)g(:)q Fs(])75 -5185 y Fq(\017)60 b Fs(Requires:)40 b(rep)s(ository)-8 -b(,)30 b(w)m(orking)f(directory)-8 b(.)75 5340 y Fq(\017)60 -b Fs(Changes:)40 b(nothing.)p eop -%%Page: 111 113 -111 112 bop 0 -116 a Fs(App)s(endix)28 b(A:)i(Guide)g(to)h(CVS)e -(commands)2210 b(111)125 366 y(Displa)m(y)22 b(log)h(information)f(for) -h(\014les.)38 b Fn(log)22 b Fs(used)h(to)h(call)e(the)i -Fr(r)n(cs)e Fs(utilit)m(y)g Fn(rlog)p Fs(.)37 b(Although)22 -b(this)h(is)f(no)h(longer)0 491 y(true)j(in)e(the)i(curren)m(t)g -(sources,)g(this)f(history)g(determines)g(the)h(format)g(of)g(the)f -(output)h(and)f(the)h(options,)g(whic)m(h)0 616 y(are)31 -b(not)f(quite)g(in)f(the)i(st)m(yle)f(of)h(the)g(other)f -Fr(cvs)g Fs(commands.)125 890 y(The)35 b(output)g(includes)e(the)j(lo)s -(cation)f(of)h(the)g Fr(r)n(cs)f Fs(\014le,)h(the)g Fo(head)j -Fs(revision)34 b(\(the)i(latest)g(revision)e(on)i(the)0 -1014 y(trunk\),)23 b(all)f(sym)m(b)s(olic)e(names)i(\(tags\))i(and)e -(some)h(other)f(things.)37 b(F)-8 b(or)23 b(eac)m(h)h(revision,)e(the)g -(revision)f(n)m(um)m(b)s(er,)i(the)0 1139 y(author,)k(the)g(n)m(um)m(b) -s(er)e(of)i(lines)d(added/deleted)i(and)g(the)h(log)f(message)i(are)f -(prin)m(ted.)37 b(All)26 b(times)g(are)g(displa)m(y)m(ed)0 -1263 y(in)j(Co)s(ordinated)g(Univ)m(ersal)g(Time)h(\(UTC\).)g(\(Other)h -(parts)f(of)g Fr(cvs)g Fs(prin)m(t)f(times)h(in)f(the)h(lo)s(cal)g -(timezone\).)0 1678 y Fk(A.12.1)62 b(log)31 b(options)125 -1952 y Fs(By)f(default,)g Fn(log)g Fs(prin)m(ts)e(all)i(information)e -(that)j(is)f(a)m(v)-5 b(ailable.)40 b(All)29 b(other)h(options)g -(restrict)g(the)h(output.)0 2251 y Fn(-b)384 b Fs(Prin)m(t)44 -b(information)g(ab)s(out)g(the)i(revisions)d(on)i(the)g(default)g -(branc)m(h,)j(normally)43 b(the)j(highest)480 2376 y(branc)m(h)30 -b(on)g(the)h(trunk.)0 2550 y Fn(-d)f Fo(dates)147 b Fs(Prin)m(t)32 -b(information)f(ab)s(out)h(revisions)f(with)g(a)i(c)m(hec)m(kin)g -(date/time)h(in)d(the)i(range)g(giv)m(en)g(b)m(y)g(the)480 -2675 y(semicolon-separated)27 b(list)e(of)i(dates.)40 -b(The)26 b(date)h(formats)f(accepted)i(are)f(those)g(accepted)h(b)m(y)f -(the)480 2799 y(`)p Fn(-D)p Fs(')d(option)f(to)i(man)m(y)f(other)g -Fr(cvs)f Fs(commands)g(\(see)i(Section)f(A.4)g([Common)g(options],)h -(page)f(90\).)480 2924 y(Dates)32 b(can)e(b)s(e)g(com)m(bined)g(in)m -(to)g(ranges)h(as)f(follo)m(ws:)480 3098 y Fo(d1)7 b -Fn(<)p Fo(d2)480 3223 y(d2)g Fn(>)p Fo(d1)233 b Fs(Select)31 -b(the)f(revisions)f(that)i(w)m(ere)f(dep)s(osited)g(b)s(et)m(w)m(een)h -Fo(d1)37 b Fs(and)30 b Fo(d2)p Fs(.)480 3397 y Fn(<)p -Fo(d)480 3522 y(d)t Fn(>)377 b Fs(Select)31 b(all)e(revisions)f(dated)j -Fo(d)i Fs(or)e(earlier.)480 3696 y Fo(d)t Fn(<)480 3821 -y(>)p Fo(d)381 b Fs(Select)31 b(all)e(revisions)f(dated)j -Fo(d)i Fs(or)e(later.)480 3995 y Fo(d)429 b Fs(Select)31 -b(the)f(single,)f(latest)i(revision)e(dated)i Fo(d)i -Fs(or)d(earlier.)480 4169 y(The)k(`)p Fn(>)p Fs(')h(or)g(`)p -Fn(<)p Fs(')g(c)m(haracters)h(ma)m(y)f(b)s(e)f(follo)m(w)m(ed)g(b)m(y)h -(`)p Fn(=)p Fs(')g(to)g(indicate)f(an)h(inclusiv)m(e)d(range)j(rather) -480 4294 y(than)30 b(an)g(exclusiv)m(e)g(one.)480 4443 -y(Note)i(that)f(the)f(separator)h(is)f(a)g(semicolon)g(\(;\).)0 -4618 y Fn(-h)384 b Fs(Prin)m(t)39 b(only)g(the)i Fr(r)n(cs)e -Fs(pathname,)j(w)m(orking)e(pathname,)j(head,)f(default)d(branc)m(h,)k -(access)e(list,)480 4742 y(lo)s(c)m(ks,)31 b(sym)m(b)s(olic)d(names,)j -(and)f(su\016x.)0 4917 y Fn(-l)384 b Fs(Lo)s(cal;)30 -b(run)f(only)h(in)f(curren)m(t)h(w)m(orking)g(directory)-8 -b(.)40 b(\(Default)31 b(is)f(to)h(run)e(recursiv)m(ely\).)0 -5091 y Fn(-N)384 b Fs(Do)29 b(not)g(prin)m(t)d(the)j(list)e(of)h(tags)h -(for)f(this)f(\014le.)39 b(This)27 b(option)h(can)g(b)s(e)g(v)m(ery)g -(useful)f(when)g(y)m(our)h(site)480 5215 y(uses)33 b(a)i(lot)f(of)g -(tags,)i(so)e(rather)g(than)f Fn(")p Fs(more)p Fn(")p -Fs('ing)g(o)m(v)m(er)i(3)g(pages)f(of)g(tag)h(information,)f(the)g(log) -480 5340 y(information)29 b(is)g(presen)m(ted)h(without)g(tags)h(at)g -(all.)p eop -%%Page: 112 114 -112 113 bop 0 -116 a Fs(112)2366 b(CVS|Concurren)m(t)29 -b(V)-8 b(ersions)30 b(System)0 366 y Fn(-R)384 b Fs(Prin)m(t)29 -b(only)h(the)g(name)h(of)f(the)h Fr(r)n(cs)e Fs(history)h(\014le.)0 -543 y Fn(-r)p Fo(revisions)480 668 y Fs(Prin)m(t)i(information)e(ab)s -(out)j(revisions)d(giv)m(en)j(in)e(the)i(comma-separated)h(list)d -Fo(revisions)k Fs(of)d(revi-)480 792 y(sions)d(and)h(ranges.)41 -b(The)30 b(follo)m(wing)f(table)h(explains)e(the)j(a)m(v)-5 -b(ailable)30 b(range)g(formats:)480 969 y Fo(rev1)7 b -Fn(:)p Fo(rev2)87 b Fs(Revisions)29 b Fo(rev1)38 b Fs(to)31 -b Fo(rev2)38 b Fs(\(whic)m(h)29 b(m)m(ust)i(b)s(e)e(on)i(the)f(same)h -(branc)m(h\).)480 1145 y Fn(:)p Fo(rev)308 b Fs(Revisions)29 -b(from)h(the)g(b)s(eginning)e(of)i(the)h(branc)m(h)f(up)f(to)i(and)f -(including)d Fo(rev)p Fs(.)480 1322 y Fo(rev)8 b Fn(:)300 -b Fs(Revisions)29 b(starting)h(with)f Fo(rev)38 b Fs(to)31 -b(the)g(end)e(of)i(the)g(branc)m(h)e(con)m(taining)h -Fo(rev)p Fs(.)480 1498 y Fo(branc)m(h)209 b Fs(An)30 -b(argumen)m(t)h(that)g(is)e(a)i(branc)m(h)f(means)g(all)f(revisions)g -(on)h(that)h(branc)m(h.)480 1675 y Fo(branc)m(h1)7 b -Fn(:)p Fo(branc)m(h2)960 1799 y Fs(A)30 b(range)h(of)g(branc)m(hes)f -(means)g(all)f(revisions)g(on)h(the)h(branc)m(hes)f(in)f(that)i(range.) -480 1976 y Fo(branc)m(h)p Fn(.)161 b Fs(The)30 b(latest)h(revision)d -(in)i Fo(branc)m(h)p Fs(.)480 2152 y(A)d(bare)g(`)p Fn(-r)p -Fs(')g(with)e(no)i(revisions)e(means)i(the)g(latest)g(revision)f(on)g -(the)h(default)g(branc)m(h,)g(normally)480 2277 y(the)k(trunk.)39 -b(There)30 b(can)h(b)s(e)e(no)i(space)g(b)s(et)m(w)m(een)g(the)f(`)p -Fn(-r)p Fs(')g(option)g(and)g(its)g(argumen)m(t.)0 2453 -y Fn(-s)g Fo(states)127 b Fs(Prin)m(t)28 b(information)f(ab)s(out)h -(revisions)f(whose)h(state)i(attributes)f(matc)m(h)g(one)g(of)g(the)g -(states)h(giv)m(en)480 2578 y(in)f(the)i(comma-separated)h(list)d -Fo(states)p Fs(.)0 2754 y Fn(-t)384 b Fs(Prin)m(t)29 -b(the)i(same)g(as)f(`)p Fn(-h)p Fs(',)h(plus)d(the)j(descriptiv)m(e)e -(text.)0 2931 y Fn(-w)p Fo(logins)155 b Fs(Prin)m(t)34 -b(information)g(ab)s(out)h(revisions)e(c)m(hec)m(k)m(ed)k(in)d(b)m(y)i -(users)e(with)g(login)g(names)h(app)s(earing)f(in)480 -3056 y(the)25 b(comma-separated)g(list)e Fo(logins)p -Fs(.)38 b(If)24 b Fo(logins)i Fs(is)e(omitted,)i(the)e(user's)g(login)f -(is)g(assumed.)38 b(There)480 3180 y(can)31 b(b)s(e)e(no)i(space)g(b)s -(et)m(w)m(een)g(the)f(`)p Fn(-w)p Fs(')g(option)g(and)g(its)g(argumen)m -(t.)125 3481 y Fn(log)i Fs(prin)m(ts)g(the)h(in)m(tersection)g(of)h -(the)f(revisions)f(selected)i(with)e(the)h(options)g(`)p -Fn(-d)p Fs(',)h(`)p Fn(-s)p Fs(',)g(and)f(`)p Fn(-w)p -Fs(',)h(in)m(ter-)0 3606 y(sected)d(with)e(the)i(union)d(of)j(the)f -(revisions)f(selected)i(b)m(y)f(`)p Fn(-b)p Fs(')g(and)g(`)p -Fn(-r)p Fs('.)0 4031 y Fk(A.12.2)62 b(log)31 b(examples)125 -4306 y Fs(Con)m(tributed)d(examples)i(are)h(gratefully)e(accepted.)0 -4764 y Fm(A.13)68 b(rdi\013|'patc)l(h')32 b(format)f(di\013s)g(b)t(et)l -(w)l(een)h(releases)75 5039 y Fq(\017)60 b Fs(rdi\013)29 -b([-\015ags])i([-V)g(vn])f([-r)h(t)p Fn(|)p Fs(-D)g(d)f([-r)g(t2)p -Fn(|)p Fs(-D)i(d2]])e(mo)s(dules)p Fh(:)15 b(:)g(:)75 -5189 y Fq(\017)60 b Fs(Requires:)40 b(rep)s(ository)-8 -b(.)75 5340 y Fq(\017)60 b Fs(Changes:)40 b(nothing.)p -eop +(ha)m(v)m(e)k(to)480 3723 y(merge)i(the)f(c)m(hanges.)0 +3909 y Fn(I)g Fo(\014le)285 b Fs(The)30 b(\014le)f(is)h(b)s(eing)f +(ignored)g(\(see)j(Section)e(C.9)g([cvsignore],)h(page)g(148\).)0 +4095 y Fn(L)f Fo(\014le)285 b Fs(The)42 b(\014le)f(is)g(a)h(sym)m(b)s +(olic)f(link;)46 b Fn(cvs)29 b(import)41 b Fs(ignores)g(sym)m(b)s(olic) +g(links.)73 b(P)m(eople)43 b(p)s(erio)s(dically)480 4220 +y(suggest)37 b(that)g(this)e(b)s(eha)m(vior)g(should)f(b)s(e)h(c)m +(hanged,)k(but)c(if)g(there)h(is)g(a)g(consensus)f(on)h(what)g(it)480 +4344 y(should)21 b(b)s(e)i(c)m(hanged)h(to,)i(it)d(do)s(esn't)g(seem)h +(to)g(b)s(e)f(apparen)m(t.)39 b(\(V)-8 b(arious)23 b(options)g(in)f +(the)h(`)p Fn(modules)p Fs(')480 4469 y(\014le)34 b(can)i(b)s(e)f(used) +f(to)i(recreate)h(sym)m(b)s(olic)d(links)f(on)i(c)m(hec)m(k)m(out,)k +(up)s(date,)d(etc.;)k(see)c(Section)f(C.1)480 4593 y([mo)s(dules],)29 +b(page)i(137.\))0 5060 y Fk(A.11.3)62 b(imp)s(ort)31 +b(examples)125 5340 y Fs(See)f(Chapter)g(13)h([T)-8 b(rac)m(king)31 +b(sources],)g(page)g(65,)g(and)f(See)h(Section)f(5.1.1)i([F)-8 +b(rom)31 b(\014les],)f(page)h(31.)p eop %%Page: 113 115 113 114 bop 0 -116 a Fs(App)s(endix)28 b(A:)i(Guide)g(to)h(CVS)e -(commands)2210 b(113)75 366 y Fq(\017)60 b Fs(Synon)m(ym:)40 -b(patc)m(h)125 669 y(Builds)27 b(a)j(Larry)f(W)-8 b(all)30 -b(format)g(patc)m(h\(1\))h(\014le)e(b)s(et)m(w)m(een)h(t)m(w)m(o)i -(releases,)e(that)g(can)g(b)s(e)f(fed)h(directly)e(in)m(to)i(the)0 -793 y(patc)m(h)f(program)f(to)h(bring)e(an)h(old)g(release)g -(up-to-date)i(with)d(the)h(new)g(release.)41 b(\(This)27 -b(is)g(one)i(of)f(the)h(few)f Fr(cvs)0 918 y Fs(commands)33 -b(that)h(op)s(erates)f(directly)f(from)h(the)g(rep)s(ository)-8 -b(,)33 b(and)g(do)s(esn't)g(require)f(a)h(prior)f(c)m(hec)m(k)m(out.\)) -51 b(The)0 1042 y(di\013)29 b(output)h(is)f(sen)m(t)i(to)g(the)g -(standard)f(output)g(device.)125 1318 y(Y)-8 b(ou)45 -b(can)g(sp)s(ecify)e(\(using)h(the)h(standard)f(`)p Fn(-r)p -Fs(')g(and)h(`)p Fn(-D)p Fs(')f(options\))h(an)m(y)g(com)m(bination)f -(of)h(one)g(or)g(t)m(w)m(o)0 1443 y(revisions)24 b(or)h(dates.)40 -b(If)25 b(only)g(one)h(revision)d(or)j(date)g(is)f(sp)s(eci\014ed,)g -(the)h(patc)m(h)g(\014le)e(re\015ects)i(di\013erences)f(b)s(et)m(w)m -(een)0 1567 y(that)31 b(revision)e(or)h(date)h(and)f(the)g(curren)m(t)g -(head)h(revisions)d(in)h(the)i Fr(r)n(cs)e Fs(\014le.)125 -1843 y(Note)34 b(that)g(if)e(the)i(soft)m(w)m(are)h(release)e -(a\013ected)i(is)d(con)m(tained)i(in)e(more)i(than)f(one)g(directory)-8 -b(,)34 b(then)f(it)g(ma)m(y)0 1967 y(b)s(e)h(necessary)i(to)g(sp)s -(ecify)d(the)j(`)p Fn(-p)p Fs(')f(option)f(to)i(the)f(patc)m(h)h -(command)f(when)f(patc)m(hing)h(the)g(old)f(sources,)j(so)0 -2092 y(that)31 b(patc)m(h)g(is)e(able)h(to)h(\014nd)e(the)i(\014les)e +(commands)2210 b(113)0 366 y Fm(A.12)68 b(log|Prin)l(t)32 +b(out)e(log)i(information)f(for)g(\014les)75 641 y Fq(\017)60 +b Fs(Synopsis:)39 b(log)30 b([options])g([\014les)p Fh(:)15 +b(:)g(:)q Fs(])75 792 y Fq(\017)60 b Fs(Requires:)40 +b(rep)s(ository)-8 b(,)30 b(w)m(orking)f(directory)-8 +b(.)75 942 y Fq(\017)60 b Fs(Changes:)40 b(nothing.)125 +1242 y(Displa)m(y)22 b(log)h(information)f(for)h(\014les.)38 +b Fn(log)22 b Fs(used)h(to)h(call)e(the)i Fr(r)n(cs)e +Fs(utilit)m(y)g Fn(rlog)p Fs(.)37 b(Although)22 b(this)h(is)f(no)h +(longer)0 1367 y(true)j(in)e(the)i(curren)m(t)g(sources,)g(this)f +(history)g(determines)g(the)h(format)g(of)g(the)f(output)h(and)f(the)h +(options,)g(whic)m(h)0 1491 y(are)31 b(not)f(quite)g(in)f(the)i(st)m +(yle)f(of)h(the)g(other)f Fr(cvs)g Fs(commands.)125 1766 +y(The)35 b(output)g(includes)e(the)j(lo)s(cation)f(of)h(the)g +Fr(r)n(cs)f Fs(\014le,)h(the)g Fo(head)j Fs(revision)34 +b(\(the)i(latest)g(revision)e(on)i(the)0 1891 y(trunk\),)23 +b(all)f(sym)m(b)s(olic)e(names)i(\(tags\))i(and)e(some)h(other)f +(things.)37 b(F)-8 b(or)23 b(eac)m(h)h(revision,)e(the)g(revision)f(n)m +(um)m(b)s(er,)i(the)0 2015 y(author,)k(the)g(n)m(um)m(b)s(er)e(of)i +(lines)d(added/deleted)i(and)g(the)h(log)f(message)i(are)f(prin)m(ted.) +37 b(All)26 b(times)g(are)g(displa)m(y)m(ed)0 2140 y(in)j(Co)s +(ordinated)g(Univ)m(ersal)g(Time)h(\(UTC\).)g(\(Other)h(parts)f(of)g +Fr(cvs)g Fs(prin)m(t)f(times)h(in)f(the)h(lo)s(cal)g(timezone\).)0 +2562 y Fk(A.12.1)62 b(log)31 b(options)125 2837 y Fs(By)f(default,)g +Fn(log)g Fs(prin)m(ts)e(all)i(information)e(that)j(is)f(a)m(v)-5 +b(ailable.)40 b(All)29 b(other)h(options)g(restrict)g(the)h(output.)0 +3138 y Fn(-b)384 b Fs(Prin)m(t)44 b(information)g(ab)s(out)g(the)i +(revisions)d(on)i(the)g(default)g(branc)m(h,)j(normally)43 +b(the)j(highest)480 3262 y(branc)m(h)30 b(on)g(the)h(trunk.)0 +3438 y Fn(-d)f Fo(dates)147 b Fs(Prin)m(t)32 b(information)f(ab)s(out)h +(revisions)f(with)g(a)i(c)m(hec)m(kin)g(date/time)h(in)d(the)i(range)g +(giv)m(en)g(b)m(y)g(the)480 3563 y(semicolon-separated)27 +b(list)e(of)i(dates.)40 b(The)26 b(date)h(formats)f(accepted)i(are)f +(those)g(accepted)h(b)m(y)f(the)480 3687 y(`)p Fn(-D)p +Fs(')d(option)f(to)i(man)m(y)f(other)g Fr(cvs)f Fs(commands)g(\(see)i +(Section)f(A.4)g([Common)g(options],)h(page)f(92\).)480 +3812 y(Dates)32 b(can)e(b)s(e)g(com)m(bined)g(in)m(to)g(ranges)h(as)f +(follo)m(ws:)480 3988 y Fo(d1)7 b Fn(<)p Fo(d2)480 4112 +y(d2)g Fn(>)p Fo(d1)233 b Fs(Select)31 b(the)f(revisions)f(that)i(w)m +(ere)f(dep)s(osited)g(b)s(et)m(w)m(een)h Fo(d1)37 b Fs(and)30 +b Fo(d2)p Fs(.)480 4288 y Fn(<)p Fo(d)480 4413 y(d)t +Fn(>)377 b Fs(Select)31 b(all)e(revisions)f(dated)j Fo(d)i +Fs(or)e(earlier.)480 4589 y Fo(d)t Fn(<)480 4713 y(>)p +Fo(d)381 b Fs(Select)31 b(all)e(revisions)f(dated)j Fo(d)i +Fs(or)e(later.)480 4889 y Fo(d)429 b Fs(Select)31 b(the)f(single,)f +(latest)i(revision)e(dated)i Fo(d)i Fs(or)d(earlier.)480 +5065 y(The)k(`)p Fn(>)p Fs(')h(or)g(`)p Fn(<)p Fs(')g(c)m(haracters)h +(ma)m(y)f(b)s(e)f(follo)m(w)m(ed)g(b)m(y)h(`)p Fn(=)p +Fs(')g(to)g(indicate)f(an)h(inclusiv)m(e)d(range)j(rather)480 +5190 y(than)30 b(an)g(exclusiv)m(e)g(one.)480 5340 y(Note)i(that)f(the) +f(separator)h(is)f(a)g(semicolon)g(\(;\).)p eop +%%Page: 114 116 +114 115 bop 0 -116 a Fs(114)2366 b(CVS|Concurren)m(t)29 +b(V)-8 b(ersions)30 b(System)0 366 y Fn(-h)384 b Fs(Prin)m(t)39 +b(only)g(the)i Fr(r)n(cs)e Fs(pathname,)j(w)m(orking)e(pathname,)j +(head,)f(default)d(branc)m(h,)k(access)e(list,)480 491 +y(lo)s(c)m(ks,)31 b(sym)m(b)s(olic)d(names,)j(and)f(su\016x.)0 +674 y Fn(-l)384 b Fs(Lo)s(cal;)30 b(run)f(only)h(in)f(curren)m(t)h(w)m +(orking)g(directory)-8 b(.)40 b(\(Default)31 b(is)f(to)h(run)e +(recursiv)m(ely\).)0 857 y Fn(-N)384 b Fs(Do)29 b(not)g(prin)m(t)d(the) +j(list)e(of)h(tags)h(for)f(this)f(\014le.)39 b(This)27 +b(option)h(can)g(b)s(e)g(v)m(ery)g(useful)f(when)g(y)m(our)h(site)480 +982 y(uses)33 b(a)i(lot)f(of)g(tags,)i(so)e(rather)g(than)f +Fn(")p Fs(more)p Fn(")p Fs('ing)g(o)m(v)m(er)i(3)g(pages)f(of)g(tag)h +(information,)f(the)g(log)480 1106 y(information)29 b(is)g(presen)m +(ted)h(without)g(tags)h(at)g(all.)0 1289 y Fn(-R)384 +b Fs(Prin)m(t)29 b(only)h(the)g(name)h(of)f(the)h Fr(r)n(cs)e +Fs(history)h(\014le.)0 1472 y Fn(-r)p Fo(revisions)480 +1597 y Fs(Prin)m(t)i(information)e(ab)s(out)j(revisions)d(giv)m(en)j +(in)e(the)i(comma-separated)h(list)d Fo(revisions)k Fs(of)d(revi-)480 +1722 y(sions)d(and)h(ranges.)41 b(The)30 b(follo)m(wing)f(table)h +(explains)e(the)j(a)m(v)-5 b(ailable)30 b(range)g(formats:)480 +1905 y Fo(rev1)7 b Fn(:)p Fo(rev2)87 b Fs(Revisions)29 +b Fo(rev1)38 b Fs(to)31 b Fo(rev2)38 b Fs(\(whic)m(h)29 +b(m)m(ust)i(b)s(e)e(on)i(the)f(same)h(branc)m(h\).)480 +2088 y Fn(:)p Fo(rev)308 b Fs(Revisions)29 b(from)h(the)g(b)s(eginning) +e(of)i(the)h(branc)m(h)f(up)f(to)i(and)f(including)d +Fo(rev)p Fs(.)480 2271 y Fo(rev)8 b Fn(:)300 b Fs(Revisions)29 +b(starting)h(with)f Fo(rev)38 b Fs(to)31 b(the)g(end)e(of)i(the)g +(branc)m(h)e(con)m(taining)h Fo(rev)p Fs(.)480 2454 y +Fo(branc)m(h)209 b Fs(An)30 b(argumen)m(t)h(that)g(is)e(a)i(branc)m(h)f +(means)g(all)f(revisions)g(on)h(that)h(branc)m(h.)480 +2637 y Fo(branc)m(h1)7 b Fn(:)p Fo(branc)m(h2)960 2761 +y Fs(A)30 b(range)h(of)g(branc)m(hes)f(means)g(all)f(revisions)g(on)h +(the)h(branc)m(hes)f(in)f(that)i(range.)480 2945 y Fo(branc)m(h)p +Fn(.)161 b Fs(The)30 b(latest)h(revision)d(in)i Fo(branc)m(h)p +Fs(.)480 3128 y(A)d(bare)g(`)p Fn(-r)p Fs(')g(with)e(no)i(revisions)e +(means)i(the)g(latest)g(revision)f(on)g(the)h(default)g(branc)m(h,)g +(normally)480 3252 y(the)k(trunk.)39 b(There)30 b(can)h(b)s(e)e(no)i +(space)g(b)s(et)m(w)m(een)g(the)f(`)p Fn(-r)p Fs(')g(option)g(and)g +(its)g(argumen)m(t.)0 3435 y Fn(-s)g Fo(states)127 b +Fs(Prin)m(t)28 b(information)f(ab)s(out)h(revisions)f(whose)h(state)i +(attributes)f(matc)m(h)g(one)g(of)g(the)g(states)h(giv)m(en)480 +3560 y(in)f(the)i(comma-separated)h(list)d Fo(states)p +Fs(.)0 3743 y Fn(-t)384 b Fs(Prin)m(t)29 b(the)i(same)g(as)f(`)p +Fn(-h)p Fs(',)h(plus)d(the)j(descriptiv)m(e)e(text.)0 +3926 y Fn(-w)p Fo(logins)155 b Fs(Prin)m(t)34 b(information)g(ab)s(out) +h(revisions)e(c)m(hec)m(k)m(ed)k(in)d(b)m(y)i(users)e(with)g(login)g +(names)h(app)s(earing)f(in)480 4051 y(the)25 b(comma-separated)g(list)e +Fo(logins)p Fs(.)38 b(If)24 b Fo(logins)i Fs(is)e(omitted,)i(the)e +(user's)g(login)f(is)g(assumed.)38 b(There)480 4175 y(can)31 +b(b)s(e)e(no)i(space)g(b)s(et)m(w)m(een)g(the)f(`)p Fn(-w)p +Fs(')g(option)g(and)g(its)g(argumen)m(t.)125 4483 y Fn(log)i +Fs(prin)m(ts)g(the)h(in)m(tersection)g(of)h(the)f(revisions)f(selected) +i(with)e(the)h(options)g(`)p Fn(-d)p Fs(',)h(`)p Fn(-s)p +Fs(',)g(and)f(`)p Fn(-w)p Fs(',)h(in)m(ter-)0 4607 y(sected)d(with)e +(the)i(union)d(of)j(the)f(revisions)f(selected)i(b)m(y)f(`)p +Fn(-b)p Fs(')g(and)g(`)p Fn(-r)p Fs('.)0 5062 y Fk(A.12.2)62 +b(log)31 b(examples)125 5340 y Fs(Con)m(tributed)d(examples)i(are)h +(gratefully)e(accepted.)p eop +%%Page: 115 117 +115 116 bop 0 -116 a Fs(App)s(endix)28 b(A:)i(Guide)g(to)h(CVS)e +(commands)2210 b(115)0 366 y Fm(A.13)68 b(rdi\013|'patc)l(h')32 +b(format)f(di\013s)g(b)t(et)l(w)l(een)h(releases)75 646 +y Fq(\017)60 b Fs(rdi\013)29 b([-\015ags])i([-V)g(vn])f([-r)h(t)p +Fn(|)p Fs(-D)g(d)f([-r)g(t2)p Fn(|)p Fs(-D)i(d2]])e(mo)s(dules)p +Fh(:)15 b(:)g(:)75 802 y Fq(\017)60 b Fs(Requires:)40 +b(rep)s(ository)-8 b(.)75 957 y Fq(\017)60 b Fs(Changes:)40 +b(nothing.)75 1112 y Fq(\017)60 b Fs(Synon)m(ym:)40 b(patc)m(h)125 +1423 y(Builds)27 b(a)j(Larry)f(W)-8 b(all)30 b(format)g(patc)m(h\(1\))h +(\014le)e(b)s(et)m(w)m(een)h(t)m(w)m(o)i(releases,)e(that)g(can)g(b)s +(e)f(fed)h(directly)e(in)m(to)i(the)0 1547 y(patc)m(h)f(program)f(to)h +(bring)e(an)h(old)g(release)g(up-to-date)i(with)d(the)h(new)g(release.) +41 b(\(This)27 b(is)g(one)i(of)f(the)h(few)f Fr(cvs)0 +1672 y Fs(commands)33 b(that)h(op)s(erates)f(directly)f(from)h(the)g +(rep)s(ository)-8 b(,)33 b(and)g(do)s(esn't)g(require)f(a)h(prior)f(c)m +(hec)m(k)m(out.\))51 b(The)0 1796 y(di\013)29 b(output)h(is)f(sen)m(t)i +(to)g(the)g(standard)f(output)g(device.)125 2076 y(Y)-8 +b(ou)45 b(can)g(sp)s(ecify)e(\(using)h(the)h(standard)f(`)p +Fn(-r)p Fs(')g(and)h(`)p Fn(-D)p Fs(')f(options\))h(an)m(y)g(com)m +(bination)f(of)h(one)g(or)g(t)m(w)m(o)0 2201 y(revisions)24 +b(or)h(dates.)40 b(If)25 b(only)g(one)h(revision)d(or)j(date)g(is)f(sp) +s(eci\014ed,)g(the)h(patc)m(h)g(\014le)e(re\015ects)i(di\013erences)f +(b)s(et)m(w)m(een)0 2325 y(that)31 b(revision)e(or)h(date)h(and)f(the)g +(curren)m(t)g(head)h(revisions)d(in)h(the)i Fr(r)n(cs)e +Fs(\014le.)125 2605 y(Note)34 b(that)g(if)e(the)i(soft)m(w)m(are)h +(release)e(a\013ected)i(is)d(con)m(tained)i(in)e(more)i(than)f(one)g +(directory)-8 b(,)34 b(then)f(it)g(ma)m(y)0 2729 y(b)s(e)h(necessary)i +(to)g(sp)s(ecify)d(the)j(`)p Fn(-p)p Fs(')f(option)f(to)i(the)f(patc)m +(h)h(command)f(when)f(patc)m(hing)h(the)g(old)f(sources,)j(so)0 +2854 y(that)31 b(patc)m(h)g(is)e(able)h(to)h(\014nd)e(the)i(\014les)e (that)i(are)g(lo)s(cated)g(in)e(other)h(directories.)0 -2522 y Fk(A.13.1)62 b(rdi\013)31 b(options)125 2798 y +3322 y Fk(A.13.1)62 b(rdi\013)31 b(options)125 3601 y Fs(These)j(standard)g(options)g(are)h(supp)s(orted)e(b)m(y)i -Fn(rdiff)e Fs(\(see)j(Section)e(A.4)i([Common)f(options],)g(page)h(90,) -0 2922 y(for)30 b(a)h(complete)g(description)d(of)j(them\):)0 -3224 y Fn(-D)f Fo(date)183 b Fs(Use)31 b(the)f(most)h(recen)m(t)g -(revision)e(no)h(later)h(than)f Fo(date)p Fs(.)0 3402 +Fn(rdiff)e Fs(\(see)j(Section)e(A.4)i([Common)f(options],)g(page)h(92,) +0 3726 y(for)30 b(a)h(complete)g(description)d(of)j(them\):)0 +4036 y Fn(-D)f Fo(date)183 b Fs(Use)31 b(the)f(most)h(recen)m(t)g +(revision)e(no)h(later)h(than)f Fo(date)p Fs(.)0 4222 y Fn(-f)384 b Fs(If)30 b(no)h(matc)m(hing)g(revision)e(is)h(found,)g (retriev)m(e)i(the)f(most)g(recen)m(t)h(revision)d(\(instead)h(of)i -(ignoring)480 3527 y(the)f(\014le\).)0 3704 y Fn(-l)384 +(ignoring)480 4347 y(the)f(\014le\).)0 4533 y Fn(-l)384 b Fs(Lo)s(cal;)30 b(don't)h(descend)f(sub)s(directories.)0 -3882 y Fn(-r)g Fo(tag)229 b Fs(Use)31 b(revision)d Fo(tag)p -Fs(.)125 4184 y(In)h(addition)g(to)i(the)f(ab)s(o)m(v)m(e,)i(these)f -(options)f(are)h(a)m(v)-5 b(ailable:)0 4486 y Fn(-c)384 +4719 y Fn(-r)g Fo(tag)229 b Fs(Use)31 b(revision)d Fo(tag)p +Fs(.)125 5029 y(In)h(addition)g(to)i(the)f(ab)s(o)m(v)m(e,)i(these)f +(options)f(are)h(a)m(v)-5 b(ailable:)0 5340 y Fn(-c)384 b Fs(Use)31 b(the)f(con)m(text)j(di\013)c(format.)41 -b(This)28 b(is)i(the)g(default)g(format.)0 4664 y Fn(-s)384 -b Fs(Create)23 b(a)f(summary)f(c)m(hange)i(rep)s(ort)e(instead)g(of)h -(a)g(patc)m(h.)39 b(The)21 b(summary)g(includes)f(information)480 -4789 y(ab)s(out)28 b(\014les)f(that)i(w)m(ere)g(c)m(hanged)g(or)g -(added)e(b)s(et)m(w)m(een)i(the)g(releases.)40 b(It)29 -b(is)e(sen)m(t)i(to)g(the)g(standard)480 4913 y(output)38 -b(device.)66 b(This)37 b(is)h(useful)f(for)h(\014nding)f(out,)k(for)d -(example,)j(whic)m(h)d(\014les)f(ha)m(v)m(e)j(c)m(hanged)480 -5038 y(b)s(et)m(w)m(een)31 b(t)m(w)m(o)h(dates)f(or)f(revisions.)0 -5215 y Fn(-t)384 b Fs(A)25 b(di\013)e(of)i(the)g(top)g(t)m(w)m(o)h -(revisions)d(is)h(sen)m(t)h(to)g(the)g(standard)f(output)g(device.)39 -b(This)23 b(is)h(most)h(useful)480 5340 y(for)30 b(seeing)g(what)h(the) -f(last)g(c)m(hange)i(to)f(a)g(\014le)e(w)m(as.)p eop -%%Page: 114 116 -114 115 bop 0 -116 a Fs(114)2366 b(CVS|Concurren)m(t)29 -b(V)-8 b(ersions)30 b(System)0 366 y Fn(-u)384 b Fs(Use)38 -b(the)g(unidi\013)c(format)k(for)f(the)h(con)m(text)h(di\013s.)61 -b(This)36 b(option)h(is)g(not)g(a)m(v)-5 b(ailable)37 -b(if)g(y)m(our)g(di\013)480 491 y(do)s(es)25 b(not)g(supp)s(ort)e(the)i -(unidi\013)c(format.)40 b(Remem)m(b)s(er)24 b(that)i(old)e(v)m(ersions) -g(of)h(the)g Fn(patch)e Fs(program)480 616 y(can't)30 -b(handle)d(the)i(unidi\013)d(format,)k(so)f(if)f(y)m(ou)i(plan)d(to)j -(p)s(ost)e(this)g(patc)m(h)i(to)f(the)h(net)f(y)m(ou)g(should)480 -740 y(probably)g(not)h(use)g(`)p Fn(-u)p Fs('.)0 923 -y Fn(-V)g Fo(vn)255 b Fs(Expand)29 b Fr(r)n(cs)f Fs(k)m(eyw)m(ords)j -(according)e(to)i(the)f(rules)e(curren)m(t)i(in)e Fr(r)n(cs)h -Fs(v)m(ersion)g Fo(vn)h Fs(\(the)g(expansion)480 1047 -y(format)h(c)m(hanged)g(with)e Fr(r)n(cs)g Fs(v)m(ersion)h(5\).)0 -1500 y Fk(A.13.2)62 b(rdi\013)31 b(examples)125 1778 +b(This)28 b(is)i(the)g(default)g(format.)p eop +%%Page: 116 118 +116 117 bop 0 -116 a Fs(116)2366 b(CVS|Concurren)m(t)29 +b(V)-8 b(ersions)30 b(System)0 366 y Fn(-s)384 b Fs(Create)23 +b(a)f(summary)f(c)m(hange)i(rep)s(ort)e(instead)g(of)h(a)g(patc)m(h.)39 +b(The)21 b(summary)g(includes)f(information)480 491 y(ab)s(out)28 +b(\014les)f(that)i(w)m(ere)g(c)m(hanged)g(or)g(added)e(b)s(et)m(w)m +(een)i(the)g(releases.)40 b(It)29 b(is)e(sen)m(t)i(to)g(the)g(standard) +480 616 y(output)38 b(device.)66 b(This)37 b(is)h(useful)f(for)h +(\014nding)f(out,)k(for)d(example,)j(whic)m(h)d(\014les)f(ha)m(v)m(e)j +(c)m(hanged)480 740 y(b)s(et)m(w)m(een)31 b(t)m(w)m(o)h(dates)f(or)f +(revisions.)0 908 y Fn(-t)384 b Fs(A)25 b(di\013)e(of)i(the)g(top)g(t)m +(w)m(o)h(revisions)d(is)h(sen)m(t)h(to)g(the)g(standard)f(output)g +(device.)39 b(This)23 b(is)h(most)h(useful)480 1032 y(for)30 +b(seeing)g(what)h(the)f(last)g(c)m(hange)i(to)f(a)g(\014le)e(w)m(as.)0 +1200 y Fn(-u)384 b Fs(Use)38 b(the)g(unidi\013)c(format)k(for)f(the)h +(con)m(text)h(di\013s.)61 b(This)36 b(option)h(is)g(not)g(a)m(v)-5 +b(ailable)37 b(if)g(y)m(our)g(di\013)480 1324 y(do)s(es)25 +b(not)g(supp)s(ort)e(the)i(unidi\013)c(format.)40 b(Remem)m(b)s(er)24 +b(that)i(old)e(v)m(ersions)g(of)h(the)g Fn(patch)e Fs(program)480 +1449 y(can't)30 b(handle)d(the)i(unidi\013)d(format,)k(so)f(if)f(y)m +(ou)i(plan)d(to)j(p)s(ost)e(this)g(patc)m(h)i(to)f(the)h(net)f(y)m(ou)g +(should)480 1574 y(probably)g(not)h(use)g(`)p Fn(-u)p +Fs('.)0 1741 y Fn(-V)g Fo(vn)255 b Fs(Expand)29 b Fr(r)n(cs)f +Fs(k)m(eyw)m(ords)j(according)e(to)i(the)f(rules)e(curren)m(t)i(in)e +Fr(r)n(cs)h Fs(v)m(ersion)g Fo(vn)h Fs(\(the)g(expansion)480 +1866 y(format)h(c)m(hanged)g(with)e Fr(r)n(cs)g Fs(v)m(ersion)h(5\).)0 +2267 y Fk(A.13.2)62 b(rdi\013)31 b(examples)125 2541 y Fs(Supp)s(ose)37 b(y)m(ou)j(receiv)m(e)h(mail)d(from)h Fn(foo@bar.com)e Fs(asking)i(for)g(an)h(up)s(date)f(from)g(release)h -(1.2)h(to)f(1.4)h(of)0 1903 y(the)32 b(tc)h(compiler.)44 +(1.2)h(to)f(1.4)h(of)0 2666 y(the)32 b(tc)h(compiler.)44 b(Y)-8 b(ou)33 b(ha)m(v)m(e)g(no)f(suc)m(h)g(patc)m(hes)g(on)g(hand,)g (but)f(with)g Fr(cvs)g Fs(that)i(can)f(easily)f(b)s(e)g(\014xed)h(with) -f(a)0 2027 y(command)f(suc)m(h)g(as)h(this:)240 2285 +f(a)0 2791 y(command)f(suc)m(h)g(as)h(this:)240 3044 y Fn($)47 b(cvs)g(rdiff)g(-c)g(-r)g(FOO1_2)f(-r)h(FOO1_4)f(tc)i(|)f(\\) -240 2388 y($$)g(Mail)g(-s)g('The)g(patches)e(you)i(asked)g(for')f -(foo@bar.com)125 2666 y Fs(Supp)s(ose)18 b(y)m(ou)j(ha)m(v)m(e)h(made)e +240 3148 y($$)g(Mail)g(-s)g('The)g(patches)e(you)i(asked)g(for')f +(foo@bar.com)125 3421 y Fs(Supp)s(ose)18 b(y)m(ou)j(ha)m(v)m(e)h(made)e (release)h(1.3,)j(and)c(fork)m(ed)g(a)h(branc)m(h)f(called)g(`)p Fn(R_1_3fix)p Fs(')f(for)h(bug\014xes.)36 b(`)p Fn(R_1_3_1)p -Fs(')0 2791 y(corresp)s(onds)h(to)j(release)f(1.3.1,)k(whic)m(h)37 +Fs(')0 3546 y(corresp)s(onds)h(to)j(release)f(1.3.1,)k(whic)m(h)37 b(w)m(as)i(made)g(some)g(time)f(ago.)67 b(No)m(w,)42 b(y)m(ou)d(w)m(an)m(t)g(to)h(see)f(ho)m(w)g(m)m(uc)m(h)0 -2915 y(dev)m(elopmen)m(t)31 b(has)f(b)s(een)g(done)g(on)g(the)h(branc)m +3671 y(dev)m(elopmen)m(t)31 b(has)f(b)s(een)g(done)g(on)g(the)h(branc)m (h.)40 b(This)28 b(command)i(can)h(b)s(e)f(used:)240 -3173 y Fn($)47 b(cvs)g(patch)g(-s)g(-r)g(R_1_3_1)f(-r)h(R_1_3fix)f -(module-name)240 3277 y(cvs)h(rdiff:)f(Diffing)g(module-name)240 -3380 y(File)h(ChangeLog,v)d(changed)i(from)h(revision)e(1.52.2.5)h(to)h -(1.52.2.6)240 3484 y(File)g(foo.c,v)e(changed)h(from)h(revision)e -(1.52.2.3)h(to)h(1.52.2.4)240 3588 y(File)g(bar.h,v)e(changed)h(from)h -(revision)e(1.29.2.1)h(to)h(1.2)0 4074 y Fm(A.14)68 b(release|Indicate) +3924 y Fn($)47 b(cvs)g(patch)g(-s)g(-r)g(R_1_3_1)f(-r)h(R_1_3fix)f +(module-name)240 4028 y(cvs)h(rdiff:)f(Diffing)g(module-name)240 +4131 y(File)h(ChangeLog,v)d(changed)i(from)h(revision)e(1.52.2.5)h(to)h +(1.52.2.6)240 4235 y(File)g(foo.c,v)e(changed)h(from)h(revision)e +(1.52.2.3)h(to)h(1.52.2.4)240 4339 y(File)g(bar.h,v)e(changed)h(from)h +(revision)e(1.29.2.1)h(to)h(1.2)0 4774 y Fm(A.14)68 b(release|Indicate) 33 b(that)e(a)g(Mo)t(dule)f(is)g(no)h(longer)g(in)f(use)75 -4352 y Fq(\017)60 b Fs(release)31 b([-d])f(directories)p -Fh(:)15 b(:)g(:)75 4506 y Fq(\017)60 b Fs(Requires:)40 -b(W)-8 b(orking)30 b(directory)-8 b(.)75 4659 y Fq(\017)60 +5048 y Fq(\017)60 b Fs(release)31 b([-d])f(directories)p +Fh(:)15 b(:)g(:)75 5194 y Fq(\017)60 b Fs(Requires:)40 +b(W)-8 b(orking)30 b(directory)-8 b(.)75 5340 y Fq(\017)60 b Fs(Changes:)40 b(W)-8 b(orking)31 b(directory)-8 b(,)30 -b(history)g(log.)125 4966 y(This)j(command)j(is)f(mean)m(t)h(to)h +b(history)g(log.)p eop +%%Page: 117 119 +117 118 bop 0 -116 a Fs(App)s(endix)28 b(A:)i(Guide)g(to)h(CVS)e +(commands)2210 b(117)125 366 y(This)33 b(command)j(is)f(mean)m(t)h(to)h (safely)e(cancel)h(the)g(e\013ect)h(of)f(`)p Fn(cvs)29 b(checkout)p Fs('.)55 b(Since)35 b Fr(cvs)f Fs(do)s(esn't)i(lo)s(c)m(k) -0 5091 y(\014les,)f(it)f(isn't)f(strictly)h(necessary)h(to)g(use)f -(this)g(command.)53 b(Y)-8 b(ou)35 b(can)f(alw)m(a)m(ys)h(simply)d -(delete)j(y)m(our)g(w)m(orking)0 5215 y(directory)-8 -b(,)28 b(if)e(y)m(ou)h(lik)m(e;)h(but)e(y)m(ou)i(risk)d(losing)h(c)m -(hanges)i(y)m(ou)g(ma)m(y)f(ha)m(v)m(e)i(forgotten,)g(and)d(y)m(ou)i -(lea)m(v)m(e)g(no)f(trace)h(in)0 5340 y(the)e Fr(cvs)g -Fs(history)f(\014le)g(\(see)i(Section)f(C.10)h([history)f(\014le],)g -(page)h(147\))h(that)f(y)m(ou'v)m(e)h(abandoned)d(y)m(our)h(c)m(hec)m -(k)m(out.)p eop -%%Page: 115 117 -115 116 bop 0 -116 a Fs(App)s(endix)28 b(A:)i(Guide)g(to)h(CVS)e -(commands)2210 b(115)125 366 y(Use)23 b(`)p Fn(cvs)30 +0 491 y(\014les,)f(it)f(isn't)f(strictly)h(necessary)h(to)g(use)f(this) +g(command.)53 b(Y)-8 b(ou)35 b(can)f(alw)m(a)m(ys)h(simply)d(delete)j +(y)m(our)g(w)m(orking)0 616 y(directory)-8 b(,)28 b(if)e(y)m(ou)h(lik)m +(e;)h(but)e(y)m(ou)i(risk)d(losing)h(c)m(hanges)i(y)m(ou)g(ma)m(y)f(ha) +m(v)m(e)i(forgotten,)g(and)d(y)m(ou)i(lea)m(v)m(e)g(no)f(trace)h(in)0 +740 y(the)e Fr(cvs)g Fs(history)f(\014le)g(\(see)i(Section)f(C.10)h +([history)f(\014le],)g(page)h(149\))h(that)f(y)m(ou'v)m(e)h(abandoned)d +(y)m(our)h(c)m(hec)m(k)m(out.)125 1020 y(Use)d(`)p Fn(cvs)30 b(release)p Fs(')21 b(to)j(a)m(v)m(oid)f(these)g(problems.)37 b(This)21 b(command)i(c)m(hec)m(ks)h(that)g(no)f(uncommitted)f(c)m -(hanges)0 491 y(are)33 b(presen)m(t;)i(that)f(y)m(ou)f(are)g(executing) -h(it)e(from)h(immediately)e(ab)s(o)m(v)m(e)j(a)g Fr(cvs)e -Fs(w)m(orking)g(directory;)i(and)e(that)0 616 y(the)d(rep)s(ository)e -(recorded)h(for)h(y)m(our)f(\014les)g(is)f(the)i(same)g(as)g(the)f(rep) -s(ository)g(de\014ned)f(in)g(the)i(mo)s(dule)e(database.)125 -892 y(If)h(all)g(these)h(conditions)f(are)h(true,)g(`)p +(hanges)0 1144 y(are)33 b(presen)m(t;)i(that)f(y)m(ou)f(are)g +(executing)h(it)e(from)h(immediately)e(ab)s(o)m(v)m(e)j(a)g +Fr(cvs)e Fs(w)m(orking)g(directory;)i(and)e(that)0 1269 +y(the)d(rep)s(ository)e(recorded)h(for)h(y)m(our)f(\014les)g(is)f(the)i +(same)g(as)g(the)f(rep)s(ository)g(de\014ned)f(in)g(the)i(mo)s(dule)e +(database.)125 1548 y(If)h(all)g(these)h(conditions)f(are)h(true,)g(`)p Fn(cvs)h(release)p Fs(')d(lea)m(v)m(es)j(a)g(record)f(of)g(its)f -(execution)h(\(attesting)h(to)g(y)m(our)0 1017 y(in)m(ten)m(tionally)f +(execution)h(\(attesting)h(to)g(y)m(our)0 1673 y(in)m(ten)m(tionally)f (abandoning)g(y)m(our)h(c)m(hec)m(k)m(out\))j(in)c(the)i -Fr(cvs)e Fs(history)g(log.)0 1456 y Fk(A.14.1)62 b(release)31 -b(options)125 1733 y Fs(The)e Fn(release)g Fs(command)h(supp)s(orts)e -(one)j(command)f(option:)0 2037 y Fn(-d)384 b Fs(Delete)27 +Fr(cvs)e Fs(history)g(log.)0 2139 y Fk(A.14.1)62 b(release)31 +b(options)125 2419 y Fs(The)e Fn(release)g Fs(command)h(supp)s(orts)e +(one)j(command)f(option:)0 2729 y Fn(-d)384 b Fs(Delete)27 b(y)m(our)f(w)m(orking)f(cop)m(y)i(of)f(the)g(\014le)f(if)g(the)h (release)h(succeeds.)39 b(If)26 b(this)f(\015ag)h(is)f(not)h(giv)m(en)g -(y)m(our)480 2162 y(\014les)j(will)f(remain)h(in)g(y)m(our)i(w)m -(orking)e(directory)-8 b(.)480 2314 y Fi(W)g(arning:)66 +(y)m(our)480 2853 y(\014les)j(will)f(remain)h(in)g(y)m(our)i(w)m +(orking)e(directory)-8 b(.)480 3008 y Fi(W)g(arning:)66 b Fs(The)43 b Fn(release)e Fs(command)i(deletes)g(all)f(directories)g (and)h(\014les)f(recursiv)m(ely)-8 b(.)78 b(This)480 -2438 y(has)37 b(the)h(v)m(ery)g(serious)e(side-e\013ect)j(that)f(an)m +3133 y(has)37 b(the)h(v)m(ery)g(serious)e(side-e\013ect)j(that)f(an)m (y)g(directory)f(that)h(y)m(ou)f(ha)m(v)m(e)i(created)g(inside)c(y)m -(our)480 2563 y(c)m(hec)m(k)m(ed-out)43 b(sources,)f(and)d(not)i(added) +(our)480 3257 y(c)m(hec)m(k)m(ed-out)43 b(sources,)f(and)d(not)i(added) e(to)i(the)f(rep)s(ository)f(\(using)f(the)j Fn(add)e -Fs(command;)44 b(see)480 2687 y(Chapter)30 b(10)h([Adding)e(\014les],)h -(page)h(57\))g(will)d(b)s(e)i(silen)m(tly)f(deleted|ev)m(en)h(if)g(it)g -(is)f(non-empt)m(y!)0 3127 y Fk(A.14.2)62 b(release)31 -b(output)125 3403 y Fs(Before)40 b Fn(release)e Fs(releases)h(y)m(our)h +Fs(command;)44 b(see)480 3382 y(Chapter)30 b(10)h([Adding)e(\014les],)h +(page)h(59\))g(will)d(b)s(e)i(silen)m(tly)f(deleted|ev)m(en)h(if)g(it)g +(is)f(non-empt)m(y!)0 3848 y Fk(A.14.2)62 b(release)31 +b(output)125 4128 y Fs(Before)40 b Fn(release)e Fs(releases)h(y)m(our)h (sources)g(it)f(will)e(prin)m(t)h(a)i(one-line)e(message)j(for)e(an)m -(y)h(\014le)f(that)h(is)f(not)0 3528 y(up-to-date.)125 -3805 y Fi(W)-8 b(arning:)70 b Fs(An)m(y)45 b(new)f(directories)g(that)i +(y)h(\014le)f(that)h(is)f(not)0 4252 y(up-to-date.)125 +4532 y Fi(W)-8 b(arning:)70 b Fs(An)m(y)45 b(new)f(directories)g(that)i (y)m(ou)f(ha)m(v)m(e)i(created,)j(but)44 b(not)h(added)f(to)i(the)f -Fr(cvs)f Fs(directory)0 3929 y(hierarc)m(h)m(y)33 b(with)f(the)h +Fr(cvs)f Fs(directory)0 4656 y(hierarc)m(h)m(y)33 b(with)f(the)h Fn(add)g Fs(command)g(\(see)h(Chapter)f(10)h([Adding)e(\014les],)h -(page)h(57\))h(will)c(b)s(e)h(silen)m(tly)g(ignored)0 -4054 y(\(and)e(deleted,)h(if)e(`)p Fn(-d)p Fs(')h(is)g(sp)s +(page)h(59\))h(will)c(b)s(e)h(silen)m(tly)g(ignored)0 +4781 y(\(and)e(deleted,)h(if)e(`)p Fn(-d)p Fs(')h(is)g(sp)s (eci\014ed\),)f(ev)m(en)i(if)e(they)i(con)m(tain)f(\014les.)0 -4358 y Fn(U)g Fo(\014le)0 4482 y Fn(P)g Fo(\014le)285 +5091 y Fn(U)g Fo(\014le)0 5215 y Fn(P)g Fo(\014le)285 b Fs(There)32 b(exists)g(a)i(new)m(er)e(revision)f(of)i(this)e(\014le)h (in)g(the)g(rep)s(ository)-8 b(,)33 b(and)f(y)m(ou)h(ha)m(v)m(e)h(not)f -(mo)s(di\014ed)480 4607 y(y)m(our)d(lo)s(cal)g(cop)m(y)h(of)g(the)f +(mo)s(di\014ed)480 5340 y(y)m(our)d(lo)s(cal)g(cop)m(y)h(of)g(the)f (\014le)g(\(`)p Fn(U)p Fs(')h(and)e(`)p Fn(P)p Fs(')i(mean)f(the)h -(same)g(thing\).)0 4787 y Fn(A)f Fo(\014le)285 b Fs(The)41 -b(\014le)f(has)i(b)s(een)e(added)h(to)h(y)m(our)g(priv)-5 +(same)g(thing\).)p eop +%%Page: 118 120 +118 119 bop 0 -116 a Fs(118)2366 b(CVS|Concurren)m(t)29 +b(V)-8 b(ersions)30 b(System)0 366 y Fn(A)g Fo(\014le)285 +b Fs(The)41 b(\014le)f(has)i(b)s(een)e(added)h(to)h(y)m(our)g(priv)-5 b(ate)41 b(cop)m(y)h(of)f(the)h(sources,)i(but)d(has)g(not)h(y)m(et)h -(b)s(een)480 4911 y(committed)26 b(to)h(the)f(rep)s(ository)-8 +(b)s(een)480 491 y(committed)26 b(to)h(the)f(rep)s(ository)-8 b(.)39 b(If)26 b(y)m(ou)g(delete)g(y)m(our)g(cop)m(y)h(of)f(the)h -(sources)f(this)f(\014le)g(will)e(b)s(e)j(lost.)0 5091 +(sources)f(this)f(\014le)g(will)e(b)s(e)j(lost.)0 652 y Fn(R)k Fo(\014le)285 b Fs(The)43 b(\014le)f(has)h(b)s(een)g(remo)m(v) m(ed)h(from)f(y)m(our)g(priv)-5 b(ate)43 b(cop)m(y)h(of)f(the)h -(sources,)j(but)42 b(has)h(not)h(y)m(et)480 5215 y(b)s(een)29 +(sources,)j(but)42 b(has)h(not)h(y)m(et)480 776 y(b)s(een)29 b(remo)m(v)m(ed)i(from)e(the)g(rep)s(ository)-8 b(,)30 b(since)f(y)m(ou)h(ha)m(v)m(e)h(not)f(y)m(et)g(committed)g(the)g(remo)m -(v)-5 b(al.)41 b(See)480 5340 y(Section)30 b(A.7)h([commit],)g(page)h -(99.)p eop -%%Page: 116 118 -116 117 bop 0 -116 a Fs(116)2366 b(CVS|Concurren)m(t)29 -b(V)-8 b(ersions)30 b(System)0 366 y Fn(M)g Fo(\014le)285 -b Fs(The)35 b(\014le)f(is)h(mo)s(di\014ed)e(in)h(y)m(our)i(w)m(orking)e -(directory)-8 b(.)56 b(There)35 b(migh)m(t)g(also)h(b)s(e)e(a)i(new)m -(er)g(revision)480 491 y(inside)28 b(the)j(rep)s(ository)-8 -b(.)0 707 y Fn(?)30 b Fo(\014le)285 b(\014le)43 b Fs(is)38 -b(in)f(y)m(our)i(w)m(orking)f(directory)-8 b(,)40 b(but)e(do)s(es)h -(not)g(corresp)s(ond)e(to)i(an)m(ything)g(in)e(the)i(source)480 -831 y(rep)s(ository)-8 b(,)27 b(and)e(is)h(not)g(in)f(the)i(list)d(of)j -(\014les)e(for)h Fr(cvs)f Fs(to)i(ignore)f(\(see)h(the)g(description)d -(of)j(the)f(`)p Fn(-I)p Fs(')480 956 y(option,)h(and)e(see)h(Section)g -(C.9)g([cvsignore],)i(page)e(146\).)41 b(If)26 b(y)m(ou)g(remo)m(v)m(e) -i(y)m(our)d(w)m(orking)h(sources,)480 1080 y(this)j(\014le)h(will)d(b)s -(e)j(lost.)0 1681 y Fk(A.14.3)62 b(release)31 b(examples)125 -1976 y Fs(Release)g(the)f(mo)s(dule,)f(and)h(delete)g(y)m(our)h(lo)s +(v)-5 b(al.)41 b(See)480 901 y(Section)30 b(A.7)h([commit],)g(page)h +(101.)0 1061 y Fn(M)e Fo(\014le)285 b Fs(The)35 b(\014le)f(is)h(mo)s +(di\014ed)e(in)h(y)m(our)i(w)m(orking)e(directory)-8 +b(.)56 b(There)35 b(migh)m(t)g(also)h(b)s(e)e(a)i(new)m(er)g(revision) +480 1186 y(inside)28 b(the)j(rep)s(ository)-8 b(.)0 1346 +y Fn(?)30 b Fo(\014le)285 b(\014le)43 b Fs(is)38 b(in)f(y)m(our)i(w)m +(orking)f(directory)-8 b(,)40 b(but)e(do)s(es)h(not)g(corresp)s(ond)e +(to)i(an)m(ything)g(in)e(the)i(source)480 1471 y(rep)s(ository)-8 +b(,)27 b(and)e(is)h(not)g(in)f(the)i(list)d(of)j(\014les)e(for)h +Fr(cvs)f Fs(to)i(ignore)f(\(see)h(the)g(description)d(of)j(the)f(`)p +Fn(-I)p Fs(')480 1595 y(option,)h(and)e(see)h(Section)g(C.9)g +([cvsignore],)i(page)e(148\).)41 b(If)26 b(y)m(ou)g(remo)m(v)m(e)i(y)m +(our)d(w)m(orking)h(sources,)480 1720 y(this)j(\014le)h(will)d(b)s(e)j +(lost.)0 2107 y Fk(A.14.3)62 b(release)31 b(examples)125 +2381 y Fs(Release)g(the)f(mo)s(dule,)f(and)h(delete)g(y)m(our)h(lo)s (cal)e(w)m(orking)h(cop)m(y)h(of)g(the)f(\014les.)240 -2249 y Fn($)47 b(cd)h(..)429 b(#)47 b Fs(Y)-8 b(ou)31 +2635 y Fn($)47 b(cd)h(..)429 b(#)47 b Fs(Y)-8 b(ou)31 b(m)m(ust)f(stand)g(immediately)f(ab)s(o)m(v)m(e)i(the)1004 -2353 y Fn(#)47 b Fs(sources)30 b(when)g(y)m(ou)h(issue)e(`)p -Fn(cvs)47 b(release)p Fs('.)240 2457 y Fn($)g(cvs)g(release)f(-d)h(tc) -240 2561 y(You)g(have)g([0])f(altered)g(files)h(in)g(this)f -(repository.)240 2665 y(Are)h(you)g(sure)f(you)h(want)g(to)g(release)f -(\(and)h(delete\))e(module)i(`tc':)f(y)240 2768 y($)0 -3402 y Fm(A.15)68 b(rtag|Add)30 b(a)h(sym)l(b)t(olic)g(tag)g(to)g(a)g -(mo)t(dule)75 3697 y Fq(\017)60 b Fs(rtag)31 b([-falnR])f([-b])h([-d])f +2738 y Fn(#)47 b Fs(sources)30 b(when)g(y)m(ou)h(issue)e(`)p +Fn(cvs)47 b(release)p Fs('.)240 2842 y Fn($)g(cvs)g(release)f(-d)h(tc) +240 2946 y(You)g(have)g([0])f(altered)g(files)h(in)g(this)f +(repository.)240 3050 y(Are)h(you)g(sure)f(you)h(want)g(to)g(release)f +(\(and)h(delete\))e(module)i(`tc':)f(y)240 3154 y($)0 +3574 y Fm(A.15)68 b(rtag|Add)30 b(a)h(sym)l(b)t(olic)g(tag)g(to)g(a)g +(mo)t(dule)75 3848 y Fq(\017)60 b Fs(rtag)31 b([-falnR])f([-b])h([-d])f ([-r)h(tag)g Fn(|)f Fs(-Ddate])j(sym)m(b)s(olic)p 2059 -3697 28 4 v 31 w(tag)e(mo)s(dules)p Fh(:)15 b(:)g(:)75 -3867 y Fq(\017)60 b Fs(Requires:)40 b(rep)s(ository)-8 -b(.)75 4037 y Fq(\017)60 b Fs(Changes:)40 b(rep)s(ository)-8 -b(.)75 4207 y Fq(\017)60 b Fs(Synon)m(ym:)40 b(rfreeze)125 -4547 y(Y)-8 b(ou)42 b(can)h(use)f(this)g(command)g(to)h(assign)f(sym)m +3848 28 4 v 31 w(tag)e(mo)s(dules)p Fh(:)15 b(:)g(:)75 +3991 y Fq(\017)60 b Fs(Requires:)40 b(rep)s(ository)-8 +b(.)75 4133 y Fq(\017)60 b Fs(Changes:)40 b(rep)s(ository)-8 +b(.)75 4276 y Fq(\017)60 b Fs(Synon)m(ym:)40 b(rfreeze)125 +4568 y(Y)-8 b(ou)42 b(can)h(use)f(this)g(command)g(to)h(assign)f(sym)m (b)s(olic)e(tags)k(to)f(particular,)h(explicitly)c(sp)s(eci\014ed)h -(source)0 4672 y(revisions)32 b(in)g(the)i(rep)s(ository)-8 +(source)0 4692 y(revisions)32 b(in)g(the)i(rep)s(ository)-8 b(.)49 b Fn(rtag)33 b Fs(w)m(orks)g(directly)g(on)g(the)h(rep)s (ository)e(con)m(ten)m(ts)k(\(and)d(requires)f(no)i(prior)0 -4796 y(c)m(hec)m(k)m(out\).)43 b(Use)31 b Fn(tag)e Fs(instead)g(\(see)i -(Section)f(A.17)i([tag],)g(page)e(118\),)i(to)f(base)f(the)h(selection) -f(of)g(revisions)e(on)0 4921 y(the)j(con)m(ten)m(ts)h(of)e(y)m(our)h(w) +4817 y(c)m(hec)m(k)m(out\).)43 b(Use)31 b Fn(tag)e Fs(instead)g(\(see)i +(Section)f(A.17)i([tag],)g(page)e(120\),)i(to)f(base)f(the)h(selection) +f(of)g(revisions)e(on)0 4941 y(the)j(con)m(ten)m(ts)h(of)e(y)m(our)h(w) m(orking)e(directory)-8 b(.)125 5215 y(If)28 b(y)m(ou)i(attempt)h(to)f (use)f(a)h(tag)g(name)g(that)g(already)e(exists,)i Fr(cvs)e Fs(will)f(complain)h(and)h(not)g(o)m(v)m(erwrite)h(that)0 5340 y(tag.)42 b(Use)31 b(the)f(`)p Fn(-F)p Fs(')g(option)g(to)h(force) g(the)g(new)f(tag)h(v)-5 b(alue.)p eop -%%Page: 117 119 -117 118 bop 0 -116 a Fs(App)s(endix)28 b(A:)i(Guide)g(to)h(CVS)e -(commands)2210 b(117)0 366 y Fk(A.15.1)62 b(rtag)30 b(options)125 +%%Page: 119 121 +119 120 bop 0 -116 a Fs(App)s(endix)28 b(A:)i(Guide)g(to)h(CVS)e +(commands)2210 b(119)0 366 y Fk(A.15.1)62 b(rtag)30 b(options)125 642 y Fs(These)d(standard)g(options)h(are)g(supp)s(orted)e(b)m(y)i -Fn(rtag)f Fs(\(see)i(Section)e(A.4)i([Common)f(options],)g(page)h(90,)g +Fn(rtag)f Fs(\(see)i(Section)e(A.4)i([Common)f(options],)g(page)h(92,)g (for)0 766 y(a)i(complete)g(description)d(of)j(them\):)0 1068 y Fn(-D)f Fo(date)183 b Fs(T)-8 b(ag)31 b(the)g(most)g(recen)m(t)g (revision)e(no)h(later)g(than)g Fo(date)p Fs(.)0 1244 @@ -7724,7 +7782,7 @@ b Fs(Ov)m(erwrite)28 b(an)g(existing)g(tag)i(of)f(the)f(same)h(name)g b(not)e(run)g(an)m(y)h(tag)h(program)e(that)h(w)m(as)g(sp)s(eci\014ed)e (with)h(the)h(`)p Fn(-t)p Fs(')f(\015ag)h(inside)e(the)h(`)p Fn(modules)p Fs(')480 2148 y(\014le.)40 b(\(see)31 b(Section)f(C.1)h -([mo)s(dules],)e(page)i(135\).)0 2325 y Fn(-R)384 b Fs(Commit)30 +([mo)s(dules],)e(page)i(137\).)0 2325 y Fn(-R)384 b Fs(Commit)30 b(directories)f(recursiv)m(ely)-8 b(.)40 b(This)28 b(is)i(on)g(b)m(y)g (default.)0 2502 y Fn(-r)g Fo(tag)229 b Fs(Only)30 b(tag)j(those)f (\014les)e(that)i(con)m(tain)g Fo(tag)p Fs(.)46 b(This)30 @@ -7737,14 +7795,14 @@ b(only)e(the)480 2627 y(\014les)h(iden)m(ti\014ed)g(b)m(y)h(the)g(old)g 3354 y Fn(-a)384 b Fs(Use)31 b(the)f(`)p Fn(-a)p Fs(')g(option)g(to)h (ha)m(v)m(e)g Fn(rtag)e Fs(lo)s(ok)h(in)f(the)i(`)p Fn(Attic)p Fs(')e(\(see)i(Chapter)f(11)h([Remo)m(ving)f(\014les],)480 -3478 y(page)c(59\))g(for)f(remo)m(v)m(ed)g(\014les)f(that)i(con)m(tain) +3478 y(page)c(61\))g(for)f(remo)m(v)m(ed)g(\014les)f(that)i(con)m(tain) f(the)g(sp)s(eci\014ed)e(tag.)41 b(The)24 b(tag)i(is)e(remo)m(v)m(ed)i (from)e(these)480 3603 y(\014les,)h(whic)m(h)f(mak)m(es)j(it)d(con)m(v) m(enien)m(t)j(to)f(re-use)f(a)h(sym)m(b)s(olic)d(tag)k(as)e(dev)m (elopmen)m(t)h(con)m(tin)m(ues)f(\(and)480 3727 y(\014les)k(get)j(remo) m(v)m(ed)f(from)f(the)h(up-coming)e(distribution\).)0 3904 y Fn(-b)384 b Fs(Mak)m(e)32 b(the)f(tag)g(a)g(branc)m(h)f(tag.)42 -b(See)30 b(Chapter)g(7)h([Branc)m(hes],)g(page)g(45.)0 +b(See)30 b(Chapter)g(7)h([Branc)m(hes],)g(page)g(47.)0 4081 y Fn(-d)384 b Fs(Delete)32 b(the)e(tag)i(instead)d(of)i(creating)g (it.)480 4232 y(In)40 b(general,)k(tags)e(\(often)f(the)g(sym)m(b)s (olic)e(names)i(of)g(soft)m(w)m(are)h(distributions\))c(should)h(not)i @@ -7757,8 +7815,8 @@ y(mistagged)31 b(a)g(mo)s(dule\).)0 5065 y Fm(A.16)68 b(status|Displa)l(y)32 b(status)g(information)f(on)g(c)l(hec)l(k)l(ed)f (out)h(\014les)75 5340 y Fq(\017)60 b Fs(status)31 b([-lR])f([-v])h ([\014les)p Fh(:)15 b(:)g(:)p Fs(])p eop -%%Page: 118 120 -118 119 bop 0 -116 a Fs(118)2366 b(CVS|Concurren)m(t)29 +%%Page: 120 122 +120 121 bop 0 -116 a Fs(120)2366 b(CVS|Concurren)m(t)29 b(V)-8 b(ersions)30 b(System)75 366 y Fq(\017)60 b Fs(Requires:)40 b(w)m(orking)29 b(directory)-8 b(,)31 b(rep)s(ository)-8 b(.)75 525 y Fq(\017)60 b Fs(Changes:)40 b(nothing.)125 @@ -7766,13 +7824,13 @@ b(.)75 525 y Fq(\017)60 b Fs(Changes:)40 b(nothing.)125 (status)g(of)f(\014les)g(with)f(resp)s(ect)i(to)g(the)g(source)g(rep)s (ository)-8 b(.)53 b(F)-8 b(or)0 967 y(information)39 b(on)i(the)h(basic)e(output)h(see)h(Section)f(6.1)h([File)e(status],)45 -b(page)d(33.)73 b(F)-8 b(or)42 b(information)e(on)h(the)0 +b(page)d(35.)73 b(F)-8 b(or)42 b(information)e(on)h(the)0 1092 y Fn(Sticky)29 b(tag)35 b Fs(and)h Fn(Sticky)29 b(date)35 b Fs(output,)j(see)g(Section)e(7.4)i([Stic)m(ky)e(tags],)k -(page)e(49.)60 b(F)-8 b(or)37 b(information)e(on)0 1216 +(page)e(51.)60 b(F)-8 b(or)37 b(information)e(on)0 1216 y(the)c Fn(Sticky)d(options)h Fs(output,)h(see)h(the)f(`)p Fn(-k)p Fs(')h(option)e(in)h(Section)g(A.18.1)i([up)s(date)e(options],) -g(page)h(120.)125 1499 y(Y)-8 b(ou)36 b(can)h(also)f(use)g(this)f +g(page)h(122.)125 1499 y(Y)-8 b(ou)36 b(can)h(also)f(use)g(this)f (command)h(to)h(determine)f(the)g(p)s(oten)m(tial)g(impact)g(of)h(a)f (`)p Fn(cvs)30 b(update)p Fs(')35 b(on)h(y)m(our)0 1624 y(w)m(orking)25 b(source)g(directory|but)f(remem)m(b)s(er)h(that)h @@ -7780,7 +7838,7 @@ y(w)m(orking)25 b(source)g(directory|but)f(remem)m(b)s(er)h(that)h (y)m(ou)g(run)0 1749 y Fn(update)p Fs(.)0 2247 y Fk(A.16.1)62 b(status)31 b(options)125 2530 y Fs(These)f(standard)h(options)f(are)i (supp)s(orted)d(b)m(y)i Fn(status)f Fs(\(see)i(Section)f(A.4)h([Common) -f(options],)g(page)h(90,)0 2655 y(for)e(a)h(complete)g(description)d +f(options],)g(page)h(92,)0 2655 y(for)e(a)h(complete)g(description)d (of)j(them\):)0 2972 y Fn(-l)384 b Fs(Lo)s(cal;)30 b(run)f(only)h(in)f (curren)m(t)h(w)m(orking)g(directory)-8 b(.)0 3165 y Fn(-R)384 b Fs(Commit)30 b(directories)f(recursiv)m(ely)-8 @@ -7791,7 +7849,7 @@ b Fs(V)-8 b(erb)s(ose.)62 b(In)36 b(addition)g(to)i(the)f(information)f 480 3924 y(together)j(with)d(the)i(n)m(umerical)e(v)-5 b(alue)37 b(of)h(the)g(revision)e(or)h(branc)m(h)g(they)h(refer)f(to.) 63 b(F)-8 b(or)39 b(more)480 4049 y(information,)29 b(see)i(Section)f -(7.1)i([T)-8 b(ags],)31 b(page)h(45)0 4581 y Fm(A.17)68 +(7.1)i([T)-8 b(ags],)31 b(page)h(47)0 4581 y Fm(A.17)68 b(tag|Add)30 b(a)h(sym)l(b)t(olic)g(tag)g(to)g(c)l(hec)l(k)l(ed)g(out)f (v)l(ersions)i(of)e(\014les)75 4864 y Fq(\017)60 b Fs(tag)32 b([-lR])e([-b])g([-c])i([-d])f(sym)m(b)s(olic)p 1368 @@ -7800,9 +7858,9 @@ b([-lR])e([-b])g([-c])i([-d])f(sym)m(b)s(olic)p 1368 b(,)31 b(rep)s(ository)-8 b(.)75 5181 y Fq(\017)60 b Fs(Changes:)40 b(rep)s(ository)-8 b(.)75 5340 y Fq(\017)60 b Fs(Synon)m(ym:)40 b(freeze)p eop -%%Page: 119 121 -119 120 bop 0 -116 a Fs(App)s(endix)28 b(A:)i(Guide)g(to)h(CVS)e -(commands)2210 b(119)125 366 y(Use)35 b(this)g(command)g(to)h(assign)f +%%Page: 121 123 +121 122 bop 0 -116 a Fs(App)s(endix)28 b(A:)i(Guide)g(to)h(CVS)e +(commands)2210 b(121)125 366 y(Use)35 b(this)g(command)g(to)h(assign)f (sym)m(b)s(olic)f(tags)j(to)f(the)g(nearest)g(rep)s(ository)e(v)m (ersions)h(to)h(y)m(our)g(w)m(orking)0 491 y(sources.)60 b(The)36 b(tags)i(are)g(applied)c(immediately)h(to)j(the)f(rep)s @@ -7834,7 +7892,7 @@ y(If)d(y)m(ou)i(attempt)h(to)f(use)f(a)h(tag)g(name)g(that)g(already)e h(force)g(the)g(new)f(tag)h(v)-5 b(alue.)0 3011 y Fk(A.17.1)62 b(tag)30 b(options)125 3286 y Fs(These)h(standard)f(options)h(are)h (supp)s(orted)d(b)m(y)i Fn(tag)g Fs(\(see)h(Section)g(A.4)g([Common)f -(options],)g(page)h(90,)h(for)0 3410 y(a)e(complete)g(description)d(of) +(options],)g(page)h(92,)h(for)0 3410 y(a)e(complete)g(description)d(of) j(them\):)0 3711 y Fn(-F)384 b Fs(Ov)m(erwrite)28 b(an)g(existing)g (tag)i(of)f(the)f(same)h(name)g(on)g(a)g(di\013eren)m(t)f(revision.)38 b(This)27 b(option)h(is)f(new)480 3836 y(in)i Fr(cvs)g @@ -7845,7 +7903,7 @@ b(.)0 4188 y Fn(-R)384 b Fs(Commit)30 b(directories)f(recursiv)m(ely)-8 b(.)40 b(This)28 b(is)i(on)g(b)m(y)g(default.)125 4489 y(Tw)m(o)g(sp)s(ecial)f(options)h(are)g(a)m(v)-5 b(ailable:)0 4790 y Fn(-b)384 b Fs(The)31 b(-b)g(option)f(mak)m(es)i(the)g(tag)g(a)g -(branc)m(h)e(tag)i(\(see)h(Chapter)d(7)i([Branc)m(hes],)g(page)g(45\),) +(branc)m(h)e(tag)i(\(see)h(Chapter)d(7)i([Branc)m(hes],)g(page)g(47\),) h(allo)m(w-)480 4915 y(ing)39 b(concurren)m(t,)j(isolated)d(dev)m (elopmen)m(t.)69 b(This)38 b(is)h(most)h(useful)d(for)j(creating)g(a)g (patc)m(h)g(to)h(a)480 5039 y(previously)28 b(released)i(soft)m(w)m @@ -7854,8 +7912,8 @@ h(allo)m(w-)480 4915 y(ing)39 b(concurren)m(t,)j(isolated)d(dev)m (tagged)j(are)e(unmo)s(di\014ed.)38 b(This)28 b(can)j(b)s(e)480 5340 y(used)f(to)h(mak)m(e)g(sure)f(that)h(y)m(ou)f(can)h(reconstruct)g (the)f(curren)m(t)h(\014le)e(con)m(ten)m(ts.)p eop -%%Page: 120 122 -120 121 bop 0 -116 a Fs(120)2366 b(CVS|Concurren)m(t)29 +%%Page: 122 124 +122 123 bop 0 -116 a Fs(122)2366 b(CVS|Concurren)m(t)29 b(V)-8 b(ersions)30 b(System)0 366 y Fn(-d)384 b Fs(Delete)32 b(a)e(tag.)480 517 y(If)g(y)m(ou)g(use)g(`)p Fn(cvs)g(tag)f(-d)h (symbolic_tag)p Fs(',)e(the)i(sym)m(b)s(olic)f(tag)i(y)m(ou)g(sp)s @@ -7884,12 +7942,12 @@ g(with)f(an)m(y)h(revisions)e(applied)g(to)j(the)f(source)g(rep)s 2718 y(or)g(up)s(date.)0 3139 y Fk(A.18.1)62 b(up)s(date)31 b(options)125 3414 y Fs(These)d(standard)h(options)f(are)i(a)m(v)-5 b(ailable)28 b(with)g Fn(update)f Fs(\(see)j(Section)f(A.4)h([Common)f -(options],)g(page)h(90,)0 3538 y(for)g(a)h(complete)g(description)d(of) +(options],)g(page)h(92,)0 3538 y(for)g(a)h(complete)g(description)d(of) j(them\):)0 3839 y Fn(-D)f(date)162 b Fs(Use)28 b(the)f(most)g(recen)m (t)i(revision)c(no)i(later)g(than)g Fo(date)p Fs(.)40 b(This)26 b(option)g(is)g(stic)m(ky)-8 b(,)29 b(and)d(implies)f(`)p Fn(-P)p Fs('.)480 3963 y(See)31 b(Section)f(7.4)h([Stic)m(ky)g(tags],)h -(page)f(49,)g(for)f(more)h(information)e(on)h(stic)m(ky)g(tags/dates.)0 +(page)f(51,)g(for)f(more)h(information)e(on)h(stic)m(ky)g(tags/dates.)0 4139 y Fn(-f)384 b Fs(Only)42 b(useful)g(with)h(the)h(`)p Fn(-D)30 b Fo(date)5 b Fs(')44 b(or)g(`)p Fn(-r)30 b Fo(tag)8 b Fs(')45 b(\015ags.)81 b(If)44 b(no)f(matc)m(hing)h(revision) @@ -7902,28 +7960,28 @@ b(future)480 4564 y(up)s(dates)42 b(of)g(this)g(\014le)g(in)f(this)h(w) m(orking)f(directory)i(will)d(use)i(the)h(same)g Fo(k\015ag)p Fs(.)78 b(The)42 b Fn(status)480 4688 y Fs(command)28 b(can)h(b)s(e)f(view)m(ed)g(to)h(see)g(the)g(stic)m(ky)g(options.)39 -b(See)29 b(Section)f(A.16)i([status],)g(page)f(117.)0 +b(See)29 b(Section)f(A.16)i([status],)g(page)f(119.)0 4864 y Fn(-l)384 b Fs(Lo)s(cal;)51 b(run)42 b(only)h(in)g(curren)m(t)g (w)m(orking)h(directory)-8 b(.)81 b(See)44 b(Chapter)f(9)h([Recursiv)m -(e)g(b)s(eha)m(vior],)480 4989 y(page)31 b(55.)0 5164 +(e)g(b)s(eha)m(vior],)480 4989 y(page)31 b(57.)0 5164 y Fn(-P)384 b Fs(Prune)29 b(empt)m(y)i(directories.)40 -b(See)30 b(Chapter)g(15)h([Mo)m(ving)g(directories],)f(page)h(71.)0 +b(See)30 b(Chapter)g(15)h([Mo)m(ving)g(directories],)f(page)h(73.)0 5340 y Fn(-p)384 b Fs(Pip)s(e)29 b(\014les)g(to)i(the)g(standard)e (output.)p eop -%%Page: 121 123 -121 122 bop 0 -116 a Fs(App)s(endix)28 b(A:)i(Guide)g(to)h(CVS)e -(commands)2210 b(121)0 366 y Fn(-R)384 b Fs(Op)s(erate)30 +%%Page: 123 125 +123 124 bop 0 -116 a Fs(App)s(endix)28 b(A:)i(Guide)g(to)h(CVS)e +(commands)2210 b(123)0 366 y Fn(-R)384 b Fs(Op)s(erate)30 b(recursiv)m(ely)f(\(default\).)41 b(See)31 b(Chapter)e(9)i([Recursiv)m -(e)f(b)s(eha)m(vior],)g(page)i(55.)0 569 y Fn(-r)e(tag)210 +(e)f(b)s(eha)m(vior],)g(page)i(57.)0 569 y Fn(-r)e(tag)210 b Fs(Retriev)m(e)36 b(revision)d Fo(tag)p Fs(.)55 b(This)33 b(option)i(is)f(stic)m(ky)-8 b(,)36 b(and)f(implies)d(`)p Fn(-P)p Fs('.)54 b(See)35 b(Section)g(7.4)h([Stic)m(ky)480 -694 y(tags],)c(page)f(49,)h(for)e(more)g(information)f(on)h(stic)m(ky)h +694 y(tags],)c(page)f(51,)h(for)e(more)g(information)f(on)h(stic)m(ky)h (tags/dates.)125 993 y(These)f(sp)s(ecial)f(options)g(are)i(also)f(a)m (v)-5 b(ailable)30 b(with)f Fn(update)p Fs(.)0 1321 y Fn(-A)384 b Fs(Reset)30 b(an)m(y)f(stic)m(ky)g(tags,)h(dates,)g(or)f(`) p Fn(-k)p Fs(')g(options.)39 b(See)29 b(Section)g(7.4)h([Stic)m(ky)f -(tags],)h(page)g(49,)g(for)480 1445 y(more)h(information)d(on)i(stic)m +(tags],)h(page)g(51,)g(for)480 1445 y(more)h(information)d(on)i(stic)m (ky)h(tags/dates.)0 1648 y Fn(-d)384 b Fs(Create)32 b(an)m(y)g (directories)e(that)i(exist)f(in)f(the)h(rep)s(ository)f(if)h(they're)g (missing)e(from)i(the)h(w)m(orking)480 1773 y(directory)-8 @@ -7949,7 +8007,7 @@ Fn(-I)p Fs(')h(more)h(than)f(once)h(on)f(the)h(command)f(line)f(to)i (sp)s(ecify)e(sev)m(eral)i(\014les)480 3136 y(to)39 b(ignore.)66 b(Use)39 b(`)p Fn(-I)30 b(!)p Fs(')39 b(to)g(a)m(v)m(oid)h(ignoring)d (an)m(y)i(\014les)e(at)j(all.)65 b(See)39 b(Section)f(C.9)h -([cvsignore],)480 3260 y(page)31 b(146,)h(for)e(other)h(w)m(a)m(ys)g +([cvsignore],)480 3260 y(page)31 b(148,)h(for)e(other)h(w)m(a)m(ys)g (to)g(mak)m(e)g Fr(cvs)f Fs(ignore)g(some)h(\014les.)0 3463 y Fn(-W)p Fo(sp)s(ec)214 b Fs(Sp)s(ecify)42 b(\014le)g(names)h (that)h(should)d(b)s(e)i(\014ltered)f(during)f(up)s(date.)78 @@ -7958,7 +8016,7 @@ b(.)480 3751 y Fo(sp)s(ec)59 b Fs(can)54 b(b)s(e)f(a)h(\014le)f(name)h (pattern)g(of)g(the)g(same)g(t)m(yp)s(e)g(that)h(y)m(ou)f(can)g(sp)s (ecify)e(in)h(the)480 3876 y(`)p Fn(.cvswrappers)p Fs(')28 b(\014le.)39 b(See)31 b(Section)f(C.2)h([W)-8 b(rapp)s(ers],)30 -b(page)h(137.)0 4079 y Fn(-j)p Fo(revision)76 b Fs(With)39 +b(page)h(139.)0 4079 y Fn(-j)p Fo(revision)76 b Fs(With)39 b(t)m(w)m(o)h(`)p Fn(-j)p Fs(')f(options,)i(merge)f(c)m(hanges)g(from)f (the)g(revision)f(sp)s(eci\014ed)f(with)h(the)i(\014rst)e(`)p Fn(-j)p Fs(')480 4203 y(option)30 b(to)h(the)g(revision)d(sp)s @@ -7979,10 +8037,10 @@ e(the)i(c)m(hosen)g(revision)e(to)j(one)f(within)d(a)k(sp)s(eci\014c)d m(y)h(adding)f(a)i(colon)f(\(:\))42 b(to)31 b(the)g(tag:)41 b(`)p Fn(-j)p Fo(Sym)m(b)s(olic)p 2962 5154 28 4 v 31 w(T)-8 b(ag)8 b Fn(:)p Fo(Date)p 3386 5154 V 35 w(Sp)s(eci\014er)f -Fs('.)480 5317 y(See)31 b(Chapter)e(8)i([Merging],)g(page)g(51.)p +Fs('.)480 5317 y(See)31 b(Chapter)e(8)i([Merging],)g(page)g(53.)p eop -%%Page: 122 124 -122 123 bop 0 -116 a Fs(122)2366 b(CVS|Concurren)m(t)29 +%%Page: 124 126 +124 125 bop 0 -116 a Fs(124)2366 b(CVS|Concurren)m(t)29 b(V)-8 b(ersions)30 b(System)0 366 y Fk(A.18.2)62 b(up)s(date)31 b(output)125 650 y Fn(update)24 b Fs(and)i Fn(checkout)f Fs(k)m(eep)i(y)m(ou)g(informed)e(of)h(its)g(progress)h(b)m(y)f(prin)m @@ -8042,7 +8100,7 @@ Fn(.)p Fo(revision)p Fs(')d(where)i Fo(revision)g Fs(is)g(the)480 4376 y Fr(r)n(cs)31 b Fs(revision)g(that)i(y)m(our)f(mo)s(di\014ed)e (\014le)i(started)h(from.)46 b(Resolv)m(e)33 b(the)f(con\015ict)g(as)h (describ)s(ed)d(in)480 4500 y(Section)g(6.3)h([Con\015icts)f(example],) -g(page)h(35)g(\(Note)h(that)f(some)f(systems)g(automatically)h(purge) +g(page)h(37)g(\(Note)h(that)f(some)f(systems)g(automatically)h(purge) 480 4625 y(\014les)h(that)h(b)s(egin)e(with)h(`)p Fn(.#)p Fs(')g(if)g(they)h(ha)m(v)m(e)h(not)f(b)s(een)f(accessed)i(for)e(a)h (few)g(da)m(ys.)48 b(If)32 b(y)m(ou)h(in)m(tend)480 4749 @@ -8056,10 +8114,10 @@ b(in)f(y)m(our)i(w)m(orking)f(directory)-8 b(,)40 b(but)e(do)s(es)h 5193 y(rep)s(ository)-8 b(,)37 b(and)f(is)g(not)g(in)f(the)i(list)e(of) h(\014les)g(for)g Fr(cvs)f Fs(to)i(ignore)f(\(see)h(the)g(description)d (of)j(the)480 5317 y(`)p Fn(-I)p Fs(')30 b(option,)g(and)g(see)h -(Section)f(C.9)h([cvsignore],)g(page)g(146\).)p eop -%%Page: 123 125 -123 124 bop 0 -116 a Fs(App)s(endix)28 b(A:)i(Guide)g(to)h(CVS)e -(commands)2210 b(123)0 366 y Fk(A.18.3)62 b(up)s(date)31 +(Section)f(C.9)h([cvsignore],)g(page)g(148\).)p eop +%%Page: 125 127 +125 126 bop 0 -116 a Fs(App)s(endix)28 b(A:)i(Guide)g(to)h(CVS)e +(commands)2210 b(125)0 366 y Fk(A.18.3)62 b(up)s(date)31 b(examples)125 640 y Fs(The)22 b(follo)m(wing)f(line)g(will)f(displa)m (y)h(all)h(\014les)f(whic)m(h)h(are)h(not)g(up-to-date)h(without)d (actually)i(c)m(hange)h(an)m(ything)0 765 y(in)29 b(y)m(our)h(w)m @@ -8067,34 +8125,34 @@ b(examples)125 640 y Fs(The)22 b(follo)m(wing)f(line)g(will)f(displa)m (hec)m(k)h(what)f(has)f(b)s(een)f(going)i(on)f(with)f(the)i(pro)5 b(ject.)240 1018 y Fn($)47 b(cvs)g(-n)h(-q)f(update)p eop -%%Page: 124 126 -124 125 bop 0 -116 a Fs(124)2366 b(CVS|Concurren)m(t)29 +%%Page: 126 128 +126 127 bop 0 -116 a Fs(126)2366 b(CVS|Concurren)m(t)29 b(V)-8 b(ersions)30 b(System)p eop -%%Page: 125 127 -125 126 bop 0 -116 a Fs(App)s(endix)28 b(B:)j(Quic)m(k)e(reference)i -(to)g(CVS)f(commands)1837 b(125)0 366 y Fp(App)t(endix)30 +%%Page: 127 129 +127 128 bop 0 -116 a Fs(App)s(endix)28 b(B:)j(Quic)m(k)e(reference)i +(to)g(CVS)f(commands)1837 b(127)0 366 y Fp(App)t(endix)30 b(B)80 b(Quic)l(k)31 b(reference)d(to)i(CVS)f(commands)125 745 y Fs(This)f(app)s(endix)f(describ)s(es)h(ho)m(w)i(to)h(in)m(v)m(ok) m(e)g Fr(cvs)p Fs(,)e(with)g(references)h(to)h(where)f(eac)m(h)h (command)f(or)f(feature)0 870 y(is)23 b(describ)s(ed)f(in)g(detail.)38 b(Other)23 b(relev)-5 b(an)m(t)24 b(references)h(are)f(the)g(`)p Fn(--help)p Fs('/`)p Fn(-H)p Fs(')f(option)g(to)i Fr(cvs)e -Fs(\(see)h(Section)g(A.3)0 994 y([Global)30 b(options],)g(page)h(89\))h -(and)60 b([Index],)30 b(page)h(163.)0 1295 y Fn(add)e([)p +Fs(\(see)h(Section)g(A.3)0 994 y([Global)30 b(options],)g(page)h(91\))h +(and)60 b([Index],)30 b(page)h(165.)0 1295 y Fn(add)e([)p Fo(options)t Fn(])g([)p Fo(\014les)t Fh(:)15 b(:)g(:)p Fn(])480 1419 y Fs(Add)29 b(a)i(new)f(\014le/directory)-8 -b(.)40 b(See)31 b(Chapter)f(10)h([Adding)e(\014les],)h(page)h(57.)480 +b(.)40 b(See)31 b(Chapter)f(10)h([Adding)e(\014les],)h(page)h(59.)480 1596 y Fn(-k)f Fo(k\015ag)165 b Fs(Set)31 b(k)m(eyw)m(ord)f(expansion.) 480 1772 y Fn(-m)g Fo(msg)197 b Fs(Set)31 b(\014le)e(description.)0 1948 y Fn(admin)g([)p Fo(options)t Fn(])g([)p Fo(\014les)t Fh(:)15 b(:)g(:)o Fn(])480 2073 y Fs(Administration)28 b(of)i(history)f(\014les)h(in)f(the)h(rep)s(ository)-8 -b(.)40 b(See)31 b(Section)f(A.5)h([admin],)f(page)h(93.)480 +b(.)40 b(See)31 b(Section)f(A.5)h([admin],)f(page)h(95.)480 2249 y Fn(-b[)p Fo(rev)8 b Fn(])156 b Fs(Set)31 b(default)e(branc)m(h.) 480 2425 y Fn(-c)p Fo(string)155 b Fs(Set)31 b(commen)m(t)g(leader.)480 2602 y Fn(-k)p Fo(subst)175 b Fs(Set)25 b(k)m(eyw)m(ord)g (substitution.)36 b(See)25 b(Chapter)f(17)h([Keyw)m(ord)g -(substitution],)f(page)h(75.)480 2778 y Fn(-l[)p Fo(rev)8 +(substitution],)f(page)h(77.)480 2778 y Fn(-l[)p Fo(rev)8 b Fn(])156 b Fs(Lo)s(c)m(k)31 b(revision)e Fo(rev)p Fs(,)h(or)g(latest) h(revision.)480 2954 y Fn(-m)p Fo(rev)8 b Fn(:)p Fo(msg)960 3079 y Fs(Replace)31 b(the)f(log)h(message)g(of)g(revision)d @@ -8112,467 +8170,470 @@ b Fs(Unlo)s(c)m(k)30 b(revision)f Fo(rev)p Fs(,)h(or)h(latest)g (revision.)0 4614 y Fn(annotate)d([)p Fo(options)t Fn(])h([)p Fo(\014les)t Fh(:)15 b(:)g(:)p Fn(])480 4738 y Fs(Sho)m(w)30 b(last)g(revision)e(where)h(eac)m(h)j(line)c(w)m(as)i(mo)s(di\014ed.)39 -b(See)30 b(Section)g(16.4)i([annotate],)g(page)f(74.)480 +b(See)30 b(Section)g(16.4)i([annotate],)g(page)f(76.)480 4915 y Fn(-D)f Fo(date)183 b Fs(Annotate)43 b(the)e(most)h(recen)m(t)h (revision)d(no)h(later)h(than)f Fo(date)p Fs(.)75 b(See)42 -b(Section)f(A.4)960 5039 y([Common)30 b(options],)g(page)h(90.)480 +b(Section)f(A.4)960 5039 y([Common)30 b(options],)g(page)h(92.)480 5215 y Fn(-f)384 b Fs(Use)21 b(head)g(revision)e(if)g(tag/date)k(not)e (found.)37 b(See)21 b(Section)f(A.4)i([Common)e(options],)960 -5340 y(page)31 b(90.)p eop -%%Page: 126 128 -126 127 bop 0 -116 a Fs(126)2366 b(CVS|Concurren)m(t)29 +5340 y(page)31 b(92.)p eop +%%Page: 128 130 +128 129 bop 0 -116 a Fs(128)2366 b(CVS|Concurren)m(t)29 b(V)-8 b(ersions)30 b(System)480 366 y Fn(-l)384 b Fs(Lo)s(cal;)45 b(run)39 b(only)h(in)f(curren)m(t)h(w)m(orking)f(directory)-8 b(.)71 b(See)40 b(Chapter)g(9)h([Recursiv)m(e)960 491 -y(b)s(eha)m(vior],)30 b(page)h(55.)480 661 y Fn(-r)f +y(b)s(eha)m(vior],)30 b(page)h(57.)480 670 y Fn(-r)f Fo(tag)229 b Fs(Annotate)32 b(revision)c Fo(tag)p Fs(.)42 -b(See)31 b(Section)f(A.4)h([Common)f(options],)g(page)i(90.)0 -831 y Fn(checkout)c([)p Fo(options)t Fn(])h Fo(mo)s(dules)t -Fh(:)15 b(:)g(:)480 956 y Fs(Get)31 b(a)g(cop)m(y)g(of)g(the)f +b(See)31 b(Section)f(A.4)h([Common)f(options],)g(page)i(92.)0 +850 y Fn(checkout)c([)p Fo(options)t Fn(])h Fo(mo)s(dules)t +Fh(:)15 b(:)g(:)480 974 y Fs(Get)31 b(a)g(cop)m(y)g(of)g(the)f (sources.)41 b(See)31 b(Section)f(A.6)h([c)m(hec)m(k)m(out],)j(page)d -(97.)480 1126 y Fn(-A)384 b Fs(Reset)38 b(an)m(y)f(stic)m(ky)h +(99.)480 1154 y Fn(-A)384 b Fs(Reset)38 b(an)m(y)f(stic)m(ky)h (tags/date/k)m(opts.)64 b(See)37 b(Section)g(7.4)i([Stic)m(ky)e(tags],) -j(page)e(49)960 1250 y(and)30 b(Chapter)g(17)h([Keyw)m(ord)f -(substitution],)f(page)i(75.)480 1420 y Fn(-c)384 b Fs(Output)19 -b(the)i(mo)s(dule)e(database.)38 b(See)20 b(Section)h(A.6.1)h([c)m(hec) -m(k)m(out)h(options],)f(page)f(98.)480 1590 y Fn(-D)30 -b Fo(date)183 b Fs(Chec)m(k)35 b(out)g(revisions)e(as)j(of)f -Fo(date)40 b Fs(\(is)35 b(stic)m(ky\).)54 b(See)36 b(Section)e(A.4)i -([Common)f(op-)960 1715 y(tions],)30 b(page)h(90.)480 -1885 y Fn(-d)f Fo(dir)241 b Fs(Chec)m(k)31 b(out)f(in)m(to)h -Fo(dir)p Fs(.)39 b(See)30 b(Section)h(A.6.1)g([c)m(hec)m(k)m(out)i -(options],)e(page)g(98.)480 2055 y Fn(-f)384 b Fs(Use)21 -b(head)g(revision)e(if)g(tag/date)k(not)e(found.)37 b(See)21 -b(Section)f(A.4)i([Common)e(options],)960 2179 y(page)31 -b(90.)480 2349 y Fn(-j)f Fo(rev)230 b Fs(Merge)32 b(in)d(c)m(hanges.)41 -b(See)31 b(Section)f(A.6.1)i([c)m(hec)m(k)m(out)h(options],)d(page)h -(98.)480 2519 y Fn(-k)f Fo(k\015ag)165 b Fs(Use)51 b -Fo(k\015ag)59 b Fs(k)m(eyw)m(ord)51 b(expansion.)100 +j(page)e(51)960 1278 y(and)30 b(Chapter)g(17)h([Keyw)m(ord)f +(substitution],)f(page)i(77.)480 1458 y Fn(-c)384 b Fs(Output)56 +b(the)h(mo)s(dule)f(database.)122 b(See)57 b(Section)g(A.6.1)h([c)m +(hec)m(k)m(out)i(options],)960 1582 y(page)31 b(100.)480 +1762 y Fn(-D)f Fo(date)183 b Fs(Chec)m(k)35 b(out)g(revisions)e(as)j +(of)f Fo(date)40 b Fs(\(is)35 b(stic)m(ky\).)54 b(See)36 +b(Section)e(A.4)i([Common)f(op-)960 1886 y(tions],)30 +b(page)h(92.)480 2066 y Fn(-d)f Fo(dir)241 b Fs(Chec)m(k)31 +b(out)f(in)m(to)h Fo(dir)p Fs(.)39 b(See)30 b(Section)h(A.6.1)g([c)m +(hec)m(k)m(out)i(options],)e(page)g(100.)480 2245 y Fn(-f)384 +b Fs(Use)21 b(head)g(revision)e(if)g(tag/date)k(not)e(found.)37 +b(See)21 b(Section)f(A.4)i([Common)e(options],)960 2370 +y(page)31 b(92.)480 2549 y Fn(-j)f Fo(rev)230 b Fs(Merge)32 +b(in)d(c)m(hanges.)41 b(See)31 b(Section)f(A.6.1)i([c)m(hec)m(k)m(out)h +(options],)d(page)h(100.)480 2729 y Fn(-k)f Fo(k\015ag)165 +b Fs(Use)51 b Fo(k\015ag)59 b Fs(k)m(eyw)m(ord)51 b(expansion.)100 b(See)51 b(Section)g(17.4)h([Substitution)c(mo)s(des],)960 -2644 y(page)31 b(77.)480 2814 y Fn(-l)384 b Fs(Lo)s(cal;)45 +2853 y(page)31 b(79.)480 3033 y Fn(-l)384 b Fs(Lo)s(cal;)45 b(run)39 b(only)h(in)f(curren)m(t)h(w)m(orking)f(directory)-8 -b(.)71 b(See)40 b(Chapter)g(9)h([Recursiv)m(e)960 2938 -y(b)s(eha)m(vior],)30 b(page)h(55.)480 3108 y Fn(-N)384 +b(.)71 b(See)40 b(Chapter)g(9)h([Recursiv)m(e)960 3157 +y(b)s(eha)m(vior],)30 b(page)h(57.)480 3337 y Fn(-N)384 b Fs(Don't)40 b(shorten)f(mo)s(dule)f(paths)g(if)h(-d)g(sp)s (eci\014ed.)65 b(See)40 b(Section)f(A.6.1)h([c)m(hec)m(k)m(out)960 -3233 y(options],)30 b(page)h(98.)480 3403 y Fn(-n)384 +3461 y(options],)30 b(page)h(100.)480 3641 y Fn(-n)384 b Fs(Do)28 b(not)f(run)e(mo)s(dule)g(program)i(\(if)f(an)m(y\).)40 b(See)27 b(Section)f(A.6.1)j([c)m(hec)m(k)m(out)g(options],)960 -3527 y(page)i(98.)480 3697 y Fn(-P)384 b Fs(Prune)29 +3765 y(page)i(100.)480 3945 y Fn(-P)384 b Fs(Prune)29 b(empt)m(y)i(directories.)40 b(See)30 b(Chapter)g(15)h([Mo)m(ving)g -(directories],)f(page)h(71.)480 3867 y Fn(-p)384 b Fs(Chec)m(k)36 +(directories],)f(page)h(73.)480 4124 y Fn(-p)384 b Fs(Chec)m(k)36 b(out)g(\014les)e(to)j(standard)e(output)g(\(a)m(v)m(oids)h(stic)m -(kiness\).)56 b(See)36 b(Section)f(A.6.1)960 3992 y([c)m(hec)m(k)m(out) -e(options],)d(page)h(98.)480 4162 y Fn(-r)f Fo(tag)229 +(kiness\).)56 b(See)36 b(Section)f(A.6.1)960 4249 y([c)m(hec)m(k)m(out) +e(options],)d(page)h(100.)480 4428 y Fn(-r)f Fo(tag)229 b Fs(Chec)m(k)m(out)48 b(revision)c Fo(tag)56 b Fs(\(is)46 b(stic)m(ky\).)89 b(See)47 b(Section)g(A.4)g([Common)f(options],)960 -4286 y(page)31 b(90.)480 4456 y Fn(-s)384 b Fs(Lik)m(e)35 +4553 y(page)31 b(92.)480 4732 y Fn(-s)384 b Fs(Lik)m(e)35 b(-c,)h(but)e(include)f(mo)s(dule)g(status.)54 b(See)35 b(Section)g(A.6.1)h([c)m(hec)m(k)m(out)h(options],)960 -4581 y(page)31 b(98.)0 4751 y Fn(commit)e([)p Fo(options)t -Fn(])g([)p Fo(\014les)t Fh(:)15 b(:)g(:)o Fn(])480 4875 +4857 y(page)31 b(100.)0 5036 y Fn(commit)e([)p Fo(options)t +Fn(])g([)p Fo(\014les)t Fh(:)15 b(:)g(:)o Fn(])480 5161 y Fs(Chec)m(k)31 b(c)m(hanges)g(in)m(to)f(the)h(rep)s(ository)-8 -b(.)40 b(See)31 b(Section)f(A.7)h([commit],)g(page)g(99.)480 -5045 y Fn(-F)f Fo(\014le)237 b Fs(Read)30 b(log)h(message)g(from)e +b(.)40 b(See)31 b(Section)f(A.7)h([commit],)g(page)g(101.)480 +5340 y Fn(-F)f Fo(\014le)237 b Fs(Read)30 b(log)h(message)g(from)e Fo(\014le)p Fs(.)40 b(See)31 b(Section)f(A.7.1)h([commit)g(options],)f -(page)g(100.)480 5215 y Fn(-f)384 b Fs(F)-8 b(orce)30 -b(the)e(\014le)f(to)i(b)s(e)e(committed;)j(disables)c(recursion.)38 -b(See)28 b(Section)g(A.7.1)i([com-)960 5340 y(mit)g(options],)g(page)h -(100.)p eop -%%Page: 127 129 -127 128 bop 0 -116 a Fs(App)s(endix)28 b(B:)j(Quic)m(k)e(reference)i -(to)g(CVS)f(commands)1837 b(127)480 366 y Fn(-l)384 b -Fs(Lo)s(cal;)45 b(run)39 b(only)h(in)f(curren)m(t)h(w)m(orking)f +(page)g(102.)p eop +%%Page: 129 131 +129 130 bop 0 -116 a Fs(App)s(endix)28 b(B:)j(Quic)m(k)e(reference)i +(to)g(CVS)f(commands)1837 b(129)480 366 y Fn(-f)384 b +Fs(F)-8 b(orce)30 b(the)e(\014le)f(to)i(b)s(e)e(committed;)j(disables)c +(recursion.)38 b(See)28 b(Section)g(A.7.1)i([com-)960 +491 y(mit)g(options],)g(page)h(102.)480 674 y Fn(-l)384 +b Fs(Lo)s(cal;)45 b(run)39 b(only)h(in)f(curren)m(t)h(w)m(orking)f (directory)-8 b(.)71 b(See)40 b(Chapter)g(9)h([Recursiv)m(e)960 -491 y(b)s(eha)m(vior],)30 b(page)h(55.)480 664 y Fn(-m)f +798 y(b)s(eha)m(vior],)30 b(page)h(57.)480 981 y Fn(-m)f Fo(msg)197 b Fs(Use)31 b Fo(msg)38 b Fs(as)31 b(log)f(message.)42 -b(See)30 b(Section)h(A.7.1)h([commit)e(options],)g(page)h(100.)480 -836 y Fn(-n)384 b Fs(Do)32 b(not)f(run)f(mo)s(dule)f(program)i(\(if)f +b(See)30 b(Section)h(A.7.1)h([commit)e(options],)g(page)h(102.)480 +1164 y Fn(-n)384 b Fs(Do)32 b(not)f(run)f(mo)s(dule)f(program)i(\(if)f (an)m(y\).)43 b(See)32 b(Section)e(A.7.1)j([commit)e(options],)960 -961 y(page)g(100.)480 1133 y Fn(-R)384 b Fs(Op)s(erate)24 +1288 y(page)g(102.)480 1471 y Fn(-R)384 b Fs(Op)s(erate)24 b(recursiv)m(ely)e(\(default\).)39 b(See)24 b(Chapter)f(9)h([Recursiv)m -(e)g(b)s(eha)m(vior],)g(page)h(55.)480 1306 y Fn(-r)30 +(e)g(b)s(eha)m(vior],)g(page)h(57.)480 1653 y Fn(-r)30 b Fo(rev)230 b Fs(Commit)30 b(to)h Fo(rev)p Fs(.)40 b(See)31 -b(Section)f(A.7.1)i([commit)f(options],)f(page)h(100.)0 -1478 y Fn(diff)e([)p Fo(options)t Fn(])g([)p Fo(\014les)t -Fh(:)15 b(:)g(:)p Fn(])480 1603 y Fs(Sho)m(w)37 b(di\013erences)g(b)s +b(Section)f(A.7.1)i([commit)f(options],)f(page)h(102.)0 +1836 y Fn(diff)e([)p Fo(options)t Fn(])g([)p Fo(\014les)t +Fh(:)15 b(:)g(:)p Fn(])480 1961 y Fs(Sho)m(w)37 b(di\013erences)g(b)s (et)m(w)m(een)i(revisions.)61 b(See)38 b(Section)g(A.8)g([di\013)7 -b(],)39 b(page)g(103.)64 b(In)37 b(addition)f(to)480 -1727 y(the)30 b(options)g(sho)m(wn)f(b)s(elo)m(w,)g(accepts)j(a)e(wide) +b(],)39 b(page)g(105.)64 b(In)37 b(addition)f(to)480 +2085 y(the)30 b(options)g(sho)m(wn)f(b)s(elo)m(w,)g(accepts)j(a)e(wide) f(v)-5 b(ariet)m(y)30 b(of)g(options)g(to)h(con)m(trol)f(output)g(st)m -(yle,)g(for)480 1852 y(example)g(`)p Fn(-c)p Fs(')g(for)g(con)m(text)j -(di\013s.)480 2024 y Fn(-D)d Fo(date1)138 b Fs(Di\013)30 +(yle,)g(for)480 2210 y(example)g(`)p Fn(-c)p Fs(')g(for)g(con)m(text)j +(di\013s.)480 2392 y Fn(-D)d Fo(date1)138 b Fs(Di\013)30 b(revision)f(for)h(date)h(against)g(w)m(orking)f(\014le.)40 b(See)31 b(Section)g(A.8.1)h([di\013)d(options],)960 -2149 y(page)i(103.)480 2321 y Fn(-D)f Fo(date2)138 b +2517 y(page)i(105.)480 2700 y Fn(-D)f Fo(date2)138 b Fs(Di\013)30 b Fo(rev1)7 b Fs(/)p Fo(date1)40 b Fs(against)31 b Fo(date2)p Fs(.)41 b(See)31 b(Section)f(A.8.1)i([di\013)d(options],)i -(page)g(103.)480 2494 y Fn(-l)384 b Fs(Lo)s(cal;)45 b(run)39 +(page)g(105.)480 2882 y Fn(-l)384 b Fs(Lo)s(cal;)45 b(run)39 b(only)h(in)f(curren)m(t)h(w)m(orking)f(directory)-8 -b(.)71 b(See)40 b(Chapter)g(9)h([Recursiv)m(e)960 2618 -y(b)s(eha)m(vior],)30 b(page)h(55.)480 2791 y Fn(-N)384 +b(.)71 b(See)40 b(Chapter)g(9)h([Recursiv)m(e)960 3007 +y(b)s(eha)m(vior],)30 b(page)h(57.)480 3190 y Fn(-N)384 b Fs(Include)30 b(di\013s)h(for)g(added)g(and)g(remo)m(v)m(ed)i (\014les.)44 b(See)32 b(Section)g(A.8.1)h([di\013)e(options],)960 -2916 y(page)g(103.)480 3088 y Fn(-r)f Fo(rev1)185 b Fs(Di\013)30 +3314 y(page)g(105.)480 3497 y Fn(-r)f Fo(rev1)185 b Fs(Di\013)30 b(revision)e(for)i Fo(rev1)38 b Fs(against)30 b(w)m(orking)f(\014le.)40 b(See)31 b(Section)e(A.8.1)j([di\013)d(options],)960 -3213 y(page)i(103.)480 3385 y Fn(-r)f Fo(rev2)185 b Fs(Di\013)30 +3621 y(page)i(105.)480 3804 y Fn(-r)f Fo(rev2)185 b Fs(Di\013)30 b(rev1/date1)i(against)f(rev2.)41 b(See)31 b(Section)f(A.8.1)i([di\013) -d(options],)h(page)i(103.)0 3558 y Fn(edit)d([)p Fo(options)t -Fn(])g([)p Fo(\014les)t Fh(:)15 b(:)g(:)p Fn(])480 3682 +d(options],)h(page)i(105.)0 3987 y Fn(edit)d([)p Fo(options)t +Fn(])g([)p Fo(\014les)t Fh(:)15 b(:)g(:)p Fn(])480 4111 y Fs(Get)31 b(ready)g(to)g(edit)f(a)g(w)m(atc)m(hed)i(\014le.)40 -b(See)30 b(Section)g(6.6.3)j([Editing)28 b(\014les],)i(page)h(42.)480 -3855 y Fn(-a)f Fo(actions)76 b Fs(Sp)s(ecify)52 b(actions)h(for)h(temp) +b(See)30 b(Section)g(6.6.3)j([Editing)28 b(\014les],)i(page)h(44.)480 +4294 y Fn(-a)f Fo(actions)76 b Fs(Sp)s(ecify)52 b(actions)h(for)h(temp) s(orary)f(w)m(atc)m(h,)60 b(where)53 b Fo(actions)58 b Fs(is)52 b Fn(edit)p Fs(,)58 b Fn(unedit)p Fs(,)960 -3979 y Fn(commit)p Fs(,)29 b Fn(all)p Fs(,)h(or)g Fn(none)p +4418 y Fn(commit)p Fs(,)29 b Fn(all)p Fs(,)h(or)g Fn(none)p Fs(.)40 b(See)30 b(Section)g(6.6.3)j([Editing)28 b(\014les],)i(page)h -(42.)480 4152 y Fn(-l)384 b Fs(Lo)s(cal;)45 b(run)39 +(44.)480 4601 y Fn(-l)384 b Fs(Lo)s(cal;)45 b(run)39 b(only)h(in)f(curren)m(t)h(w)m(orking)f(directory)-8 -b(.)71 b(See)40 b(Chapter)g(9)h([Recursiv)m(e)960 4276 -y(b)s(eha)m(vior],)30 b(page)h(55.)0 4449 y Fn(editors)d([)p +b(.)71 b(See)40 b(Chapter)g(9)h([Recursiv)m(e)960 4726 +y(b)s(eha)m(vior],)30 b(page)h(57.)0 4908 y Fn(editors)d([)p Fo(options)t Fn(])h([)p Fo(\014les)t Fh(:)15 b(:)g(:)p -Fn(])480 4573 y Fs(See)31 b(who)f(is)f(editing)g(a)i(w)m(atc)m(hed)g +Fn(])480 5033 y Fs(See)31 b(who)f(is)f(editing)g(a)i(w)m(atc)m(hed)g (\014le.)40 b(See)31 b(Section)f(6.6.4)i([W)-8 b(atc)m(h)33 -b(information],)c(page)i(43.)480 4746 y Fn(-l)384 b Fs(Lo)s(cal;)45 +b(information],)c(page)i(45.)480 5215 y Fn(-l)384 b Fs(Lo)s(cal;)45 b(run)39 b(only)h(in)f(curren)m(t)h(w)m(orking)f(directory)-8 -b(.)71 b(See)40 b(Chapter)g(9)h([Recursiv)m(e)960 4870 -y(b)s(eha)m(vior],)30 b(page)h(55.)0 5043 y Fn(export)e([)p +b(.)71 b(See)40 b(Chapter)g(9)h([Recursiv)m(e)960 5340 +y(b)s(eha)m(vior],)30 b(page)h(57.)p eop +%%Page: 130 132 +130 131 bop 0 -116 a Fs(130)2366 b(CVS|Concurren)m(t)29 +b(V)-8 b(ersions)30 b(System)0 366 y Fn(export)f([)p Fo(options)t Fn(])g Fo(mo)s(dules)t Fh(:)15 b(:)g(:)480 -5167 y Fs(Exp)s(ort)30 b(\014les)f(from)h(CVS.)g(See)g(Section)h(A.9)g -([exp)s(ort],)g(page)g(105.)480 5340 y Fn(-D)f Fo(date)183 +491 y Fs(Exp)s(ort)30 b(\014les)f(from)h(CVS.)g(See)g(Section)h(A.9)g +([exp)s(ort],)g(page)g(107.)480 670 y Fn(-D)f Fo(date)183 b Fs(Chec)m(k)24 b(out)f(revisions)e(as)j(of)f Fo(date)p -Fs(.)39 b(See)23 b(Section)g(A.4)h([Common)f(options],)i(page)f(90.)p -eop -%%Page: 128 130 -128 129 bop 0 -116 a Fs(128)2366 b(CVS|Concurren)m(t)29 -b(V)-8 b(ersions)30 b(System)480 366 y Fn(-d)g Fo(dir)241 -b Fs(Chec)m(k)31 b(out)f(in)m(to)h Fo(dir)p Fs(.)39 b(See)30 -b(Section)h(A.9.1)g([exp)s(ort)g(options],)f(page)h(105.)480 -536 y Fn(-f)384 b Fs(Use)21 b(head)g(revision)e(if)g(tag/date)k(not)e -(found.)37 b(See)21 b(Section)f(A.4)i([Common)e(options],)960 -661 y(page)31 b(90.)480 831 y Fn(-k)f Fo(k\015ag)165 -b Fs(Use)51 b Fo(k\015ag)59 b Fs(k)m(eyw)m(ord)51 b(expansion.)100 -b(See)51 b(Section)g(17.4)h([Substitution)c(mo)s(des],)960 -956 y(page)31 b(77.)480 1126 y Fn(-l)384 b Fs(Lo)s(cal;)45 -b(run)39 b(only)h(in)f(curren)m(t)h(w)m(orking)f(directory)-8 -b(.)71 b(See)40 b(Chapter)g(9)h([Recursiv)m(e)960 1250 -y(b)s(eha)m(vior],)30 b(page)h(55.)480 1420 y Fn(-N)384 +Fs(.)39 b(See)23 b(Section)g(A.4)h([Common)f(options],)i(page)f(92.)480 +850 y Fn(-d)30 b Fo(dir)241 b Fs(Chec)m(k)31 b(out)f(in)m(to)h +Fo(dir)p Fs(.)39 b(See)30 b(Section)h(A.9.1)g([exp)s(ort)g(options],)f +(page)h(107.)480 1029 y Fn(-f)384 b Fs(Use)21 b(head)g(revision)e(if)g +(tag/date)k(not)e(found.)37 b(See)21 b(Section)f(A.4)i([Common)e +(options],)960 1154 y(page)31 b(92.)480 1333 y Fn(-k)f +Fo(k\015ag)165 b Fs(Use)51 b Fo(k\015ag)59 b Fs(k)m(eyw)m(ord)51 +b(expansion.)100 b(See)51 b(Section)g(17.4)h([Substitution)c(mo)s +(des],)960 1458 y(page)31 b(79.)480 1637 y Fn(-l)384 +b Fs(Lo)s(cal;)45 b(run)39 b(only)h(in)f(curren)m(t)h(w)m(orking)f +(directory)-8 b(.)71 b(See)40 b(Chapter)g(9)h([Recursiv)m(e)960 +1762 y(b)s(eha)m(vior],)30 b(page)h(57.)480 1941 y Fn(-N)384 b Fs(Don't)34 b(shorten)f(mo)s(dule)e(paths)i(if)f(-d)h(sp)s (eci\014ed.)47 b(See)33 b(Section)g(A.9.1)i([exp)s(ort)e(op-)960 -1545 y(tions],)d(page)h(105.)480 1715 y Fn(-n)384 b Fs(Do)35 +2066 y(tions],)d(page)h(107.)480 2245 y Fn(-n)384 b Fs(Do)35 b(not)f(run)f(mo)s(dule)f(program)i(\(if)g(an)m(y\).)52 b(See)34 b(Section)g(A.9.1)i([exp)s(ort)e(options],)960 -1839 y(page)d(105.)480 2009 y Fn(-P)384 b Fs(Prune)29 +2370 y(page)d(107.)480 2549 y Fn(-P)384 b Fs(Prune)29 b(empt)m(y)i(directories.)40 b(See)30 b(Chapter)g(15)h([Mo)m(ving)g -(directories],)f(page)h(71.)480 2179 y Fn(-r)f Fo(tag)229 +(directories],)f(page)h(73.)480 2729 y Fn(-r)f Fo(tag)229 b Fs(Chec)m(k)m(out)48 b(revision)c Fo(tag)56 b Fs(\(is)46 b(stic)m(ky\).)89 b(See)47 b(Section)g(A.4)g([Common)f(options],)960 -2304 y(page)31 b(90.)0 2474 y Fn(history)d([)p Fo(options)t -Fn(])h([)p Fo(\014les)t Fh(:)15 b(:)g(:)p Fn(])480 2598 +2853 y(page)31 b(92.)0 3033 y Fn(history)d([)p Fo(options)t +Fn(])h([)p Fo(\014les)t Fh(:)15 b(:)g(:)p Fn(])480 3157 y Fs(Sho)m(w)30 b(rep)s(ository)f(access)j(history)-8 -b(.)40 b(See)31 b(Section)f(A.10)h([history],)f(page)i(106.)480 -2768 y Fn(-a)384 b Fs(All)29 b(users)h(\(default)f(is)h(self)7 +b(.)40 b(See)31 b(Section)f(A.10)h([history],)f(page)i(108.)480 +3337 y Fn(-a)384 b Fs(All)29 b(users)h(\(default)f(is)h(self)7 b(\).)40 b(See)31 b(Section)f(A.10.1)i([history)e(options],)g(page)h -(106.)480 2938 y Fn(-b)f Fo(str)247 b Fs(Bac)m(k)46 b(to)e(record)g +(108.)480 3516 y Fn(-b)f Fo(str)247 b Fs(Bac)m(k)46 b(to)e(record)g (with)f Fo(str)50 b Fs(in)42 b(mo)s(dule/\014le/rep)s(os)g(\014eld.)80 -b(See)44 b(Section)g(A.10.1)960 3063 y([history)30 b(options],)g(page)h -(106.)480 3233 y Fn(-c)384 b Fs(Rep)s(ort)25 b(on)g(committed)g(\(mo)s +b(See)44 b(Section)g(A.10.1)960 3641 y([history)30 b(options],)g(page)h +(108.)480 3820 y Fn(-c)384 b Fs(Rep)s(ort)25 b(on)g(committed)g(\(mo)s (di\014ed\))f(\014les.)38 b(See)26 b(Section)f(A.10.1)i([history)d -(options],)960 3357 y(page)31 b(106.)480 3527 y Fn(-D)f +(options],)960 3945 y(page)31 b(108.)480 4124 y Fn(-D)f Fo(date)183 b Fs(Since)29 b Fo(date)p Fs(.)42 b(See)30 -b(Section)h(A.10.1)h([history)d(options],)i(page)g(106.)480 -3697 y Fn(-e)384 b Fs(Rep)s(ort)29 b(on)g(all)f(record)h(t)m(yp)s(es.) -40 b(See)29 b(Section)g(A.10.1)i([history)d(options],)i(page)f(106.)480 -3867 y Fn(-l)384 b Fs(Last)28 b(mo)s(di\014ed)e(\(committed)j(or)e(mo)s +b(Section)h(A.10.1)h([history)d(options],)i(page)g(108.)480 +4304 y Fn(-e)384 b Fs(Rep)s(ort)29 b(on)g(all)f(record)h(t)m(yp)s(es.) +40 b(See)29 b(Section)g(A.10.1)i([history)d(options],)i(page)f(108.)480 +4483 y Fn(-l)384 b Fs(Last)28 b(mo)s(di\014ed)e(\(committed)j(or)e(mo)s (di\014ed)f(rep)s(ort\).)40 b(See)28 b(Section)g(A.10.1)i([history)960 -3992 y(options],)g(page)h(106.)480 4162 y Fn(-m)f Fo(mo)s(dule)960 -4286 y Fs(Rep)s(ort)50 b(on)g Fo(mo)s(dule)j Fs(\(rep)s(eatable\).)101 +4608 y(options],)g(page)h(108.)480 4787 y Fn(-m)f Fo(mo)s(dule)960 +4911 y Fs(Rep)s(ort)50 b(on)g Fo(mo)s(dule)j Fs(\(rep)s(eatable\).)101 b(See)50 b(Section)g(A.10.1)i([history)d(options],)960 -4411 y(page)31 b(106.)480 4581 y Fn(-n)f Fo(mo)s(dule)960 -4705 y Fs(In)g Fo(mo)s(dule)p Fs(.)39 b(See)30 b(Section)g(A.10.1)j -([history)c(options],)i(page)g(106.)480 4875 y Fn(-o)384 -b Fs(Rep)s(ort)47 b(on)g(c)m(hec)m(k)m(ed)i(out)e(mo)s(dules.)89 +5036 y(page)31 b(108.)480 5215 y Fn(-n)f Fo(mo)s(dule)960 +5340 y Fs(In)g Fo(mo)s(dule)p Fs(.)39 b(See)30 b(Section)g(A.10.1)j +([history)c(options],)i(page)g(108.)p eop +%%Page: 131 133 +131 132 bop 0 -116 a Fs(App)s(endix)28 b(B:)j(Quic)m(k)e(reference)i +(to)g(CVS)f(commands)1837 b(131)480 366 y Fn(-o)384 b +Fs(Rep)s(ort)47 b(on)g(c)m(hec)m(k)m(ed)i(out)e(mo)s(dules.)89 b(See)48 b(Section)f(A.10.1)i([history)d(options],)960 -5000 y(page)31 b(106.)480 5170 y Fn(-r)f Fo(rev)230 b -Fs(Since)29 b(revision)g Fo(rev)p Fs(.)41 b(See)30 b(Section)g(A.10.1)j -([history)c(options],)i(page)g(106.)480 5340 y Fn(-T)384 -b Fs(Pro)s(duce)21 b(rep)s(ort)h(on)g(all)f(T)-8 b(A)m(Gs.)39 -b(See)23 b(Section)f(A.10.1)i([history)e(options],)h(page)g(106.)p -eop -%%Page: 129 131 -129 130 bop 0 -116 a Fs(App)s(endix)28 b(B:)j(Quic)m(k)e(reference)i -(to)g(CVS)f(commands)1837 b(129)480 366 y Fn(-t)30 b -Fo(tag)229 b Fs(Since)41 b(tag)j(record)e(placed)f(in)g(history)g +491 y(page)31 b(108.)480 668 y Fn(-r)f Fo(rev)230 b Fs(Since)29 +b(revision)g Fo(rev)p Fs(.)41 b(See)30 b(Section)g(A.10.1)j([history)c +(options],)i(page)g(108.)480 844 y Fn(-T)384 b Fs(Pro)s(duce)21 +b(rep)s(ort)h(on)g(all)f(T)-8 b(A)m(Gs.)39 b(See)23 b(Section)f(A.10.1) +i([history)e(options],)h(page)g(108.)480 1021 y Fn(-t)30 +b Fo(tag)229 b Fs(Since)41 b(tag)j(record)e(placed)f(in)g(history)g (\014le)g(\(b)m(y)i(an)m(y)m(one\).)78 b(See)42 b(Section)g(A.10.1)960 -491 y([history)30 b(options],)g(page)h(106.)480 668 y -Fn(-u)f Fo(user)191 b Fs(F)-8 b(or)31 b(user)e Fo(user)36 +1145 y([history)30 b(options],)g(page)h(108.)480 1322 +y Fn(-u)f Fo(user)191 b Fs(F)-8 b(or)31 b(user)e Fo(user)36 b Fs(\(rep)s(eatable\).)41 b(See)30 b(Section)g(A.10.1)i([history)e -(options],)g(page)g(106.)480 844 y Fn(-w)384 b Fs(W)-8 +(options],)g(page)g(108.)480 1498 y Fn(-w)384 b Fs(W)-8 b(orking)52 b(directory)f(m)m(ust)h(matc)m(h.)106 b(See)52 -b(Section)g(A.10.1)i([history)d(options],)960 969 y(page)31 -b(106.)480 1145 y Fn(-x)f Fo(t)m(yp)s(es)144 b Fs(Rep)s(ort)28 +b(Section)g(A.10.1)i([history)d(options],)960 1623 y(page)31 +b(108.)480 1799 y Fn(-x)f Fo(t)m(yp)s(es)144 b Fs(Rep)s(ort)28 b(on)f Fo(t)m(yp)s(es)p Fs(,)i(one)f(or)g(more)g(of)g Fn(TOEFWUCGMAR)p Fs(.)37 b(See)28 b(Section)g(A.10.1)i([history)960 -1270 y(options],)g(page)h(106.)480 1446 y Fn(-z)f Fo(zone)178 +1924 y(options],)g(page)h(108.)480 2101 y Fn(-z)f Fo(zone)178 b Fs(Output)27 b(for)i(time)f(zone)h Fo(zone)p Fs(.)41 -b(See)29 b(Section)f(A.10.1)j([history)c(options],)i(page)g(106.)0 -1623 y Fn(import)g([)p Fo(options)t Fn(])g Fo(rep)s(ository)37 +b(See)29 b(Section)f(A.10.1)j([history)c(options],)i(page)g(108.)0 +2277 y Fn(import)g([)p Fo(options)t Fn(])g Fo(rep)s(ository)37 b(v)m(endor-tag)i(release-tags)t Fh(:)15 b(:)g(:)480 -1747 y Fs(Imp)s(ort)29 b(\014les)h(in)m(to)g(CVS,)g(using)f(v)m(endor)h +2402 y Fs(Imp)s(ort)29 b(\014les)h(in)m(to)g(CVS,)g(using)f(v)m(endor)h (branc)m(hes.)40 b(See)31 b(Section)f(A.11)i([imp)s(ort],)d(page)i -(108.)480 1924 y Fn(-b)f Fo(bra)222 b Fs(Imp)s(ort)56 +(110.)480 2578 y Fn(-b)f Fo(bra)222 b Fs(Imp)s(ort)56 b(to)i(v)m(endor)f(branc)m(h)f Fo(bra)p Fs(.)121 b(See)57 -b(Section)g(A.11.1)i([imp)s(ort)d(options],)960 2048 -y(page)31 b(109.)480 2225 y Fn(-d)384 b Fs(Use)32 b(the)g(\014le's)g +b(Section)g(A.11.1)i([imp)s(ort)d(options],)960 2703 +y(page)31 b(111.)480 2879 y Fn(-d)384 b Fs(Use)32 b(the)g(\014le's)g (mo)s(di\014cation)e(time)h(as)i(the)f(time)f(of)h(imp)s(ort.)44 -b(See)32 b(Section)g(A.11.1)960 2350 y([imp)s(ort)d(options],)h(page)h -(109.)480 2526 y Fn(-k)f Fo(k\015ag)165 b Fs(Set)36 b(default)f(R)m(CS) +b(See)32 b(Section)g(A.11.1)960 3004 y([imp)s(ort)d(options],)h(page)h +(111.)480 3180 y Fn(-k)f Fo(k\015ag)165 b Fs(Set)36 b(default)f(R)m(CS) h(k)m(eyw)m(ord)g(substitution)e(mo)s(de.)57 b(See)36 -b(Section)f(A.11.1)j([imp)s(ort)960 2651 y(options],)30 -b(page)h(109.)480 2827 y Fn(-m)f Fo(msg)197 b Fs(Use)31 +b(Section)f(A.11.1)j([imp)s(ort)960 3305 y(options],)30 +b(page)h(111.)480 3481 y Fn(-m)f Fo(msg)197 b Fs(Use)31 b Fo(msg)38 b Fs(for)30 b(log)h(message.)41 b(See)31 -b(Section)f(A.11.1)j([imp)s(ort)c(options],)h(page)h(109.)480 -3004 y Fn(-I)f Fo(ign)232 b Fs(More)45 b(\014les)e(to)i(ignore)f(\(!)82 +b(Section)f(A.11.1)j([imp)s(ort)c(options],)h(page)h(111.)480 +3658 y Fn(-I)f Fo(ign)232 b Fs(More)45 b(\014les)e(to)i(ignore)f(\(!)82 b(to)45 b(reset\).)84 b(See)44 b(Section)g(A.11.1)i([imp)s(ort)d -(options],)960 3128 y(page)31 b(109.)480 3305 y Fn(-W)f +(options],)960 3783 y(page)31 b(111.)480 3959 y Fn(-W)f Fo(sp)s(ec)184 b Fs(More)31 b(wrapp)s(ers.)39 b(See)30 -b(Section)h(A.11.1)h([imp)s(ort)d(options],)h(page)h(109.)0 -3481 y Fn(init)288 b Fs(Create)39 b(a)f(CVS)f(rep)s(ository)g(if)g(it)h +b(Section)h(A.11.1)h([imp)s(ort)d(options],)h(page)h(111.)0 +4136 y Fn(init)288 b Fs(Create)39 b(a)f(CVS)f(rep)s(ository)g(if)g(it)h (do)s(esn't)f(exist.)63 b(See)39 b(Section)e(4.5)i([Creating)f(a)g(rep) -s(ository],)480 3606 y(page)31 b(20.)0 3783 y Fn(log)e([)p +s(ository],)480 4260 y(page)31 b(20.)0 4437 y Fn(log)e([)p Fo(options)t Fn(])g([)p Fo(\014les)t Fh(:)15 b(:)g(:)p -Fn(])480 3907 y Fs(Prin)m(t)29 b(out)i(history)e(information)g(for)h -(\014les.)40 b(See)30 b(Section)h(A.12)g([log],)g(page)h(110.)480 -4084 y Fn(-b)384 b Fs(Only)28 b(list)g(revisions)f(on)j(the)f(default)g +Fn(])480 4561 y Fs(Prin)m(t)29 b(out)i(history)e(information)g(for)h +(\014les.)40 b(See)30 b(Section)h(A.12)g([log],)g(page)h(113.)480 +4738 y Fn(-b)384 b Fs(Only)28 b(list)g(revisions)f(on)j(the)f(default)g (branc)m(h.)40 b(See)30 b(Section)f(A.12.1)i([log)f(options],)960 -4208 y(page)h(111.)480 4385 y Fn(-d)f Fo(dates)147 b +4862 y(page)h(113.)480 5039 y Fn(-d)f Fo(dates)147 b Fs(Sp)s(ecify)37 b(dates)h(\()p Fo(d1)7 b Fn(<)p Fo(d2)46 b Fs(for)38 b(range,)j Fo(d)g Fs(for)d(latest)h(b)s(efore\).)64 -b(See)39 b(Section)f(A.12.1)960 4509 y([log)31 b(options],)f(page)h -(111.)480 4686 y Fn(-h)384 b Fs(Only)29 b(prin)m(t)g(header.)40 -b(See)31 b(Section)f(A.12.1)i([log)f(options],)f(page)h(111.)480 -4862 y Fn(-l)384 b Fs(Lo)s(cal;)45 b(run)39 b(only)h(in)f(curren)m(t)h -(w)m(orking)f(directory)-8 b(.)71 b(See)40 b(Chapter)g(9)h([Recursiv)m -(e)960 4987 y(b)s(eha)m(vior],)30 b(page)h(55.)480 5163 -y Fn(-N)384 b Fs(Do)31 b(not)g(list)e(tags.)42 b(See)30 -b(Section)g(A.12.1)j([log)d(options],)h(page)g(111.)480 -5340 y Fn(-R)384 b Fs(Only)29 b(prin)m(t)g(name)h(of)h(R)m(CS)f -(\014le.)39 b(See)31 b(Section)f(A.12.1)j([log)d(options],)g(page)i -(111.)p eop -%%Page: 130 132 -130 131 bop 0 -116 a Fs(130)2366 b(CVS|Concurren)m(t)29 -b(V)-8 b(ersions)30 b(System)480 366 y Fn(-r)g Fo(revs)194 -b Fs(Only)29 b(list)g(revisions)f Fo(revs)p Fs(.)41 b(See)30 -b(Section)h(A.12.1)h([log)f(options],)f(page)h(111.)480 -543 y Fn(-s)f Fo(states)127 b Fs(Only)33 b(list)g(revisions)f(with)h -(sp)s(eci\014ed)g(states.)53 b(See)35 b(Section)f(A.12.1)i([log)f -(options],)960 668 y(page)c(111.)480 844 y Fn(-t)384 -b Fs(Only)34 b(prin)m(t)g(header)i(and)f(descriptiv)m(e)g(text.)58 -b(See)36 b(Section)f(A.12.1)j([log)e(options],)960 969 -y(page)31 b(111.)480 1145 y Fn(-w)f Fo(logins)125 b Fs(Only)33 -b(list)h(revisions)f(c)m(hec)m(k)m(ed)k(in)c(b)m(y)i(sp)s(eci\014ed)e -(logins.)53 b(See)35 b(Section)g(A.12.1)i([log)960 1270 -y(options],)30 b(page)h(111.)0 1446 y Fn(login)240 b -Fs(Prompt)31 b(for)g(passw)m(ord)g(for)h(authen)m(ticating)f(serv)m -(er.)45 b(See)32 b(Section)f(4.6.2.2)j([P)m(assw)m(ord)e(authen-)480 -1571 y(tication)e(clien)m(t],)h(page)g(25.)0 1747 y Fn(rdiff)e([)p -Fo(options)t Fn(])g Fo(mo)s(dules)t Fh(:)15 b(:)g(:)480 -1872 y Fs(Sho)m(w)30 b(di\013erences)g(b)s(et)m(w)m(een)h(releases.)40 -b(See)31 b(Section)f(A.13)i([rdi\013)7 b(],)29 b(page)j(112.)480 -2048 y Fn(-c)384 b Fs(Con)m(text)41 b(di\013)d(output)i(format)g -(\(default\).)69 b(See)40 b(Section)f(A.13.1)j([rdi\013)c(options],)960 -2173 y(page)31 b(113.)480 2350 y Fn(-D)f Fo(date)183 -b Fs(Select)23 b(revisions)f(based)h(on)g Fo(date)p Fs(.)39 -b(See)23 b(Section)g(A.4)h([Common)f(options],)i(page)f(90.)480 -2526 y Fn(-f)384 b Fs(Use)21 b(head)g(revision)e(if)g(tag/date)k(not)e +b(See)39 b(Section)f(A.12.1)960 5163 y([log)31 b(options],)f(page)h +(113.)480 5340 y Fn(-h)384 b Fs(Only)29 b(prin)m(t)g(header.)40 +b(See)31 b(Section)f(A.12.1)i([log)f(options],)f(page)h(113.)p +eop +%%Page: 132 134 +132 133 bop 0 -116 a Fs(132)2366 b(CVS|Concurren)m(t)29 +b(V)-8 b(ersions)30 b(System)480 366 y Fn(-l)384 b Fs(Lo)s(cal;)45 +b(run)39 b(only)h(in)f(curren)m(t)h(w)m(orking)f(directory)-8 +b(.)71 b(See)40 b(Chapter)g(9)h([Recursiv)m(e)960 491 +y(b)s(eha)m(vior],)30 b(page)h(57.)480 668 y Fn(-N)384 +b Fs(Do)31 b(not)g(list)e(tags.)42 b(See)30 b(Section)g(A.12.1)j([log)d +(options],)h(page)g(113.)480 844 y Fn(-R)384 b Fs(Only)29 +b(prin)m(t)g(name)h(of)h(R)m(CS)f(\014le.)39 b(See)31 +b(Section)f(A.12.1)j([log)d(options],)g(page)i(113.)480 +1021 y Fn(-r)e Fo(revs)194 b Fs(Only)29 b(list)g(revisions)f +Fo(revs)p Fs(.)41 b(See)30 b(Section)h(A.12.1)h([log)f(options],)f +(page)h(113.)480 1197 y Fn(-s)f Fo(states)127 b Fs(Only)33 +b(list)g(revisions)f(with)h(sp)s(eci\014ed)g(states.)53 +b(See)35 b(Section)f(A.12.1)i([log)f(options],)960 1322 +y(page)c(113.)480 1498 y Fn(-t)384 b Fs(Only)34 b(prin)m(t)g(header)i +(and)f(descriptiv)m(e)g(text.)58 b(See)36 b(Section)f(A.12.1)j([log)e +(options],)960 1623 y(page)31 b(113.)480 1799 y Fn(-w)f +Fo(logins)125 b Fs(Only)33 b(list)h(revisions)f(c)m(hec)m(k)m(ed)k(in)c +(b)m(y)i(sp)s(eci\014ed)e(logins.)53 b(See)35 b(Section)g(A.12.1)i +([log)960 1924 y(options],)30 b(page)h(113.)0 2101 y +Fn(login)240 b Fs(Prompt)31 b(for)g(passw)m(ord)g(for)h(authen)m +(ticating)f(serv)m(er.)45 b(See)32 b(Section)f(4.6.3.2)j([P)m(assw)m +(ord)e(authen-)480 2225 y(tication)e(clien)m(t],)h(page)g(25.)0 +2402 y Fn(logout)192 b Fs(Remo)m(v)m(e)36 b(stored)f(passw)m(ord)f(for) +g(authen)m(ticating)h(serv)m(er.)53 b(See)35 b(Section)f(4.6.3.2)j([P)m +(assw)m(ord)e(au-)480 2526 y(then)m(tication)c(clien)m(t],)f(page)h +(25.)0 2703 y Fn(rdiff)e([)p Fo(options)t Fn(])g Fo(mo)s(dules)t +Fh(:)15 b(:)g(:)480 2827 y Fs(Sho)m(w)30 b(di\013erences)g(b)s(et)m(w)m +(een)h(releases.)40 b(See)31 b(Section)f(A.13)i([rdi\013)7 +b(],)29 b(page)j(115.)480 3004 y Fn(-c)384 b Fs(Con)m(text)41 +b(di\013)d(output)i(format)g(\(default\).)69 b(See)40 +b(Section)f(A.13.1)j([rdi\013)c(options],)960 3128 y(page)31 +b(115.)480 3305 y Fn(-D)f Fo(date)183 b Fs(Select)23 +b(revisions)f(based)h(on)g Fo(date)p Fs(.)39 b(See)23 +b(Section)g(A.4)h([Common)f(options],)i(page)f(92.)480 +3481 y Fn(-f)384 b Fs(Use)21 b(head)g(revision)e(if)g(tag/date)k(not)e (found.)37 b(See)21 b(Section)f(A.4)i([Common)e(options],)960 -2651 y(page)31 b(90.)480 2827 y Fn(-l)384 b Fs(Lo)s(cal;)45 +3606 y(page)31 b(92.)480 3783 y Fn(-l)384 b Fs(Lo)s(cal;)45 b(run)39 b(only)h(in)f(curren)m(t)h(w)m(orking)f(directory)-8 -b(.)71 b(See)40 b(Chapter)g(9)h([Recursiv)m(e)960 2952 -y(b)s(eha)m(vior],)30 b(page)h(55.)480 3128 y Fn(-r)f +b(.)71 b(See)40 b(Chapter)g(9)h([Recursiv)m(e)960 3907 +y(b)s(eha)m(vior],)30 b(page)h(57.)480 4084 y Fn(-r)f Fo(rev)230 b Fs(Select)28 b(revisions)e(based)i(on)g Fo(rev)p Fs(.)40 b(See)28 b(Section)f(A.4)i([Common)f(options],)g(page) -h(90.)480 3305 y Fn(-s)384 b Fs(Short)25 b(patc)m(h)h(-)f(one)h(liner)d +h(92.)480 4260 y Fn(-s)384 b Fs(Short)25 b(patc)m(h)h(-)f(one)h(liner)d (p)s(er)h(\014le.)38 b(See)26 b(Section)f(A.13.1)i([rdi\013)d -(options],)i(page)g(113.)480 3481 y Fn(-t)384 b Fs(T)-8 +(options],)i(page)g(115.)480 4437 y Fn(-t)384 b Fs(T)-8 b(op)24 b(t)m(w)m(o)i(di\013s)d(-)i(last)f(c)m(hange)i(made)e(to)h(the) g(\014le.)38 b(See)25 b(Section)f(A.8.1)i([di\013)d(options],)960 -3606 y(page)31 b(103.)480 3783 y Fn(-u)384 b Fs(Unidi\013)28 +4561 y(page)31 b(105.)480 4738 y Fn(-u)384 b Fs(Unidi\013)28 b(output)i(format.)41 b(See)31 b(Section)f(A.13.1)i([rdi\013)d -(options],)h(page)h(113.)480 3959 y Fn(-V)f Fo(v)m(ers)197 +(options],)h(page)h(115.)480 4914 y Fn(-V)f Fo(v)m(ers)197 b Fs(Use)41 b(R)m(CS)g(V)-8 b(ersion)41 b Fo(v)m(ers)k Fs(for)c(k)m(eyw)m(ord)g(expansion.)72 b(See)41 b(Section)g(A.13.1)i -([rdi\013)960 4084 y(options],)30 b(page)h(113.)0 4260 +([rdi\013)960 5039 y(options],)30 b(page)h(115.)0 5215 y Fn(release)d([)p Fo(options)t Fn(])h Fo(directory)480 -4385 y Fs(Indicate)h(that)h(a)g(directory)f(is)f(no)h(longer)g(in)f -(use.)41 b(See)30 b(Section)h(A.14)g([release],)h(page)f(114.)480 -4561 y Fn(-d)384 b Fs(Delete)32 b(the)e(giv)m(en)h(directory)-8 -b(.)40 b(See)31 b(Section)f(A.14.1)i([release)f(options],)f(page)i -(115.)0 4738 y Fn(remove)d([)p Fo(options)t Fn(])g([)p -Fo(\014les)t Fh(:)15 b(:)g(:)o Fn(])480 4862 y Fs(Remo)m(v)m(e)32 -b(an)e(en)m(try)h(from)f(the)h(rep)s(ository)-8 b(.)40 -b(See)30 b(Chapter)g(11)h([Remo)m(ving)g(\014les],)f(page)h(59.)480 -5039 y Fn(-f)384 b Fs(Delete)24 b(the)f(\014le)e(b)s(efore)h(remo)m -(ving)h(it.)38 b(See)22 b(Chapter)g(11)i([Remo)m(ving)f(\014les],)g -(page)h(59.)480 5215 y Fn(-l)384 b Fs(Lo)s(cal;)45 b(run)39 -b(only)h(in)f(curren)m(t)h(w)m(orking)f(directory)-8 -b(.)71 b(See)40 b(Chapter)g(9)h([Recursiv)m(e)960 5340 -y(b)s(eha)m(vior],)30 b(page)h(55.)p eop -%%Page: 131 133 -131 132 bop 0 -116 a Fs(App)s(endix)28 b(B:)j(Quic)m(k)e(reference)i -(to)g(CVS)f(commands)1837 b(131)480 366 y Fn(-R)384 b -Fs(Op)s(erate)24 b(recursiv)m(ely)e(\(default\).)39 b(See)24 -b(Chapter)f(9)h([Recursiv)m(e)g(b)s(eha)m(vior],)g(page)h(55.)0 -536 y Fn(rtag)k([)p Fo(options)t Fn(])g Fo(tag)39 b(mo)s(dules)t -Fh(:)15 b(:)g(:)480 660 y Fs(Add)29 b(a)i(sym)m(b)s(olic)e(tag)j(to)f -(a)f(mo)s(dule.)40 b(See)30 b(Section)g(A.15)i([rtag],)g(page)f(116.) -480 830 y Fn(-a)384 b Fs(Clear)43 b(tag)h(from)f(remo)m(v)m(ed)i -(\014les)d(that)i(w)m(ould)f(not)g(otherwise)g(b)s(e)g(tagged.)82 -b(See)960 954 y(Section)30 b(A.15.1)j([rtag)e(options],)f(page)h(117.) -480 1124 y Fn(-b)384 b Fs(Create)31 b(a)g(branc)m(h)f(named)g -Fo(tag)p Fs(.)42 b(See)30 b(Section)g(A.15.1)j([rtag)e(options],)f -(page)h(117.)480 1293 y Fn(-D)f Fo(date)183 b Fs(T)-8 -b(ag)31 b(revisions)e(as)h(of)h Fo(date)p Fs(.)41 b(See)31 -b(Section)f(A.15.1)i([rtag)g(options],)e(page)h(117.)480 -1463 y Fn(-d)384 b Fs(Delete)32 b(the)e(giv)m(en)h(tag.)41 -b(See)31 b(Section)f(A.15.1)j([rtag)e(options],)f(page)h(117.)480 -1632 y Fn(-F)384 b Fs(Mo)m(v)m(e)32 b(tag)g(if)d(it)h(already)g +5340 y Fs(Indicate)h(that)h(a)g(directory)f(is)f(no)h(longer)g(in)f +(use.)41 b(See)30 b(Section)h(A.14)g([release],)h(page)f(116.)p +eop +%%Page: 133 135 +133 134 bop 0 -116 a Fs(App)s(endix)28 b(B:)j(Quic)m(k)e(reference)i +(to)g(CVS)f(commands)1837 b(133)480 366 y Fn(-d)384 b +Fs(Delete)32 b(the)e(giv)m(en)h(directory)-8 b(.)40 b(See)31 +b(Section)f(A.14.1)i([release)f(options],)f(page)i(117.)0 +544 y Fn(remove)d([)p Fo(options)t Fn(])g([)p Fo(\014les)t +Fh(:)15 b(:)g(:)o Fn(])480 669 y Fs(Remo)m(v)m(e)32 b(an)e(en)m(try)h +(from)f(the)h(rep)s(ository)-8 b(.)40 b(See)30 b(Chapter)g(11)h([Remo)m +(ving)g(\014les],)f(page)h(61.)480 846 y Fn(-f)384 b +Fs(Delete)24 b(the)f(\014le)e(b)s(efore)h(remo)m(ving)h(it.)38 +b(See)22 b(Chapter)g(11)i([Remo)m(ving)f(\014les],)g(page)h(61.)480 +1024 y Fn(-l)384 b Fs(Lo)s(cal;)45 b(run)39 b(only)h(in)f(curren)m(t)h +(w)m(orking)f(directory)-8 b(.)71 b(See)40 b(Chapter)g(9)h([Recursiv)m +(e)960 1148 y(b)s(eha)m(vior],)30 b(page)h(57.)480 1326 +y Fn(-R)384 b Fs(Op)s(erate)24 b(recursiv)m(ely)e(\(default\).)39 +b(See)24 b(Chapter)f(9)h([Recursiv)m(e)g(b)s(eha)m(vior],)g(page)h(57.) +0 1503 y Fn(rtag)k([)p Fo(options)t Fn(])g Fo(tag)39 +b(mo)s(dules)t Fh(:)15 b(:)g(:)480 1628 y Fs(Add)29 b(a)i(sym)m(b)s +(olic)e(tag)j(to)f(a)f(mo)s(dule.)40 b(See)30 b(Section)g(A.15)i +([rtag],)g(page)f(118.)480 1805 y Fn(-a)384 b Fs(Clear)43 +b(tag)h(from)f(remo)m(v)m(ed)i(\014les)d(that)i(w)m(ould)f(not)g +(otherwise)g(b)s(e)g(tagged.)82 b(See)960 1930 y(Section)30 +b(A.15.1)j([rtag)e(options],)f(page)h(119.)480 2107 y +Fn(-b)384 b Fs(Create)31 b(a)g(branc)m(h)f(named)g Fo(tag)p +Fs(.)42 b(See)30 b(Section)g(A.15.1)j([rtag)e(options],)f(page)h(119.) +480 2285 y Fn(-D)f Fo(date)183 b Fs(T)-8 b(ag)31 b(revisions)e(as)h(of) +h Fo(date)p Fs(.)41 b(See)31 b(Section)f(A.15.1)i([rtag)g(options],)e +(page)h(119.)480 2462 y Fn(-d)384 b Fs(Delete)32 b(the)e(giv)m(en)h +(tag.)41 b(See)31 b(Section)f(A.15.1)j([rtag)e(options],)f(page)h(119.) +480 2640 y Fn(-F)384 b Fs(Mo)m(v)m(e)32 b(tag)g(if)d(it)h(already)g (exists.)41 b(See)30 b(Section)g(A.15.1)j([rtag)e(options],)f(page)h -(117.)480 1802 y Fn(-f)384 b Fs(F)-8 b(orce)26 b(a)e(head)g(revision)f +(119.)480 2817 y Fn(-f)384 b Fs(F)-8 b(orce)26 b(a)e(head)g(revision)f (matc)m(h)i(if)e(tag/date)k(not)d(found.)37 b(See)25 -b(Section)f(A.15.1)i([rtag)960 1926 y(options],)k(page)h(117.)480 -2096 y Fn(-l)384 b Fs(Lo)s(cal;)45 b(run)39 b(only)h(in)f(curren)m(t)h +b(Section)f(A.15.1)i([rtag)960 2942 y(options],)k(page)h(119.)480 +3120 y Fn(-l)384 b Fs(Lo)s(cal;)45 b(run)39 b(only)h(in)f(curren)m(t)h (w)m(orking)f(directory)-8 b(.)71 b(See)40 b(Chapter)g(9)h([Recursiv)m -(e)960 2220 y(b)s(eha)m(vior],)30 b(page)h(55.)480 2390 +(e)960 3244 y(b)s(eha)m(vior],)30 b(page)h(57.)480 3422 y Fn(-n)384 b Fs(No)31 b(execution)g(of)f(tag)i(program.)40 -b(See)31 b(Section)f(A.15.1)i([rtag)g(options],)e(page)h(117.)480 -2559 y Fn(-R)384 b Fs(Op)s(erate)24 b(recursiv)m(ely)e(\(default\).)39 -b(See)24 b(Chapter)f(9)h([Recursiv)m(e)g(b)s(eha)m(vior],)g(page)h(55.) -480 2729 y Fn(-r)30 b Fo(tag)229 b Fs(T)-8 b(ag)31 b(existing)f(tag)h +b(See)31 b(Section)f(A.15.1)i([rtag)g(options],)e(page)h(119.)480 +3599 y Fn(-R)384 b Fs(Op)s(erate)24 b(recursiv)m(ely)e(\(default\).)39 +b(See)24 b(Chapter)f(9)h([Recursiv)m(e)g(b)s(eha)m(vior],)g(page)h(57.) +480 3777 y Fn(-r)30 b Fo(tag)229 b Fs(T)-8 b(ag)31 b(existing)f(tag)h Fo(tag)p Fs(.)42 b(See)31 b(Section)f(A.15.1)i([rtag)g(options],)e -(page)h(117.)0 2898 y Fn(status)e([)p Fo(options)t Fn(])g -Fo(\014les)t Fh(:)15 b(:)g(:)480 3023 y Fs(Displa)m(y)28 +(page)h(119.)0 3954 y Fn(status)e([)p Fo(options)t Fn(])g +Fo(\014les)t Fh(:)15 b(:)g(:)480 4079 y Fs(Displa)m(y)28 b(status)g(information)f(in)g(a)i(w)m(orking)f(directory)-8 -b(.)40 b(See)28 b(Section)h(A.16)g([status],)h(page)f(117.)480 -3192 y Fn(-l)384 b Fs(Lo)s(cal;)45 b(run)39 b(only)h(in)f(curren)m(t)h +b(.)40 b(See)28 b(Section)h(A.16)g([status],)h(page)f(119.)480 +4256 y Fn(-l)384 b Fs(Lo)s(cal;)45 b(run)39 b(only)h(in)f(curren)m(t)h (w)m(orking)f(directory)-8 b(.)71 b(See)40 b(Chapter)g(9)h([Recursiv)m -(e)960 3317 y(b)s(eha)m(vior],)30 b(page)h(55.)480 3486 +(e)960 4381 y(b)s(eha)m(vior],)30 b(page)h(57.)480 4558 y Fn(-R)384 b Fs(Op)s(erate)24 b(recursiv)m(ely)e(\(default\).)39 -b(See)24 b(Chapter)f(9)h([Recursiv)m(e)g(b)s(eha)m(vior],)g(page)h(55.) -480 3656 y Fn(-v)384 b Fs(Include)52 b(tag)i(information)d(for)i +b(See)24 b(Chapter)f(9)h([Recursiv)m(e)g(b)s(eha)m(vior],)g(page)h(57.) +480 4736 y Fn(-v)384 b Fs(Include)52 b(tag)i(information)d(for)i (\014le.)109 b(See)53 b(Section)g(A.16.1)i([status)f(options],)960 -3780 y(page)31 b(118.)0 3950 y Fn(tag)e([)p Fo(options)t +4860 y(page)31 b(120.)0 5038 y Fn(tag)e([)p Fo(options)t Fn(])g Fo(tag)40 b Fn([)p Fo(\014les)t Fh(:)15 b(:)g(:)o -Fn(])480 4074 y Fs(Add)29 b(a)i(sym)m(b)s(olic)e(tag)j(to)f(c)m(hec)m +Fn(])480 5162 y Fs(Add)29 b(a)i(sym)m(b)s(olic)e(tag)j(to)f(c)m(hec)m (k)m(ed)h(out)f(v)m(ersion)e(of)i(\014les.)40 b(See)30 -b(Section)g(A.17)i([tag],)g(page)g(118.)480 4244 y Fn(-b)384 +b(Section)g(A.17)i([tag],)g(page)g(120.)480 5340 y Fn(-b)384 b Fs(Create)31 b(a)g(branc)m(h)f(named)g Fo(tag)p Fs(.)42 -b(See)30 b(Section)g(A.17.1)j([tag)f(options],)e(page)h(119.)480 -4413 y Fn(-D)f Fo(date)183 b Fs(T)-8 b(ag)31 b(revisions)e(as)h(of)h -Fo(date)p Fs(.)41 b(See)31 b(Section)f(A.17.1)i([tag)g(options],)e -(page)i(119.)480 4583 y Fn(-d)384 b Fs(Delete)32 b(the)e(giv)m(en)h -(tag.)41 b(See)31 b(Section)f(A.17.1)j([tag)e(options],)g(page)g(119.) -480 4752 y Fn(-F)384 b Fs(Mo)m(v)m(e)32 b(tag)g(if)d(it)h(already)g -(exists.)41 b(See)30 b(Section)g(A.17.1)j([tag)f(options],)e(page)h -(119.)480 4921 y Fn(-f)384 b Fs(F)-8 b(orce)29 b(a)f(head)f(revision)e -(matc)m(h)k(if)d(tag/date)k(not)d(found.)38 b(See)28 -b(Section)f(A.17.1)i([tag)960 5046 y(options],)h(page)h(119.)480 -5215 y Fn(-l)384 b Fs(Lo)s(cal;)45 b(run)39 b(only)h(in)f(curren)m(t)h -(w)m(orking)f(directory)-8 b(.)71 b(See)40 b(Chapter)g(9)h([Recursiv)m -(e)960 5340 y(b)s(eha)m(vior],)30 b(page)h(55.)p eop -%%Page: 132 134 -132 133 bop 0 -116 a Fs(132)2366 b(CVS|Concurren)m(t)29 -b(V)-8 b(ersions)30 b(System)480 366 y Fn(-n)384 b Fs(No)31 -b(execution)g(of)f(tag)i(program.)40 b(See)31 b(Section)f(A.17.1)i -([tag)g(options],)e(page)h(119.)480 550 y Fn(-R)384 b -Fs(Op)s(erate)24 b(recursiv)m(ely)e(\(default\).)39 b(See)24 -b(Chapter)f(9)h([Recursiv)m(e)g(b)s(eha)m(vior],)g(page)h(55.)480 -733 y Fn(-r)30 b Fo(tag)229 b Fs(T)-8 b(ag)31 b(existing)f(tag)h +b(See)30 b(Section)g(A.17.1)j([tag)f(options],)e(page)h(121.)p +eop +%%Page: 134 136 +134 135 bop 0 -116 a Fs(134)2366 b(CVS|Concurren)m(t)29 +b(V)-8 b(ersions)30 b(System)480 366 y Fn(-D)g Fo(date)183 +b Fs(T)-8 b(ag)31 b(revisions)e(as)h(of)h Fo(date)p Fs(.)41 +b(See)31 b(Section)f(A.17.1)i([tag)g(options],)e(page)i(121.)480 +540 y Fn(-d)384 b Fs(Delete)32 b(the)e(giv)m(en)h(tag.)41 +b(See)31 b(Section)f(A.17.1)j([tag)e(options],)g(page)g(121.)480 +714 y Fn(-F)384 b Fs(Mo)m(v)m(e)32 b(tag)g(if)d(it)h(already)g(exists.) +41 b(See)30 b(Section)g(A.17.1)j([tag)f(options],)e(page)h(121.)480 +888 y Fn(-f)384 b Fs(F)-8 b(orce)29 b(a)f(head)f(revision)e(matc)m(h)k +(if)d(tag/date)k(not)d(found.)38 b(See)28 b(Section)f(A.17.1)i([tag)960 +1013 y(options],)h(page)h(121.)480 1187 y Fn(-l)384 b +Fs(Lo)s(cal;)45 b(run)39 b(only)h(in)f(curren)m(t)h(w)m(orking)f +(directory)-8 b(.)71 b(See)40 b(Chapter)g(9)h([Recursiv)m(e)960 +1311 y(b)s(eha)m(vior],)30 b(page)h(57.)480 1485 y Fn(-n)384 +b Fs(No)31 b(execution)g(of)f(tag)i(program.)40 b(See)31 +b(Section)f(A.17.1)i([tag)g(options],)e(page)h(121.)480 +1659 y Fn(-R)384 b Fs(Op)s(erate)24 b(recursiv)m(ely)e(\(default\).)39 +b(See)24 b(Chapter)f(9)h([Recursiv)m(e)g(b)s(eha)m(vior],)g(page)h(57.) +480 1833 y Fn(-r)30 b Fo(tag)229 b Fs(T)-8 b(ag)31 b(existing)f(tag)h Fo(tag)p Fs(.)42 b(See)31 b(Section)f(A.17.1)i([tag)g(options],)e(page) -h(119.)0 916 y Fn(unedit)e([)p Fo(options)t Fn(])g([)p -Fo(\014les)t Fh(:)15 b(:)g(:)o Fn(])480 1040 y Fs(Undo)30 +h(121.)0 2007 y Fn(unedit)e([)p Fo(options)t Fn(])g([)p +Fo(\014les)t Fh(:)15 b(:)g(:)o Fn(])480 2132 y Fs(Undo)30 b(an)g(edit)g(command.)41 b(See)30 b(Section)g(6.6.3)i([Editing)d -(\014les],)h(page)h(42.)480 1223 y Fn(-a)f Fo(actions)76 +(\014les],)h(page)h(44.)480 2306 y Fn(-a)f Fo(actions)76 b Fs(Sp)s(ecify)52 b(actions)h(for)h(temp)s(orary)f(w)m(atc)m(h,)60 b(where)53 b Fo(actions)58 b Fs(is)52 b Fn(edit)p Fs(,)58 -b Fn(unedit)p Fs(,)960 1348 y Fn(commit)p Fs(,)29 b Fn(all)p +b Fn(unedit)p Fs(,)960 2430 y Fn(commit)p Fs(,)29 b Fn(all)p Fs(,)h(or)g Fn(none)p Fs(.)40 b(See)30 b(Section)g(6.6.3)j([Editing)28 -b(\014les],)i(page)h(42.)480 1531 y Fn(-l)384 b Fs(Lo)s(cal;)45 +b(\014les],)i(page)h(44.)480 2604 y Fn(-l)384 b Fs(Lo)s(cal;)45 b(run)39 b(only)h(in)f(curren)m(t)h(w)m(orking)f(directory)-8 -b(.)71 b(See)40 b(Chapter)g(9)h([Recursiv)m(e)960 1656 -y(b)s(eha)m(vior],)30 b(page)h(55.)0 1839 y Fn(update)e([)p +b(.)71 b(See)40 b(Chapter)g(9)h([Recursiv)m(e)960 2729 +y(b)s(eha)m(vior],)30 b(page)h(57.)0 2903 y Fn(update)e([)p Fo(options)t Fn(])g([)p Fo(\014les)t Fh(:)15 b(:)g(:)o -Fn(])480 1963 y Fs(Bring)30 b(w)m(ork)g(tree)h(in)e(sync)h(with)f(rep)s +Fn(])480 3027 y Fs(Bring)30 b(w)m(ork)g(tree)h(in)e(sync)h(with)f(rep)s (ository)-8 b(.)40 b(See)31 b(Section)f(A.18)i([up)s(date],)e(page)h -(120.)480 2146 y Fn(-A)384 b Fs(Reset)38 b(an)m(y)f(stic)m(ky)h +(122.)480 3201 y Fn(-A)384 b Fs(Reset)38 b(an)m(y)f(stic)m(ky)h (tags/date/k)m(opts.)64 b(See)37 b(Section)g(7.4)i([Stic)m(ky)e(tags],) -j(page)e(49)960 2271 y(and)30 b(Chapter)g(17)h([Keyw)m(ord)f -(substitution],)f(page)i(75.)480 2454 y Fn(-D)f Fo(date)183 +j(page)e(51)960 3326 y(and)30 b(Chapter)g(17)h([Keyw)m(ord)f +(substitution],)f(page)i(77.)480 3500 y Fn(-D)f Fo(date)183 b Fs(Chec)m(k)35 b(out)g(revisions)e(as)j(of)f Fo(date)40 b Fs(\(is)35 b(stic)m(ky\).)54 b(See)36 b(Section)e(A.4)i([Common)f -(op-)960 2579 y(tions],)30 b(page)h(90.)480 2762 y Fn(-d)384 +(op-)960 3624 y(tions],)30 b(page)h(92.)480 3798 y Fn(-d)384 b Fs(Create)31 b(directories.)40 b(See)31 b(Section)f(A.18.1)i([up)s -(date)e(options],)g(page)h(120.)480 2945 y Fn(-f)384 +(date)e(options],)g(page)h(122.)480 3972 y Fn(-f)384 b Fs(Use)21 b(head)g(revision)e(if)g(tag/date)k(not)e(found.)37 -b(See)21 b(Section)f(A.4)i([Common)e(options],)960 3069 -y(page)31 b(90.)480 3252 y Fn(-I)f Fo(ign)232 b Fs(More)45 +b(See)21 b(Section)f(A.4)i([Common)e(options],)960 4097 +y(page)31 b(92.)480 4271 y Fn(-I)f Fo(ign)232 b Fs(More)45 b(\014les)e(to)i(ignore)f(\(!)82 b(to)45 b(reset\).)84 b(See)44 b(Section)g(A.11.1)i([imp)s(ort)d(options],)960 -3377 y(page)31 b(109.)480 3560 y Fn(-j)f Fo(rev)230 b +4395 y(page)31 b(111.)480 4569 y Fn(-j)f Fo(rev)230 b Fs(Merge)32 b(in)d(c)m(hanges.)41 b(See)31 b(Section)f(A.18.1)i([up)s -(date)e(options],)g(page)i(120.)480 3743 y Fn(-k)e Fo(k\015ag)165 +(date)e(options],)g(page)i(122.)480 4743 y Fn(-k)e Fo(k\015ag)165 b Fs(Use)51 b Fo(k\015ag)59 b Fs(k)m(eyw)m(ord)51 b(expansion.)100 b(See)51 b(Section)g(17.4)h([Substitution)c(mo)s(des],)960 -3868 y(page)31 b(77.)480 4051 y Fn(-l)384 b Fs(Lo)s(cal;)45 +4868 y(page)31 b(79.)480 5042 y Fn(-l)384 b Fs(Lo)s(cal;)45 b(run)39 b(only)h(in)f(curren)m(t)h(w)m(orking)f(directory)-8 -b(.)71 b(See)40 b(Chapter)g(9)h([Recursiv)m(e)960 4175 -y(b)s(eha)m(vior],)30 b(page)h(55.)480 4358 y Fn(-P)384 +b(.)71 b(See)40 b(Chapter)g(9)h([Recursiv)m(e)960 5166 +y(b)s(eha)m(vior],)30 b(page)h(57.)480 5340 y Fn(-P)384 b Fs(Prune)29 b(empt)m(y)i(directories.)40 b(See)30 b(Chapter)g(15)h -([Mo)m(ving)g(directories],)f(page)h(71.)480 4542 y Fn(-p)384 -b Fs(Chec)m(k)32 b(out)g(\014les)f(to)i(standard)e(output)g(\(a)m(v)m +([Mo)m(ving)g(directories],)f(page)h(73.)p eop +%%Page: 135 137 +135 136 bop 0 -116 a Fs(App)s(endix)28 b(B:)j(Quic)m(k)e(reference)i +(to)g(CVS)f(commands)1837 b(135)480 366 y Fn(-p)384 b +Fs(Chec)m(k)32 b(out)g(\014les)f(to)i(standard)e(output)g(\(a)m(v)m (oids)i(stic)m(kiness\).)44 b(See)32 b(Section)g(A.18.1)960 -4666 y([up)s(date)e(options],)g(page)h(120.)480 4849 -y Fn(-R)384 b Fs(Op)s(erate)24 b(recursiv)m(ely)e(\(default\).)39 -b(See)24 b(Chapter)f(9)h([Recursiv)m(e)g(b)s(eha)m(vior],)g(page)h(55.) -480 5032 y Fn(-r)30 b Fo(tag)229 b Fs(Chec)m(k)m(out)48 +491 y([up)s(date)e(options],)g(page)h(122.)480 665 y +Fn(-R)384 b Fs(Op)s(erate)24 b(recursiv)m(ely)e(\(default\).)39 +b(See)24 b(Chapter)f(9)h([Recursiv)m(e)g(b)s(eha)m(vior],)g(page)h(57.) +480 840 y Fn(-r)30 b Fo(tag)229 b Fs(Chec)m(k)m(out)48 b(revision)c Fo(tag)56 b Fs(\(is)46 b(stic)m(ky\).)89 -b(See)47 b(Section)g(A.4)g([Common)f(options],)960 5157 -y(page)31 b(90.)480 5340 y Fn(-W)f Fo(sp)s(ec)184 b Fs(More)31 +b(See)47 b(Section)g(A.4)g([Common)f(options],)960 964 +y(page)31 b(92.)480 1139 y Fn(-W)f Fo(sp)s(ec)184 b Fs(More)31 b(wrapp)s(ers.)39 b(See)30 b(Section)h(A.11.1)h([imp)s(ort)d(options],) -h(page)h(109.)p eop -%%Page: 133 135 -133 134 bop 0 -116 a Fs(App)s(endix)28 b(B:)j(Quic)m(k)e(reference)i -(to)g(CVS)f(commands)1837 b(133)0 366 y Fn(watch)29 b -([on|off|add|remove])c([)p Fo(options)t Fn(])k([)p Fo(\014les)t -Fh(:)15 b(:)g(:)o Fn(])480 491 y Fs(on/o\013:)57 b(turn)37 -b(on/o\013)i(read-only)e(c)m(hec)m(k)m(outs)k(of)d(\014les.)63 -b(See)38 b(Section)g(6.6.1)i([Setting)e(a)g(w)m(atc)m(h],)480 -616 y(page)31 b(40.)480 765 y(add/remo)m(v)m(e:)38 b(add)20 -b(or)i(remo)m(v)m(e)g(noti\014cation)f(on)g(actions.)38 -b(See)22 b(Section)f(6.6.2)i([Getting)f(Noti\014ed],)480 -890 y(page)31 b(40.)480 1064 y Fn(-a)f Fo(actions)76 -b Fs(Sp)s(ecify)52 b(actions)h(for)h(temp)s(orary)f(w)m(atc)m(h,)60 -b(where)53 b Fo(actions)58 b Fs(is)52 b Fn(edit)p Fs(,)58 -b Fn(unedit)p Fs(,)960 1188 y Fn(commit)p Fs(,)29 b Fn(all)p -Fs(,)h(or)g Fn(none)p Fs(.)40 b(See)30 b(Section)g(6.6.3)j([Editing)28 -b(\014les],)i(page)h(42.)480 1363 y Fn(-l)384 b Fs(Lo)s(cal;)45 -b(run)39 b(only)h(in)f(curren)m(t)h(w)m(orking)f(directory)-8 -b(.)71 b(See)40 b(Chapter)g(9)h([Recursiv)m(e)960 1487 -y(b)s(eha)m(vior],)30 b(page)h(55.)0 1662 y Fn(watchers)d([)p +h(page)h(111.)0 1313 y Fn(watch)e([on|off|add|remove])c([)p +Fo(options)t Fn(])k([)p Fo(\014les)t Fh(:)15 b(:)g(:)o +Fn(])480 1437 y Fs(on/o\013:)57 b(turn)37 b(on/o\013)i(read-only)e(c)m +(hec)m(k)m(outs)k(of)d(\014les.)63 b(See)38 b(Section)g(6.6.1)i +([Setting)e(a)g(w)m(atc)m(h],)480 1562 y(page)31 b(42.)480 +1711 y(add/remo)m(v)m(e:)38 b(add)20 b(or)i(remo)m(v)m(e)g +(noti\014cation)f(on)g(actions.)38 b(See)22 b(Section)f(6.6.2)i +([Getting)f(Noti\014ed],)480 1836 y(page)31 b(42.)480 +2010 y Fn(-a)f Fo(actions)76 b Fs(Sp)s(ecify)52 b(actions)h(for)h(temp) +s(orary)f(w)m(atc)m(h,)60 b(where)53 b Fo(actions)58 +b Fs(is)52 b Fn(edit)p Fs(,)58 b Fn(unedit)p Fs(,)960 +2135 y Fn(commit)p Fs(,)29 b Fn(all)p Fs(,)h(or)g Fn(none)p +Fs(.)40 b(See)30 b(Section)g(6.6.3)j([Editing)28 b(\014les],)i(page)h +(44.)480 2309 y Fn(-l)384 b Fs(Lo)s(cal;)45 b(run)39 +b(only)h(in)f(curren)m(t)h(w)m(orking)f(directory)-8 +b(.)71 b(See)40 b(Chapter)g(9)h([Recursiv)m(e)960 2434 +y(b)s(eha)m(vior],)30 b(page)h(57.)0 2608 y Fn(watchers)d([)p Fo(options)t Fn(])h([)p Fo(\014les)t Fh(:)15 b(:)g(:)p -Fn(])480 1786 y Fs(See)31 b(who)f(is)f(w)m(atc)m(hing)i(a)g(\014le.)39 +Fn(])480 2733 y Fs(See)31 b(who)f(is)f(w)m(atc)m(hing)i(a)g(\014le.)39 b(See)31 b(Section)f(6.6.4)i([W)-8 b(atc)m(h)33 b(information],)c(page) -i(43.)480 1961 y Fn(-l)384 b Fs(Lo)s(cal;)45 b(run)39 +i(45.)480 2907 y Fn(-l)384 b Fs(Lo)s(cal;)45 b(run)39 b(only)h(in)f(curren)m(t)h(w)m(orking)f(directory)-8 -b(.)71 b(See)40 b(Chapter)g(9)h([Recursiv)m(e)960 2085 -y(b)s(eha)m(vior],)30 b(page)h(55.)p eop -%%Page: 134 136 -134 135 bop 0 -116 a Fs(134)2366 b(CVS|Concurren)m(t)29 +b(.)71 b(See)40 b(Chapter)g(9)h([Recursiv)m(e)960 3031 +y(b)s(eha)m(vior],)30 b(page)h(57.)p eop +%%Page: 136 138 +136 137 bop 0 -116 a Fs(136)2366 b(CVS|Concurren)m(t)29 b(V)-8 b(ersions)30 b(System)p eop -%%Page: 135 137 -135 136 bop 0 -116 a Fs(App)s(endix)28 b(C:)i(Reference)h(man)m(ual)f -(for)g(the)g(Administrativ)m(e)f(\014les)1419 b(135)0 +%%Page: 137 139 +137 138 bop 0 -116 a Fs(App)s(endix)28 b(C:)i(Reference)h(man)m(ual)f +(for)g(the)g(Administrativ)m(e)f(\014les)1419 b(137)0 229 y Fp(App)t(endix)30 b(C)80 b(Reference)29 b(man)l(ual)h(for)h(the)e (Administrativ)l(e)0 366 y(\014les)125 761 y Fs(Inside)34 b(the)j(rep)s(ository)-8 b(,)37 b(in)e(the)h(directory)g(`)p @@ -8636,8 +8697,8 @@ b(no)c(in)m(termediate)f(directory)480 5340 y(lev)m(els)30 b(are)h(used)e(b)m(y)i(default,)e(ev)m(en)i(if)f Fo(dir)35 b Fs(w)m(as)c(a)f(path)h(in)m(v)m(olving)d(sev)m(eral)j(directory)f (lev)m(els.)p eop -%%Page: 136 138 -136 137 bop 0 -116 a Fs(136)2366 b(CVS|Concurren)m(t)29 +%%Page: 138 140 +138 139 bop 0 -116 a Fs(138)2366 b(CVS|Concurren)m(t)29 b(V)-8 b(ersions)30 b(System)480 366 y(By)c(explicitly)c(sp)s(ecifying) h(\014les)i(in)e(the)j(mo)s(dule)d(de\014nition)g(after)j Fo(dir)p Fs(,)f(y)m(ou)g(can)h(select)g(particular)480 @@ -8708,32 +8769,31 @@ b(top-lev)m(el)g(directory)f(of)h(the)g(c)m(hec)m(k)m(ed-out)i(mo)s (dule.)39 b Fo(prog)f Fs(runs)28 b(with)g(a)i(single)960 5322 y(argumen)m(t,)h(the)g(full)d(path)i(to)h(the)g(source)f(rep)s (ository)f(for)i(this)e(mo)s(dule.)p eop -%%Page: 137 139 -137 138 bop 0 -116 a Fs(App)s(endix)28 b(C:)i(Reference)h(man)m(ual)f -(for)g(the)g(Administrativ)m(e)f(\014les)1419 b(137)0 +%%Page: 139 141 +139 140 bop 0 -116 a Fs(App)s(endix)28 b(C:)i(Reference)h(man)m(ual)f +(for)g(the)g(Administrativ)m(e)f(\014les)1419 b(139)0 366 y Fm(C.2)68 b(The)30 b(cvswrapp)t(ers)g(\014le)125 -643 y Fs(W)-8 b(rapp)s(ers)30 b(allo)m(w)h(y)m(ou)g(to)h(set)g(a)f(ho)s -(ok)h(whic)m(h)d(transforms)i(\014les)f(on)h(their)f(w)m(a)m(y)i(in)e -(and)h(out)g(of)h Fr(cvs)p Fs(.)42 b(Most)0 768 y(or)30 -b(all)g(of)g(the)h(wrapp)s(ers)d(features)j(do)f(not)h(w)m(ork)f(with)f -(clien)m(t/serv)m(er)i Fr(cvs)p Fs(.)125 1044 y(The)36 -b(\014le)h(`)p Fn(cvswrappers)p Fs(')d(de\014nes)j(the)g(script)f(that) -i(will)d(b)s(e)h(run)g(on)h(a)h(\014le)e(when)g(its)h(name)g(matc)m -(hes)i(a)0 1169 y(regular)i(expresion.)75 b(There)41 -b(are)h(t)m(w)m(o)i(scripts)c(that)j(can)f(b)s(e)f(run)g(on)h(a)g -(\014le)f(or)h(directory)-8 b(.)76 b(One)41 b(script)g(is)0 -1293 y(executed)29 b(on)f(the)g(\014le/directory)f(b)s(efore)g(b)s -(eing)g(c)m(hec)m(k)m(ed)j(in)m(to)e(the)g(rep)s(ository)f(\(this)g(is) -g(denoted)h(with)e(the)j Fn(-t)0 1418 y Fs(\015ag\))i(and)e(the)h -(other)g(when)f(the)h(\014le)f(is)g(c)m(hec)m(k)m(ed)j(out)e(of)g(the)g -(rep)s(ository)f(\(this)g(is)g(denoted)h(with)f(the)h -Fn(-f)f Fs(\015ag\))125 1695 y(The)c(`)p Fn(cvswrappers)p -Fs(')f(also)j(has)f(a)g(`)p Fn(-m)p Fs(')h(option)f(to)h(sp)s(ecify)e -(the)h(merge)h(metho)s(dology)g(that)g(should)d(b)s(e)i(used)0 -1819 y(when)e(the)h(\014le)e(is)h(up)s(dated.)38 b Fn(MERGE)23 -b Fs(means)i(the)g(usual)e Fr(cvs)h Fs(b)s(eha)m(vior:)37 -b(try)24 b(to)i(merge)f(the)g(\014les)f(\(this)g(generally)0 -1944 y(will)k(not)j(w)m(ork)f(for)h(binary)e(\014les\).)40 +643 y Fs(W)-8 b(rapp)s(ers)29 b(allo)m(w)h(y)m(ou)h(to)g(set)g(a)g(ho)s +(ok)f(whic)m(h)f(transforms)g(\014les)h(on)g(their)f(w)m(a)m(y)j(in)d +(and)h(out)g(of)h Fr(cvs)p Fs(.)125 920 y(The)36 b(\014le)h(`)p +Fn(cvswrappers)p Fs(')d(de\014nes)j(the)g(script)f(that)i(will)d(b)s(e) +h(run)g(on)h(a)h(\014le)e(when)g(its)h(name)g(matc)m(hes)i(a)0 +1044 y(regular)i(expresion.)75 b(There)41 b(are)h(t)m(w)m(o)i(scripts)c +(that)j(can)f(b)s(e)f(run)g(on)h(a)g(\014le)f(or)h(directory)-8 +b(.)76 b(One)41 b(script)g(is)0 1169 y(executed)29 b(on)f(the)g +(\014le/directory)f(b)s(efore)g(b)s(eing)g(c)m(hec)m(k)m(ed)j(in)m(to)e +(the)g(rep)s(ository)f(\(this)g(is)g(denoted)h(with)e(the)j +Fn(-t)0 1293 y Fs(\015ag\))g(and)f(the)h(other)g(when)e(the)i(\014le)f +(is)f(c)m(hec)m(k)m(ed)k(out)e(of)g(the)f(rep)s(ository)g(\(this)g(is)f +(denoted)i(with)e(the)i Fn(-f)f Fs(\015ag\).)0 1418 y(The)i(`)p +Fn(-t)p Fs('/`)p Fn(-f)p Fs(')h(feature)f(do)s(es)g(not)h(w)m(ork)f +(with)g(clien)m(t/serv)m(er)g Fr(cvs)p Fs(.)125 1695 +y(The)25 b(`)p Fn(cvswrappers)p Fs(')f(also)j(has)f(a)g(`)p +Fn(-m)p Fs(')h(option)f(to)h(sp)s(ecify)e(the)h(merge)h(metho)s(dology) +g(that)g(should)d(b)s(e)i(used)0 1819 y(when)e(the)h(\014le)e(is)h(up)s +(dated.)38 b Fn(MERGE)23 b Fs(means)i(the)g(usual)e Fr(cvs)h +Fs(b)s(eha)m(vior:)37 b(try)24 b(to)i(merge)f(the)g(\014les)f(\(this)g +(generally)0 1944 y(will)k(not)j(w)m(ork)f(for)h(binary)e(\014les\).)40 b Fn(COPY)30 b Fs(means)g(that)h Fn(cvs)f(update)f Fs(will)f(merely)i (cop)m(y)h(one)g(v)m(ersion)f(o)m(v)m(er)i(the)0 2068 y(other,)37 b(and)d(require)g(the)h(user)f(using)g(mec)m(hanisms)g @@ -8742,7 +8802,7 @@ y(other,)37 b(and)d(require)g(the)h(user)f(using)g(mec)m(hanisms)g (only)g(a\013ects)i(b)s(eha)m(vior)d(when)h(merging)g(is)f(done)i(on)f (up)s(date;)h(it)f(do)s(es)g(not)h(a\013ect)h(ho)m(w)0 2317 y(\014les)c(are)i(stored.)41 b(See)31 b(See)f(Chapter)g(18)h -([Binary)f(\014les],)g(page)h(79,)g(for)f(more)h(on)f(binary)f +([Binary)f(\014les],)g(page)h(81,)g(for)f(more)h(on)f(binary)f (\014les.)125 2594 y(The)g(basic)h(format)h(of)f(the)h(\014le)e(`)p Fn(cvswrappers)p Fs(')f(is:)240 2850 y Fn(wildcard)236 b([option)46 b(value][option)e(value]...)240 3057 y(where)i(option)g @@ -8777,654 +8837,665 @@ b(Unlik)m(e)28 b(the)h(previous)f(example)h(no)g(\014ltering)f(of)i (hec)m(k)m(ed)j(out)e(of)g(the)g(rep)s(ository)-8 b(.)42 b(The)30 b Fn(-t)g Fs(\014lter)g(is)g(called)g(with)g(t)m(w)m(o)i (argumen)m(ts,)g(the)f(\014rst)p eop -%%Page: 138 140 -138 139 bop 0 -116 a Fs(138)2366 b(CVS|Concurren)m(t)29 +%%Page: 140 142 +140 141 bop 0 -116 a Fs(140)2366 b(CVS|Concurren)m(t)29 b(V)-8 b(ersions)30 b(System)0 366 y(is)35 b(the)i(name)f(of)g(the)h (\014le/directory)e(to)i(\014lter)e(and)h(the)g(second)g(is)f(the)i (pathname)f(to)h(where)e(the)i(resulting)0 491 y(\014ltered)29 -b(\014le)h(should)e(b)s(e)i(placed.)0 770 y(The)25 b +b(\014le)h(should)e(b)s(e)i(placed.)0 781 y(The)25 b Fn(-f)f Fs(\014lter)g(is)g(called)g(with)g(one)h(argumen)m(t,)i(whic)m (h)d(is)g(the)h(name)g(of)g(the)h(\014le)e(to)i(\014lter)e(from.)38 -b(The)25 b(end)f(result)0 895 y(of)31 b(this)e(\014lter)g(will)f(b)s(e) +b(The)25 b(end)f(result)0 906 y(of)31 b(this)e(\014lter)g(will)f(b)s(e) i(a)g(\014le)g(in)f(the)i(users)e(directory)h(that)h(they)f(can)h(w)m -(ork)g(on)f(as)g(they)h(normally)e(w)m(ould.)125 1174 -y(F)-8 b(or)40 b(another)g(example,)j(the)d(follo)m(wing)e(command)i -(imp)s(orts)e(a)i(directory)-8 b(,)43 b(treating)d(\014les)f(whose)h -(name)0 1298 y(ends)30 b(in)f(`)p Fn(.exe)p Fs(')g(as)i(binary:)240 -1557 y Fn(cvs)47 b(import)f(-I)h(!)h(-W)f("*.exe)f(-k)h('b'")g -(first-dir)e(vendortag)g(reltag)0 2051 y Fm(C.3)68 b(The)30 -b(commit)h(supp)t(ort)f(\014les)125 2330 y Fs(The)41 +(ork)g(on)f(as)g(they)h(normally)e(w)m(ould.)125 1196 +y(Note)41 b(that)f(the)g(`)p Fn(-t)p Fs('/`)p Fn(-f)p +Fs(')g(features)g(do)f(not)h(con)m(v)m(enien)m(tly)g(handle)e(one)i(p)s +(ortion)e(of)i(CVS's)f(op)s(eration:)0 1321 y(determining)32 +b(when)i(\014les)f(are)i(mo)s(di\014ed.)51 b(CVS)34 b(will)e(still)g(w) +m(an)m(t)j(a)g(\014le)f(\(or)h(directory\))f(to)h(exist,)h(and)e(it)g +(will)0 1445 y(use)26 b(its)g(mo)s(di\014cation)e(time)i(to)h +(determine)f(whether)g(a)g(\014le)g(is)f(mo)s(di\014ed.)37 +b(If)26 b(CVS)g(erroneously)f(thinks)g(a)h(\014le)g(is)0 +1570 y(unmo)s(di\014ed)c(\(for)i(example,)i(a)f(directory)f(is)g(unc)m +(hanged)g(but)g(one)h(of)g(the)g(\014les)f(within)e(it)i(is)g(c)m +(hanged\),)j(y)m(ou)e(can)0 1694 y(force)32 b(it)g(to)g(c)m(hec)m(k)h +(in)e(the)h(\014le)e(an)m(yw)m(a)m(y)j(b)m(y)f(sp)s(ecifying)e(the)i(`) +p Fn(-f)p Fs(')f(option)g(to)i Fn(cvs)c(commit)h Fs(\(see)j(Section)e +(A.7.1)0 1819 y([commit)g(options],)f(page)h(102\).)125 +2109 y(F)-8 b(or)40 b(another)g(example,)j(the)d(follo)m(wing)e +(command)i(imp)s(orts)e(a)i(directory)-8 b(,)43 b(treating)d(\014les)f +(whose)h(name)0 2234 y(ends)30 b(in)f(`)p Fn(.exe)p Fs(')g(as)i +(binary:)240 2504 y Fn(cvs)47 b(import)f(-I)h(!)h(-W)f("*.exe)f(-k)h +('b'")g(first-dir)e(vendortag)g(reltag)0 3100 y Fm(C.3)68 +b(The)30 b(commit)h(supp)t(ort)f(\014les)125 3390 y Fs(The)41 b(`)p Fn(-i)p Fs(')h(\015ag)g(in)e(the)i(`)p Fn(modules)p Fs(')f(\014le)f(can)j(b)s(e)e(used)g(to)h(run)f(a)h(certain)g(program)f -(whenev)m(er)h(\014les)f(are)0 2455 y(committed)29 b(\(see)h(Section)f -(C.1)g([mo)s(dules],)f(page)i(135\).)42 b(The)29 b(\014les)f(describ)s -(ed)f(in)g(this)h(section)h(pro)m(vide)f(other,)0 2579 +(whenev)m(er)h(\014les)f(are)0 3514 y(committed)29 b(\(see)h(Section)f +(C.1)g([mo)s(dules],)f(page)i(137\).)42 b(The)29 b(\014les)f(describ)s +(ed)f(in)g(this)h(section)h(pro)m(vide)f(other,)0 3639 y(more)j(\015exible,)d(w)m(a)m(ys)k(to)f(run)e(programs)h(whenev)m(er)g -(something)g(is)f(committed.)125 2858 y(There)h(are)g(three)h(kind)e +(something)g(is)f(committed.)125 3929 y(There)h(are)g(three)h(kind)e (of)h(programs)g(that)h(can)g(b)s(e)f(run)f(on)h(commit.)41 b(They)30 b(are)h(sp)s(eci\014ed)e(in)g(\014les)h(in)f(the)0 -2983 y(rep)s(ository)-8 b(,)32 b(as)g(describ)s(ed)e(b)s(elo)m(w.)45 +4054 y(rep)s(ository)-8 b(,)32 b(as)g(describ)s(ed)e(b)s(elo)m(w.)45 b(The)31 b(follo)m(wing)g(table)h(summarizes)f(the)h(\014le)f(names)h -(and)f(the)h(purp)s(ose)f(of)0 3107 y(the)g(corresp)s(onding)d -(programs.)0 3416 y(`)p Fn(commitinfo)p Fs(')480 3541 +(and)f(the)h(purp)s(ose)f(of)0 4178 y(the)g(corresp)s(onding)d +(programs.)0 4510 y(`)p Fn(commitinfo)p Fs(')480 4635 y(The)j(program)h(is)e(resp)s(onsible)f(for)j(c)m(hec)m(king)g(that)g (the)g(commit)g(is)f(allo)m(w)m(ed.)44 b(If)31 b(it)h(exits)f(with)g(a) -480 3665 y(non-zero)g(exit)f(status)h(the)f(commit)h(will)c(b)s(e)j(ab) -s(orted.)0 3850 y(`)p Fn(verifymsg)p Fs(')480 3975 y(The)h(sp)s +480 4759 y(non-zero)g(exit)f(status)h(the)f(commit)h(will)c(b)s(e)j(ab) +s(orted.)0 4966 y(`)p Fn(verifymsg)p Fs(')480 5091 y(The)h(sp)s (eci\014ed)g(program)g(is)g(used)g(to)i(ev)-5 b(aluate)33 b(the)f(log)g(message,)h(and)f(p)s(ossibly)d(v)m(erify)i(that)h(it)480 -4099 y(con)m(tains)d(all)g(required)e(\014elds.)39 b(This)27 +5215 y(con)m(tains)d(all)g(required)e(\014elds.)39 b(This)27 b(is)i(most)g(useful)f(in)g(com)m(bination)g(with)g(the)i(`)p -Fn(rcsinfo)p Fs(')e(\014le,)480 4224 y(whic)m(h)h(can)i(hold)e(a)i(log) +Fn(rcsinfo)p Fs(')e(\014le,)480 5340 y(whic)m(h)h(can)i(hold)e(a)i(log) f(message)i(template)e(\(see)i(Section)e(C.8)g([rcsinfo],)g(page)i -(145\).)0 4408 y(`)p Fn(editinfo)p Fs(')480 4533 y(The)44 -b(sp)s(eci\014ed)e(program)i(is)f(used)g(to)i(edit)f(the)g(log)g -(message,)49 b(and)44 b(p)s(ossibly)d(v)m(erify)j(that)g(it)480 -4657 y(con)m(tains)29 b(all)g(required)e(\014elds.)39 -b(This)27 b(is)i(most)g(useful)f(in)g(com)m(bination)g(with)g(the)i(`)p -Fn(rcsinfo)p Fs(')e(\014le,)480 4782 y(whic)m(h)e(can)i(hold)f(a)h(log) -g(message)h(template)f(\(see)g(Section)g(C.8)g([rcsinfo],)g(page)g -(145\).)42 b(\(obsolete\))0 4966 y(`)p Fn(loginfo)p Fs(')94 +(148\).)p eop +%%Page: 141 143 +141 142 bop 0 -116 a Fs(App)s(endix)28 b(C:)i(Reference)h(man)m(ual)f +(for)g(the)g(Administrativ)m(e)f(\014les)1419 b(141)0 +366 y(`)p Fn(editinfo)p Fs(')480 491 y(The)44 b(sp)s(eci\014ed)e +(program)i(is)f(used)g(to)i(edit)f(the)g(log)g(message,)49 +b(and)44 b(p)s(ossibly)d(v)m(erify)j(that)g(it)480 616 +y(con)m(tains)29 b(all)g(required)e(\014elds.)39 b(This)27 +b(is)i(most)g(useful)f(in)g(com)m(bination)g(with)g(the)i(`)p +Fn(rcsinfo)p Fs(')e(\014le,)480 740 y(whic)m(h)e(can)i(hold)f(a)h(log)g +(message)h(template)f(\(see)g(Section)g(C.8)g([rcsinfo],)g(page)g +(148\).)42 b(\(obsolete\))0 907 y(`)p Fn(loginfo)p Fs(')94 b(The)20 b(sp)s(eci\014ed)e(program)i(is)g(called)f(when)h(the)g (commit)g(is)g(complete.)37 b(It)21 b(receiv)m(es)g(the)f(log)h -(message)480 5091 y(and)32 b(some)h(additional)d(information)h(and)h +(message)480 1031 y(and)32 b(some)h(additional)d(information)h(and)h (can)h(store)g(the)g(log)g(message)h(in)d(a)i(\014le,)f(or)h(mail)e(it) -h(to)480 5215 y(appropriate)e(p)s(ersons,)g(or)h(ma)m(yb)s(e)g(p)s(ost) +h(to)480 1156 y(appropriate)e(p)s(ersons,)g(or)h(ma)m(yb)s(e)g(p)s(ost) f(it)g(to)i(a)f(lo)s(cal)f(newsgroup,)h(or)p Fh(:)15 b(:)g(:)31 b Fs(Y)-8 b(our)31 b(imagination)f(is)480 -5340 y(the)h(limit!)p eop -%%Page: 139 141 -139 140 bop 0 -116 a Fs(App)s(endix)28 b(C:)i(Reference)h(man)m(ual)f -(for)g(the)g(Administrativ)m(e)f(\014les)1419 b(139)0 -366 y Fk(C.3.1)62 b(The)31 b(common)e(syn)m(tax)125 652 -y Fs(The)f(administrativ)m(e)f(\014les)h(suc)m(h)h(as)g(`)p +1280 y(the)h(limit!)0 1680 y Fk(C.3.1)62 b(The)31 b(common)e(syn)m(tax) +125 1954 y Fs(The)f(administrativ)m(e)f(\014les)h(suc)m(h)h(as)g(`)p Fn(commitinfo)p Fs(',)e(`)p Fn(loginfo)p Fs(',)h(`)p Fn(rcsinfo)p Fs(',)g(`)p Fn(verifymsg)p Fs(',)g(etc.,)j(all)d(ha)m(v)m -(e)0 776 y(a)e(common)f(format.)40 b(The)24 b(purp)s(ose)g(of)i(the)f +(e)0 2079 y(a)e(common)f(format.)40 b(The)24 b(purp)s(ose)g(of)i(the)f (\014les)f(are)i(describ)s(ed)d(later)j(on.)38 b(The)25 -b(common)h(syn)m(tax)g(is)e(describ)s(ed)0 901 y(here.)125 -1186 y(Eac)m(h)31 b(line)d(con)m(tains)j(the)f(follo)m(wing:)75 -1472 y Fq(\017)60 b Fs(A)30 b(regular)g(expression.)40 +b(common)h(syn)m(tax)g(is)e(describ)s(ed)0 2203 y(here.)125 +2477 y(Eac)m(h)31 b(line)d(con)m(tains)j(the)f(follo)m(wing:)75 +2751 y Fq(\017)60 b Fs(A)30 b(regular)g(expression.)40 b(This)28 b(is)i(a)g(basic)g(regular)g(expression)f(in)g(the)h(syn)m -(tax)h(used)f(b)m(y)g(GNU)h(emacs.)75 1633 y Fq(\017)60 +(tax)h(used)f(b)m(y)g(GNU)h(emacs.)75 2897 y Fq(\017)60 b Fs(A)30 b(whitespace)h(separator|one)g(or)f(more)h(spaces)g(and/or)f -(tabs.)75 1794 y Fq(\017)60 b Fs(A)30 b(\014le)g(name)g(or)h -(command-line)e(template.)0 2116 y(Blank)c(lines)f(are)i(ignored.)38 +(tabs.)75 3043 y Fq(\017)60 b Fs(A)30 b(\014le)g(name)g(or)h +(command-line)e(template.)0 3338 y(Blank)c(lines)f(are)i(ignored.)38 b(Lines)24 b(that)j(start)f(with)e(the)i(c)m(haracter)h(`)p Fn(#)p Fs(')f(are)g(treated)g(as)g(commen)m(ts.)40 b(Long)26 -b(lines)0 2240 y(unfortunately)j(can)i Fo(not)h Fs(b)s(e)e(brok)m(en)g +b(lines)0 3462 y(unfortunately)j(can)i Fo(not)h Fs(b)s(e)e(brok)m(en)g (in)f(t)m(w)m(o)j(parts)e(in)f(an)m(y)i(w)m(a)m(y)-8 -b(.)125 2526 y(The)31 b(\014rst)f(regular)h(expression)g(that)h(matc)m +b(.)125 3736 y(The)31 b(\014rst)f(regular)h(expression)g(that)h(matc)m (hes)g(the)g(curren)m(t)g(directory)f(name)g(in)g(the)g(rep)s(ository)g -(is)f(used.)0 2650 y(The)g(rest)g(of)h(the)f(line)f(is)h(used)f(as)i(a) +(is)f(used.)0 3861 y(The)g(rest)g(of)h(the)f(line)f(is)h(used)f(as)i(a) g(\014le)e(name)h(or)h(command-line)e(as)h(appropriate.)0 -3202 y Fm(C.4)68 b(Commitinfo)125 3487 y Fs(The)32 b(`)p +4294 y Fm(C.4)68 b(Commitinfo)125 4568 y Fs(The)32 b(`)p Fn(commitinfo)p Fs(')e(\014le)h(de\014nes)h(programs)g(to)h(execute)h (whenev)m(er)f(`)p Fn(cvs)c(commit)p Fs(')i(is)h(ab)s(out)g(to)h -(execute.)0 3612 y(These)d(programs)g(are)g(used)g(for)g(pre-commit)g +(execute.)0 4692 y(These)d(programs)g(are)g(used)g(for)g(pre-commit)g (c)m(hec)m(king)h(to)g(v)m(erify)e(that)i(the)f(mo)s(di\014ed,)f(added) -g(and)h(remo)m(v)m(ed)0 3736 y(\014les)e(are)h(really)f(ready)h(to)h(b) +g(and)h(remo)m(v)m(ed)0 4817 y(\014les)e(are)h(really)f(ready)h(to)h(b) s(e)e(committed.)40 b(This)28 b(could)g(b)s(e)g(used,)h(for)f (instance,)i(to)f(v)m(erify)g(that)g(the)g(c)m(hanged)0 -3861 y(\014les)g(conform)i(to)g(to)g(y)m(our)f(site's)g(standards)g -(for)g(co)s(ding)f(practice.)125 4146 y(As)34 b(men)m(tioned)h +4941 y(\014les)g(conform)i(to)g(to)g(y)m(our)f(site's)g(standards)g +(for)g(co)s(ding)f(practice.)125 5215 y(As)34 b(men)m(tioned)h (earlier,)g(eac)m(h)h(line)d(in)h(the)h(`)p Fn(commitinfo)p Fs(')e(\014le)h(consists)g(of)h(a)g(regular)g(expression)e(and)i(a)0 -4271 y(command-line)27 b(template.)40 b(The)28 b(template)h(can)g +5340 y(command-line)27 b(template.)40 b(The)28 b(template)h(can)g (include)d(a)j(program)g(name)f(and)g(an)m(y)h(n)m(um)m(b)s(er)e(of)i -(argumen)m(ts)0 4395 y(y)m(ou)24 b(wish)e(to)j(supply)c(to)k(it.)38 -b(The)23 b(full)e(path)j(to)h(the)f(curren)m(t)f(source)h(rep)s -(ository)f(is)g(app)s(ended)f(to)i(the)g(template,)0 -4520 y(follo)m(w)m(ed)k(b)m(y)f(the)h(\014le)f(names)h(of)g(an)m(y)h +(argumen)m(ts)p eop +%%Page: 142 144 +142 143 bop 0 -116 a Fs(142)2366 b(CVS|Concurren)m(t)29 +b(V)-8 b(ersions)30 b(System)0 366 y(y)m(ou)24 b(wish)e(to)j(supply)c +(to)k(it.)38 b(The)23 b(full)e(path)j(to)h(the)f(curren)m(t)f(source)h +(rep)s(ository)f(is)g(app)s(ended)f(to)i(the)g(template,)0 +491 y(follo)m(w)m(ed)k(b)m(y)f(the)h(\014le)f(names)h(of)g(an)m(y)h (\014les)d(in)m(v)m(olv)m(ed)i(in)f(the)h(commit)f(\(added,)i(remo)m(v) -m(ed,)g(and)f(mo)s(di\014ed)d(\014les\).)125 4805 y(The)31 +m(ed,)g(and)f(mo)s(di\014ed)d(\014les\).)125 767 y(The)31 b(\014rst)g(line)f(with)h(a)h(regular)f(expression)g(matc)m(hing)h(the) g(relativ)m(e)g(path)g(to)h(the)f(mo)s(dule)e(will)f(b)s(e)i(used.)0 -4930 y(If)f(the)g(command)h(returns)e(a)i(non-zero)f(exit)h(status)f -(the)h(commit)f(will)e(b)s(e)i(ab)s(orted.)125 5215 y(If)g(the)g(rep)s +892 y(If)f(the)g(command)h(returns)e(a)i(non-zero)f(exit)h(status)f +(the)h(commit)f(will)e(b)s(e)i(ab)s(orted.)125 1168 y(If)g(the)g(rep)s (ository)g(name)g(do)s(es)h(not)f(matc)m(h)i(an)m(y)f(of)f(the)h (regular)f(expressions)f(in)g(this)h(\014le,)g(the)g(`)p -Fn(DEFAULT)p Fs(')0 5340 y(line)f(is)g(used,)h(if)f(it)h(is)g(sp)s -(eci\014ed.)p eop -%%Page: 140 142 -140 141 bop 0 -116 a Fs(140)2366 b(CVS|Concurren)m(t)29 -b(V)-8 b(ersions)30 b(System)125 366 y(All)g(o)s(ccurances)i(of)h(the)f -(name)g(`)p Fn(ALL)p Fs(')f(app)s(earing)g(as)h(a)g(regular)f -(expression)g(are)h(used)f(in)g(addition)f(to)j(the)0 -491 y(\014rst)d(matc)m(hing)g(regular)g(expression)f(or)h(the)h(name)f -(`)p Fn(DEFAULT)p Fs('.)125 769 y(Note:)40 b(when)26 -b Fr(CVS)h Fs(is)g(accessing)g(a)h(remote)g(rep)s(ository)-8 -b(,)28 b(`)p Fn(commitinfo)p Fs(')d(will)f(b)s(e)j(run)e(on)j(the)f -Fo(remote)33 b Fs(\(i.e.,)0 893 y(serv)m(er\))e(side,)f(not)g(the)h -(clien)m(t)f(side)f(\(see)i(Section)g(4.6)g([Remote)h(rep)s -(ositories],)d(page)i(21\).)0 1375 y Fm(C.5)68 b(V)-11 -b(erifying)31 b(log)g(messages)125 1653 y Fs(Once)22 -b(y)m(ou)h(ha)m(v)m(e)g(en)m(tered)g(a)g(log)f(message,)k(y)m(ou)c(can) -h(ev)-5 b(aluate)23 b(that)g(message)g(to)h(c)m(hec)m(k)g(for)e(sp)s -(eci\014c)f(con)m(ten)m(t,)0 1777 y(suc)m(h)g(as)h(a)g(bug)f(ID.)h(Use) -g(the)g(`)p Fn(verifymsg)p Fs(')e(\014le)h(to)h(sp)s(ecify)e(a)i -(program)g(that)g(is)f(used)g(to)h(v)m(erify)f(the)h(log)g(message.)0 -1902 y(This)29 b(program)i(could)f(b)s(e)g(a)h(simple)e(script)h(that)i -(c)m(hec)m(ks)g(that)g(the)f(en)m(tered)g(message)h(con)m(tains)g(the)f -(required)0 2026 y(\014elds.)125 2304 y(The)d(`)p Fn(verifymsg)p -Fs(')f(\014le)h(is)g(often)i(most)f(useful)f(together)i(with)e(the)h(`) -p Fn(rcsinfo)p Fs(')f(\014le,)g(whic)m(h)g(can)i(b)s(e)e(used)g(to)0 -2429 y(sp)s(ecify)h(a)i(log)f(message)i(template.)125 -2706 y(Eac)m(h)d(line)f(in)g(the)i(`)p Fn(verifymsg)p +Fn(DEFAULT)p Fs(')0 1292 y(line)f(is)g(used,)h(if)f(it)h(is)g(sp)s +(eci\014ed.)125 1569 y(All)g(o)s(ccurances)i(of)h(the)f(name)g(`)p +Fn(ALL)p Fs(')f(app)s(earing)g(as)h(a)g(regular)f(expression)g(are)h +(used)f(in)g(addition)f(to)j(the)0 1693 y(\014rst)d(matc)m(hing)g +(regular)g(expression)f(or)h(the)h(name)f(`)p Fn(DEFAULT)p +Fs('.)125 1969 y(Note:)40 b(when)26 b Fr(CVS)h Fs(is)g(accessing)g(a)h +(remote)g(rep)s(ository)-8 b(,)28 b(`)p Fn(commitinfo)p +Fs(')d(will)f(b)s(e)j(run)e(on)j(the)f Fo(remote)33 b +Fs(\(i.e.,)0 2094 y(serv)m(er\))e(side,)f(not)g(the)h(clien)m(t)f(side) +f(\(see)i(Section)g(4.6)g([Remote)h(rep)s(ositories],)d(page)i(21\).)0 +2562 y Fm(C.5)68 b(V)-11 b(erifying)31 b(log)g(messages)125 +2838 y Fs(Once)22 b(y)m(ou)h(ha)m(v)m(e)g(en)m(tered)g(a)g(log)f +(message,)k(y)m(ou)c(can)h(ev)-5 b(aluate)23 b(that)g(message)g(to)h(c) +m(hec)m(k)g(for)e(sp)s(eci\014c)f(con)m(ten)m(t,)0 2963 +y(suc)m(h)g(as)h(a)g(bug)f(ID.)h(Use)g(the)g(`)p Fn(verifymsg)p +Fs(')e(\014le)h(to)h(sp)s(ecify)e(a)i(program)g(that)g(is)f(used)g(to)h +(v)m(erify)f(the)h(log)g(message.)0 3087 y(This)29 b(program)i(could)f +(b)s(e)g(a)h(simple)e(script)h(that)i(c)m(hec)m(ks)g(that)g(the)f(en)m +(tered)g(message)h(con)m(tains)g(the)f(required)0 3212 +y(\014elds.)125 3488 y(The)d(`)p Fn(verifymsg)p Fs(')f(\014le)h(is)g +(often)i(most)f(useful)f(together)i(with)e(the)h(`)p +Fn(rcsinfo)p Fs(')f(\014le,)g(whic)m(h)g(can)i(b)s(e)e(used)g(to)0 +3613 y(sp)s(ecify)h(a)i(log)f(message)i(template.)125 +3889 y(Eac)m(h)d(line)f(in)g(the)i(`)p Fn(verifymsg)p Fs(')d(\014le)h(consists)h(of)h(a)f(regular)g(expression)f(and)h(a)g -(command-line)f(template.)0 2831 y(The)k(template)g(m)m(ust)g(include)e +(command-line)f(template.)0 4013 y(The)k(template)g(m)m(ust)g(include)e (a)j(program)f(name,)h(and)f(can)g(include)e(an)m(y)j(n)m(um)m(b)s(er)e -(of)h(argumen)m(ts.)46 b(The)32 b(full)0 2955 y(path)e(to)h(the)g +(of)h(argumen)m(ts.)46 b(The)32 b(full)0 4138 y(path)e(to)h(the)g (curren)m(t)f(log)g(message)i(template)f(\014le)e(is)h(app)s(ended)e -(to)j(the)g(template.)125 3233 y(One)i(thing)h(that)g(should)f(b)s(e)g +(to)j(the)g(template.)125 4414 y(One)i(thing)h(that)g(should)f(b)s(e)g (noted)i(is)e(that)i(the)f(`)p Fn(ALL)p Fs(')g(k)m(eyw)m(ord)h(is)e (not)i(supp)s(orted.)50 b(If)34 b(more)h(than)f(one)0 -3358 y(matc)m(hing)29 b(line)e(is)h(found,)g(the)h(\014rst)f(one)h(is)f +4539 y(matc)m(hing)29 b(line)e(is)h(found,)g(the)h(\014rst)f(one)h(is)f (used.)39 b(This)27 b(can)i(b)s(e)f(useful)f(for)i(sp)s(ecifying)d(a)j -(default)f(v)m(eri\014cation)0 3482 y(script)h(in)g(a)i(mo)s(dule,)e +(default)f(v)m(eri\014cation)0 4663 y(script)h(in)g(a)i(mo)s(dule,)e (and)h(then)g(o)m(v)m(erriding)f(it)h(in)f(a)i(sub)s(directory)-8 -b(.)125 3760 y(If)30 b(the)g(rep)s(ository)g(name)g(do)s(es)h(not)f +b(.)125 4939 y(If)30 b(the)g(rep)s(ository)g(name)g(do)s(es)h(not)f (matc)m(h)i(an)m(y)f(of)f(the)h(regular)f(expressions)f(in)g(this)h -(\014le,)g(the)g(`)p Fn(DEFAULT)p Fs(')0 3884 y(line)f(is)g(used,)h(if) -f(it)h(is)g(sp)s(eci\014ed.)125 4162 y(If)f(the)i(v)m(eri\014cation)f +(\014le,)g(the)g(`)p Fn(DEFAULT)p Fs(')0 5064 y(line)f(is)g(used,)h(if) +f(it)h(is)g(sp)s(eci\014ed.)125 5340 y(If)f(the)i(v)m(eri\014cation)f (script)f(exits)h(with)f(a)i(non-zero)g(exit)f(status,)h(the)g(commit)f -(is)g(ab)s(orted.)125 4440 y(Note)e(that)f(the)g(v)m(eri\014cation)g -(script)e(cannot)j(c)m(hange)g(the)f(log)g(message;)i(it)d(can)h -(merely)g(accept)h(it)e(or)h(reject)0 4564 y(it.)125 -4842 y(The)45 b(follo)m(wing)g(is)h(a)g(little)f(silly)f(example)i(of)h -(a)g(`)p Fn(verifymsg)p Fs(')d(\014le,)50 b(together)d(with)e(the)i -(corresp)s(ond-)0 4966 y(ing)j(`)p Fn(rcsinfo)p Fs(')g(\014le,)55 -b(the)c(log)g(message)h(template)f(and)g(an)g(v)m(eri\014cation)f -(script.)101 b(W)-8 b(e)53 b(b)s(egin)c(with)h(the)0 -5091 y(log)42 b(message)h(template.)77 b(W)-8 b(e)43 -b(w)m(an)m(t)g(to)g(alw)m(a)m(ys)f(record)g(a)h(bug-id)d(n)m(um)m(b)s -(er)h(on)h(the)h(\014rst)e(line)f(of)j(the)f(log)0 5215 -y(message.)100 b(The)49 b(rest)h(of)g(log)f(message)i(is)e(free)h +(is)g(ab)s(orted.)p eop +%%Page: 143 145 +143 144 bop 0 -116 a Fs(App)s(endix)28 b(C:)i(Reference)h(man)m(ual)f +(for)g(the)g(Administrativ)m(e)f(\014les)1419 b(143)125 +366 y(Note)28 b(that)f(the)g(v)m(eri\014cation)g(script)e(cannot)j(c)m +(hange)g(the)f(log)g(message;)i(it)d(can)h(merely)g(accept)h(it)e(or)h +(reject)0 491 y(it.)125 773 y(The)45 b(follo)m(wing)g(is)h(a)g(little)f +(silly)f(example)i(of)h(a)g(`)p Fn(verifymsg)p Fs(')d(\014le,)50 +b(together)d(with)e(the)i(corresp)s(ond-)0 898 y(ing)j(`)p +Fn(rcsinfo)p Fs(')g(\014le,)55 b(the)c(log)g(message)h(template)f(and)g +(an)g(v)m(eri\014cation)f(script.)101 b(W)-8 b(e)53 b(b)s(egin)c(with)h +(the)0 1022 y(log)42 b(message)h(template.)77 b(W)-8 +b(e)43 b(w)m(an)m(t)g(to)g(alw)m(a)m(ys)f(record)g(a)h(bug-id)d(n)m(um) +m(b)s(er)h(on)h(the)h(\014rst)e(line)f(of)j(the)f(log)0 +1147 y(message.)100 b(The)49 b(rest)h(of)g(log)f(message)i(is)e(free)h (text.)99 b(The)49 b(follo)m(wing)f(template)j(is)d(found)h(in)f(the)i -(\014le)0 5340 y(`)p Fn(/usr/cvssupport/tc.templa)o(te)p -Fs('.)p eop -%%Page: 141 143 -141 142 bop 0 -116 a Fs(App)s(endix)28 b(C:)i(Reference)h(man)m(ual)f -(for)g(the)g(Administrativ)m(e)f(\014les)1419 b(141)240 -366 y Fn(BugId:)125 664 y Fs(The)29 b(script)h(`)p Fn -(/usr/cvssupport/bugid.ve)o(rify)o Fs(')25 b(is)k(used)h(to)h(ev)-5 -b(aluate)31 b(the)g(log)f(message.)240 941 y Fn(#!/bin/sh)240 -1045 y(#)240 1149 y(#)334 b(bugid.verify)44 b(filename)240 -1252 y(#)240 1356 y(#)95 b(Verify)46 b(that)h(the)g(log)g(message)f -(contains)f(a)j(valid)e(bugid)240 1460 y(#)95 b(on)47 -b(the)g(first)g(line.)240 1564 y(#)240 1668 y(if)g(head)g(-1)g(<)g($1)h +(\014le)0 1271 y(`)p Fn(/usr/cvssupport/tc.templa)o(te)p +Fs('.)240 1533 y Fn(BugId:)125 1815 y Fs(The)29 b(script)h(`)p +Fn(/usr/cvssupport/bugid.ve)o(rify)o Fs(')25 b(is)k(used)h(to)h(ev)-5 +b(aluate)31 b(the)g(log)f(message.)240 2077 y Fn(#!/bin/sh)240 +2181 y(#)240 2284 y(#)334 b(bugid.verify)44 b(filename)240 +2388 y(#)240 2492 y(#)95 b(Verify)46 b(that)h(the)g(log)g(message)f +(contains)f(a)j(valid)e(bugid)240 2596 y(#)95 b(on)47 +b(the)g(first)g(line.)240 2700 y(#)240 2803 y(if)g(head)g(-1)g(<)g($1)h (|)f(grep)g('^BugId:[)e(]*[0-9][0-9]*$')f(>)j(/dev/null;)e(then)431 -1771 y(exit)i(0)240 1875 y(else)431 1979 y(echo)g("No)f(BugId)h -(found.")431 2083 y(exit)g(1)240 2186 y(fi)125 2484 y +2907 y(exit)i(0)240 3011 y(else)431 3115 y(echo)g("No)f(BugId)h +(found.")431 3218 y(exit)g(1)240 3322 y(fi)125 3604 y Fs(The)29 b(`)p Fn(verifymsg)p Fs(')g(\014le)g(con)m(tains)i(this)e -(line:)240 2761 y Fn(^tc)238 b(/usr/cvssupport/bugid.ed)o(it)125 -3059 y Fs(The)29 b(`)p Fn(rcsinfo)p Fs(')g(\014le)h(con)m(tains)g(this) -g(line:)240 3336 y Fn(^tc)238 b(/usr/cvssupport/tc.templ)o(ate)0 -3997 y Fm(C.6)68 b(Editinfo)125 4295 y Fo(NOTE:)42 b +(line:)240 3866 y Fn(^tc)238 b(/usr/cvssupport/bugid.ed)o(it)125 +4148 y Fs(The)29 b(`)p Fn(rcsinfo)p Fs(')g(\014le)h(con)m(tains)g(this) +g(line:)240 4410 y Fn(^tc)238 b(/usr/cvssupport/tc.templ)o(ate)0 +4933 y Fm(C.6)68 b(Editinfo)125 5215 y Fo(NOTE:)42 b Fs(The)g(`)p Fn(editinfo)p Fs(')e(feature)j(has)e(b)s(een)h(rendered)f (obsolete.)76 b(T)-8 b(o)42 b(set)h(a)f(default)g(editor)f(for)h(log)0 -4420 y(messages)26 b(use)f(the)h Fn(EDITOR)d Fs(en)m(vironmen)m(t)i(v) +5340 y(messages)26 b(use)f(the)h Fn(EDITOR)d Fs(en)m(vironmen)m(t)i(v) -5 b(ariable)24 b(\(see)j(App)s(endix)22 b(D)k([En)m(vironmen)m(t)f(v) --5 b(ariables],)25 b(page)h(149\))0 4544 y(or)33 b(the)g(`)p -Fn(-e)p Fs(')f(global)h(option)f(\(see)i(Section)e(A.3)i([Global)e -(options],)h(page)h(89\).)49 b(See)33 b(Section)g(C.5)g([v)m -(erifymsg],)0 4669 y(page)e(140,)h(for)e(information)f(on)h(the)h(use)f -(of)g(the)h(`)p Fn(verifymsg)p Fs(')d(feature)j(for)f(ev)-5 -b(aluating)30 b(log)g(messages.)125 4966 y(If)23 b(y)m(ou)h(w)m(an)m(t) -h(to)g(mak)m(e)g(sure)e(that)i(all)e(log)h(messages)h(lo)s(ok)f(the)g -(same)g(w)m(a)m(y)-8 b(,)27 b(y)m(ou)d(can)h(use)e(the)i(`)p -Fn(editinfo)p Fs(')d(\014le)0 5091 y(to)33 b(sp)s(ecify)d(a)j(program)f -(that)g(is)f(used)h(to)g(edit)g(the)g(log)g(message.)47 -b(This)30 b(program)i(could)f(b)s(e)h(a)g(custom-made)0 -5215 y(editor)g(that)i(alw)m(a)m(ys)f(enforces)g(a)g(certain)g(st)m -(yle)g(of)g(the)g(log)g(message,)h(or)f(ma)m(yb)s(e)g(a)g(simple)e -(shell)g(script)g(that)0 5340 y(calls)f(an)g(editor,)g(and)g(c)m(hec)m -(ks)h(that)g(the)g(en)m(tered)g(message)g(con)m(tains)g(the)g(required) -d(\014elds.)p eop -%%Page: 142 144 -142 143 bop 0 -116 a Fs(142)2366 b(CVS|Concurren)m(t)29 -b(V)-8 b(ersions)30 b(System)125 366 y(If)21 b(no)h(matc)m(hing)f(line) -f(is)h(found)g(in)f(the)i(`)p Fn(editinfo)p Fs(')e(\014le,)j(the)f -(editor)f(sp)s(eci\014ed)f(in)h(the)h(en)m(vironmen)m(t)f(v)-5 -b(ariable)0 491 y Fn($CVSEDITOR)30 b Fs(is)i(used)g(instead.)47 -b(If)32 b(that)i(v)-5 b(ariable)31 b(is)h(not)h(set,)i(then)d(the)h(en) -m(vironmen)m(t)f(v)-5 b(ariable)32 b Fn($EDITOR)f Fs(is)0 -616 y(used)f(instead.)40 b(If)29 b(that)i(v)-5 b(ariable)30 -b(is)f(not)i(set)g(a)f(precompiled)f(default,)g(normally)g -Fn(vi)p Fs(,)h(will)e(b)s(e)i(used.)125 891 y(The)h(`)p -Fn(editinfo)p Fs(')f(\014le)h(is)h(often)g(most)g(useful)f(together)i -(with)e(the)h(`)p Fn(rcsinfo)p Fs(')f(\014le,)g(whic)m(h)g(can)i(b)s(e) -e(used)g(to)0 1016 y(sp)s(ecify)e(a)i(log)f(message)i(template.)125 -1292 y(Eac)m(h)h(line)e(in)g(the)i(`)p Fn(editinfo)p -Fs(')e(\014le)h(consists)g(of)h(a)g(regular)f(expression)g(and)g(a)h -(command-line)e(template.)0 1416 y(The)h(template)g(m)m(ust)g(include)e -(a)j(program)f(name,)h(and)f(can)g(include)e(an)m(y)j(n)m(um)m(b)s(er)e -(of)h(argumen)m(ts.)46 b(The)32 b(full)0 1541 y(path)e(to)h(the)g -(curren)m(t)f(log)g(message)i(template)f(\014le)e(is)h(app)s(ended)e -(to)j(the)g(template.)125 1816 y(One)i(thing)h(that)g(should)f(b)s(e)g -(noted)i(is)e(that)i(the)f(`)p Fn(ALL)p Fs(')g(k)m(eyw)m(ord)h(is)e -(not)i(supp)s(orted.)50 b(If)34 b(more)h(than)f(one)0 -1941 y(matc)m(hing)d(line)e(is)h(found,)g(the)h(\014rst)f(one)h(is)f -(used.)41 b(This)29 b(can)i(b)s(e)f(useful)f(for)i(sp)s(ecifying)e(a)i -(default)f(edit)g(script)0 2065 y(in)f(a)i(mo)s(dule,)e(and)h(then)g(o) -m(v)m(erriding)f(it)h(in)f(a)i(sub)s(directory)-8 b(.)125 -2341 y(If)30 b(the)g(rep)s(ository)g(name)g(do)s(es)h(not)f(matc)m(h)i -(an)m(y)f(of)f(the)h(regular)f(expressions)f(in)g(this)h(\014le,)g(the) -g(`)p Fn(DEFAULT)p Fs(')0 2466 y(line)f(is)g(used,)h(if)f(it)h(is)g(sp) -s(eci\014ed.)125 2741 y(If)f(the)i(edit)f(script)f(exits)h(with)f(a)i -(non-zero)g(exit)f(status,)h(the)g(commit)f(is)g(ab)s(orted.)125 -3017 y(Note:)38 b(when)22 b Fr(CVS)g Fs(is)g(accessing)i(a)f(remote)h -(rep)s(ository)-8 b(,)24 b(or)e(when)g(the)h(`)p Fn(-m)p -Fs(')g(or)g(`)p Fn(-F)p Fs(')f(options)h(to)g Fn(cvs)30 -b(commit)0 3142 y Fs(are)f(used,)g(`)p Fn(editinfo)p -Fs(')e(will)f(not)j(b)s(e)f(consulted.)40 b(There)28 -b(is)g(no)h(go)s(o)s(d)f(w)m(ork)-5 b(around)28 b(for)h(this;)f(use)h -(`)p Fn(verifymsg)p Fs(')0 3266 y(instead.)0 3697 y Fk(C.6.1)62 -b(Editinfo)30 b(example)125 3973 y Fs(The)42 b(follo)m(wing)g(is)g(a)i -(little)e(silly)f(example)i(of)h(a)f(`)p Fn(editinfo)p -Fs(')f(\014le,)k(together)e(with)e(the)i(corresp)s(onding)0 -4098 y(`)p Fn(rcsinfo)p Fs(')28 b(\014le,)h(the)g(log)h(message)g -(template)g(and)f(an)g(editor)g(script.)39 b(W)-8 b(e)31 -b(b)s(egin)d(with)g(the)h(log)h(message)g(tem-)0 4222 -y(plate.)38 b(W)-8 b(e)25 b(w)m(an)m(t)f(to)g(alw)m(a)m(ys)g(record)g -(a)g(bug-id)e(n)m(um)m(b)s(er)g(on)h(the)h(\014rst)e(line)g(of)i(the)g -(log)f(message.)40 b(The)23 b(rest)g(of)h(log)0 4347 -y(message)31 b(is)d(free)i(text.)41 b(The)29 b(follo)m(wing)f(template) -i(is)f(found)f(in)g(the)i(\014le)f(`)p Fn(/usr/cvssupport/tc.templ)o -(ate)o Fs('.)240 4602 y Fn(BugId:)125 4877 y Fs(The)g(script)h(`)p -Fn(/usr/cvssupport/bugid.ed)o(it)p Fs(')24 b(is)30 b(used)f(to)i(edit)f -(the)h(log)f(message.)240 5132 y Fn(#!/bin/sh)240 5236 -y(#)240 5340 y(#)334 b(bugid.edit)45 b(filename)p eop -%%Page: 143 145 -143 144 bop 0 -116 a Fs(App)s(endix)28 b(C:)i(Reference)h(man)m(ual)f -(for)g(the)g(Administrativ)m(e)f(\014les)1419 b(143)240 -366 y Fn(#)240 470 y(#)95 b(Call)47 b($EDITOR)f(on)h(FILENAME,)e(and)i -(verify)f(that)h(the)240 574 y(#)95 b(resulting)45 b(file)i(contains)f -(a)h(valid)f(bugid)h(on)g(the)g(first)240 678 y(#)95 -b(line.)240 782 y(if)47 b([)h("x$EDITOR")d(=)i("x")g(];)g(then)g -(EDITOR=vi;)e(fi)240 885 y(if)i([)h("x$CVSEDITOR")c(=)j("x")g(];)g -(then)g(CVSEDITOR=$EDITOR;)c(fi)240 989 y($CVSEDITOR)i($1)240 -1093 y(until)h(head)h(-1|grep)f('^BugId:[)f(]*[0-9][0-9]*$')f(<)j($1) -240 1197 y(do)95 b(echo)47 b(-n)94 b("No)47 b(BugId)g(found.)94 -b(Edit)46 b(again?)g(\([y]/n\)")431 1300 y(read)h(ans)431 -1404 y(case)g(${ans})f(in)622 1508 y(n*\))h(exit)f(1;;)431 -1612 y(esac)431 1716 y($CVSEDITOR)f($1)240 1819 y(done)125 -2095 y Fs(The)29 b(`)p Fn(editinfo)p Fs(')g(\014le)g(con)m(tains)i -(this)e(line:)240 2349 y Fn(^tc)238 b(/usr/cvssupport/bugid.ed)o(it)125 -2625 y Fs(The)29 b(`)p Fn(rcsinfo)p Fs(')g(\014le)h(con)m(tains)g(this) -g(line:)240 2879 y Fn(^tc)238 b(/usr/cvssupport/tc.templ)o(ate)0 -3340 y Fm(C.7)68 b(Loginfo)125 3616 y Fs(The)27 b(`)p +-5 b(ariables],)25 b(page)h(151\))p eop +%%Page: 144 146 +144 145 bop 0 -116 a Fs(144)2366 b(CVS|Concurren)m(t)29 +b(V)-8 b(ersions)30 b(System)0 366 y(or)j(the)g(`)p Fn(-e)p +Fs(')f(global)h(option)f(\(see)i(Section)e(A.3)i([Global)e(options],)h +(page)h(91\).)49 b(See)33 b(Section)g(C.5)g([v)m(erifymsg],)0 +491 y(page)e(142,)h(for)e(information)f(on)h(the)h(use)f(of)g(the)h(`)p +Fn(verifymsg)p Fs(')d(feature)j(for)f(ev)-5 b(aluating)30 +b(log)g(messages.)125 765 y(If)23 b(y)m(ou)h(w)m(an)m(t)h(to)g(mak)m(e) +g(sure)e(that)i(all)e(log)h(messages)h(lo)s(ok)f(the)g(same)g(w)m(a)m +(y)-8 b(,)27 b(y)m(ou)d(can)h(use)e(the)i(`)p Fn(editinfo)p +Fs(')d(\014le)0 890 y(to)33 b(sp)s(ecify)d(a)j(program)f(that)g(is)f +(used)h(to)g(edit)g(the)g(log)g(message.)47 b(This)30 +b(program)i(could)f(b)s(e)h(a)g(custom-made)0 1014 y(editor)g(that)i +(alw)m(a)m(ys)f(enforces)g(a)g(certain)g(st)m(yle)g(of)g(the)g(log)g +(message,)h(or)f(ma)m(yb)s(e)g(a)g(simple)e(shell)g(script)g(that)0 +1139 y(calls)f(an)g(editor,)g(and)g(c)m(hec)m(ks)h(that)g(the)g(en)m +(tered)g(message)g(con)m(tains)g(the)g(required)d(\014elds.)125 +1413 y(If)21 b(no)h(matc)m(hing)f(line)f(is)h(found)g(in)f(the)i(`)p +Fn(editinfo)p Fs(')e(\014le,)j(the)f(editor)f(sp)s(eci\014ed)f(in)h +(the)h(en)m(vironmen)m(t)f(v)-5 b(ariable)0 1537 y Fn($CVSEDITOR)30 +b Fs(is)i(used)g(instead.)47 b(If)32 b(that)i(v)-5 b(ariable)31 +b(is)h(not)h(set,)i(then)d(the)h(en)m(vironmen)m(t)f(v)-5 +b(ariable)32 b Fn($EDITOR)f Fs(is)0 1662 y(used)f(instead.)40 +b(If)29 b(that)i(v)-5 b(ariable)30 b(is)f(not)i(set)g(a)f(precompiled)f +(default,)g(normally)g Fn(vi)p Fs(,)h(will)e(b)s(e)i(used.)125 +1936 y(The)h(`)p Fn(editinfo)p Fs(')f(\014le)h(is)h(often)g(most)g +(useful)f(together)i(with)e(the)h(`)p Fn(rcsinfo)p Fs(')f(\014le,)g +(whic)m(h)g(can)i(b)s(e)e(used)g(to)0 2060 y(sp)s(ecify)e(a)i(log)f +(message)i(template.)125 2334 y(Eac)m(h)h(line)e(in)g(the)i(`)p +Fn(editinfo)p Fs(')e(\014le)h(consists)g(of)h(a)g(regular)f(expression) +g(and)g(a)h(command-line)e(template.)0 2459 y(The)h(template)g(m)m(ust) +g(include)e(a)j(program)f(name,)h(and)f(can)g(include)e(an)m(y)j(n)m +(um)m(b)s(er)e(of)h(argumen)m(ts.)46 b(The)32 b(full)0 +2583 y(path)e(to)h(the)g(curren)m(t)f(log)g(message)i(template)f +(\014le)e(is)h(app)s(ended)e(to)j(the)g(template.)125 +2857 y(One)i(thing)h(that)g(should)f(b)s(e)g(noted)i(is)e(that)i(the)f +(`)p Fn(ALL)p Fs(')g(k)m(eyw)m(ord)h(is)e(not)i(supp)s(orted.)50 +b(If)34 b(more)h(than)f(one)0 2982 y(matc)m(hing)d(line)e(is)h(found,)g +(the)h(\014rst)f(one)h(is)f(used.)41 b(This)29 b(can)i(b)s(e)f(useful)f +(for)i(sp)s(ecifying)e(a)i(default)f(edit)g(script)0 +3106 y(in)f(a)i(mo)s(dule,)e(and)h(then)g(o)m(v)m(erriding)f(it)h(in)f +(a)i(sub)s(directory)-8 b(.)125 3380 y(If)30 b(the)g(rep)s(ository)g +(name)g(do)s(es)h(not)f(matc)m(h)i(an)m(y)f(of)f(the)h(regular)f +(expressions)f(in)g(this)h(\014le,)g(the)g(`)p Fn(DEFAULT)p +Fs(')0 3505 y(line)f(is)g(used,)h(if)f(it)h(is)g(sp)s(eci\014ed.)125 +3779 y(If)f(the)i(edit)f(script)f(exits)h(with)f(a)i(non-zero)g(exit)f +(status,)h(the)g(commit)f(is)g(ab)s(orted.)125 4053 y(Note:)38 +b(when)22 b Fr(CVS)g Fs(is)g(accessing)i(a)f(remote)h(rep)s(ository)-8 +b(,)24 b(or)e(when)g(the)h(`)p Fn(-m)p Fs(')g(or)g(`)p +Fn(-F)p Fs(')f(options)h(to)g Fn(cvs)30 b(commit)0 4177 +y Fs(are)f(used,)g(`)p Fn(editinfo)p Fs(')e(will)f(not)j(b)s(e)f +(consulted.)40 b(There)28 b(is)g(no)h(go)s(o)s(d)f(w)m(ork)-5 +b(around)28 b(for)h(this;)f(use)h(`)p Fn(verifymsg)p +Fs(')0 4302 y(instead.)0 4692 y Fk(C.6.1)62 b(Editinfo)30 +b(example)125 4966 y Fs(The)42 b(follo)m(wing)g(is)g(a)i(little)e +(silly)f(example)i(of)h(a)f(`)p Fn(editinfo)p Fs(')f(\014le,)k +(together)e(with)e(the)i(corresp)s(onding)0 5091 y(`)p +Fn(rcsinfo)p Fs(')28 b(\014le,)h(the)g(log)h(message)g(template)g(and)f +(an)g(editor)g(script.)39 b(W)-8 b(e)31 b(b)s(egin)d(with)g(the)h(log)h +(message)g(tem-)0 5215 y(plate.)38 b(W)-8 b(e)25 b(w)m(an)m(t)f(to)g +(alw)m(a)m(ys)g(record)g(a)g(bug-id)e(n)m(um)m(b)s(er)g(on)h(the)h +(\014rst)e(line)g(of)i(the)g(log)f(message.)40 b(The)23 +b(rest)g(of)h(log)0 5340 y(message)31 b(is)d(free)i(text.)41 +b(The)29 b(follo)m(wing)f(template)i(is)f(found)f(in)g(the)i(\014le)f +(`)p Fn(/usr/cvssupport/tc.templ)o(ate)o Fs('.)p eop +%%Page: 145 147 +145 146 bop 0 -116 a Fs(App)s(endix)28 b(C:)i(Reference)h(man)m(ual)f +(for)g(the)g(Administrativ)m(e)f(\014les)1419 b(145)240 +366 y Fn(BugId:)125 648 y Fs(The)29 b(script)h(`)p Fn +(/usr/cvssupport/bugid.ed)o(it)p Fs(')24 b(is)30 b(used)f(to)i(edit)f +(the)h(log)f(message.)240 909 y Fn(#!/bin/sh)240 1013 +y(#)240 1117 y(#)334 b(bugid.edit)45 b(filename)240 1221 +y(#)240 1324 y(#)95 b(Call)47 b($EDITOR)f(on)h(FILENAME,)e(and)i +(verify)f(that)h(the)240 1428 y(#)95 b(resulting)45 b(file)i(contains)f +(a)h(valid)f(bugid)h(on)g(the)g(first)240 1532 y(#)95 +b(line.)240 1636 y(if)47 b([)h("x$EDITOR")d(=)i("x")g(];)g(then)g +(EDITOR=vi;)e(fi)240 1740 y(if)i([)h("x$CVSEDITOR")c(=)j("x")g(];)g +(then)g(CVSEDITOR=$EDITOR;)c(fi)240 1843 y($CVSEDITOR)i($1)240 +1947 y(until)h(head)h(-1|grep)f('^BugId:[)f(]*[0-9][0-9]*$')f(<)j($1) +240 2051 y(do)95 b(echo)47 b(-n)94 b("No)47 b(BugId)g(found.)94 +b(Edit)46 b(again?)g(\([y]/n\)")431 2155 y(read)h(ans)431 +2258 y(case)g(${ans})f(in)622 2362 y(n*\))h(exit)f(1;;)431 +2466 y(esac)431 2570 y($CVSEDITOR)f($1)240 2674 y(done)125 +2955 y Fs(The)29 b(`)p Fn(editinfo)p Fs(')g(\014le)g(con)m(tains)i +(this)e(line:)240 3216 y Fn(^tc)238 b(/usr/cvssupport/bugid.ed)o(it)125 +3498 y Fs(The)29 b(`)p Fn(rcsinfo)p Fs(')g(\014le)h(con)m(tains)g(this) +g(line:)240 3759 y Fn(^tc)238 b(/usr/cvssupport/tc.templ)o(ate)0 +4278 y Fm(C.7)68 b(Loginfo)125 4560 y Fs(The)27 b(`)p Fn(loginfo)p Fs(')g(\014le)h(is)f(used)g(to)i(con)m(trol)g(where)f(`)p Fn(cvs)i(commit)p Fs(')c(log)j(information)d(is)i(sen)m(t.)40 -b(The)28 b(\014rst)g(en)m(try)0 3740 y(on)f(a)g(line)e(is)g(a)i +b(The)28 b(\014rst)g(en)m(try)0 4685 y(on)f(a)g(line)e(is)g(a)i (regular)f(expression)g(whic)m(h)f(is)h(tested)h(against)g(the)g (directory)f(that)h(the)g(c)m(hange)h(is)e(b)s(eing)f(made)0 -3865 y(to,)30 b(relativ)m(e)f(to)g(the)g Fn($CVSROOT)p +4809 y(to,)30 b(relativ)m(e)f(to)g(the)g Fn($CVSROOT)p Fs(.)38 b(If)28 b(a)h(matc)m(h)g(is)f(found,)g(then)g(the)h(remainder)e -(of)h(the)h(line)e(is)h(a)h(\014lter)e(program)0 3989 +(of)h(the)h(line)e(is)h(a)h(\014lter)e(program)0 4934 y(that)k(should)d(exp)s(ect)j(log)g(information)d(on)j(its)e(standard)h -(input.)125 4265 y(If)g(the)g(rep)s(ository)g(name)g(do)s(es)h(not)f +(input.)125 5215 y(If)g(the)g(rep)s(ository)g(name)g(do)s(es)h(not)f (matc)m(h)i(an)m(y)f(of)f(the)h(regular)f(expressions)f(in)g(this)h -(\014le,)g(the)g(`)p Fn(DEFAULT)p Fs(')0 4389 y(line)f(is)g(used,)h(if) -f(it)h(is)g(sp)s(eci\014ed.)125 4665 y(All)g(o)s(ccurances)i(of)h(the)f +(\014le,)g(the)g(`)p Fn(DEFAULT)p Fs(')0 5340 y(line)f(is)g(used,)h(if) +f(it)h(is)g(sp)s(eci\014ed.)p eop +%%Page: 146 148 +146 147 bop 0 -116 a Fs(146)2366 b(CVS|Concurren)m(t)29 +b(V)-8 b(ersions)30 b(System)125 366 y(All)g(o)s(ccurances)i(of)h(the)f (name)g(`)p Fn(ALL)p Fs(')f(app)s(earing)g(as)h(a)g(regular)f (expression)g(are)h(used)f(in)g(addition)f(to)j(the)0 -4789 y(\014rst)d(matc)m(hing)g(regular)g(expression)f(or)h(`)p -Fn(DEFAULT)p Fs('.)125 5065 y(The)f(\014rst)h(matc)m(hing)g(regular)g -(expression)f(is)h(used.)125 5340 y(See)g(Section)g(C.3)h([commit)g -(\014les],)e(page)i(138,)h(for)f(a)f(description)f(of)h(the)h(syn)m -(tax)g(of)f(the)h(`)p Fn(loginfo)p Fs(')e(\014le.)p eop -%%Page: 144 146 -144 145 bop 0 -116 a Fs(144)2366 b(CVS|Concurren)m(t)29 -b(V)-8 b(ersions)30 b(System)125 366 y(The)22 b(user)g(ma)m(y)i(sp)s -(ecify)d(a)j(format)f(string)f(as)h(part)g(of)g(the)g(\014lter.)38 -b(The)22 b(string)g(is)g(comp)s(osed)h(of)g(a)g(`)p Fn(\045)p -Fs(')g(follo)m(w)m(ed)0 491 y(b)m(y)41 b(a)g(space,)k(or)c(follo)m(w)m -(ed)f(b)m(y)h(a)h(single)d(format)j(c)m(haracter,)j(or)c(follo)m(w)m -(ed)g(b)m(y)g(a)g(set)h(of)f(format)g(c)m(haracters)0 -616 y(surrounded)28 b(b)m(y)i(`)p Fn({)p Fs(')h(and)e(`)p -Fn(})p Fs(')i(as)f(separators.)42 b(The)30 b(format)g(c)m(haracters)i -(are:)0 923 y Fn(s)432 b Fs(\014le)29 b(name)0 1107 y -Fn(V)432 b Fs(old)30 b(v)m(ersion)f(n)m(um)m(b)s(er)g(\(pre-c)m(hec)m -(kin\))0 1290 y Fn(v)432 b Fs(new)30 b(v)m(ersion)g(n)m(um)m(b)s(er)f -(\(p)s(ost-c)m(hec)m(kin\))125 1598 y(All)22 b(other)i(c)m(haracters)h -(that)f(app)s(ear)g(in)e(a)i(format)g(string)f(expand)g(to)h(an)g(empt) -m(y)g(\014eld)e(\(commas)j(separating)0 1723 y(\014elds)k(are)i(still)d -(pro)m(vided\).)125 2001 y(F)-8 b(or)31 b(example,)f(some)h(v)-5 -b(alid)28 b(format)j(strings)e(are)i(`)p Fn(\045)p Fs(',)g(`)p +491 y(\014rst)d(matc)m(hing)g(regular)g(expression)f(or)h(`)p +Fn(DEFAULT)p Fs('.)125 811 y(The)f(\014rst)h(matc)m(hing)g(regular)g +(expression)f(is)h(used.)125 1131 y(See)g(Section)g(C.3)h([commit)g +(\014les],)e(page)i(140,)h(for)f(a)f(description)f(of)h(the)h(syn)m +(tax)g(of)f(the)h(`)p Fn(loginfo)p Fs(')e(\014le.)125 +1451 y(The)22 b(user)g(ma)m(y)i(sp)s(ecify)d(a)j(format)f(string)f(as)h +(part)g(of)g(the)g(\014lter.)38 b(The)22 b(string)g(is)g(comp)s(osed)h +(of)g(a)g(`)p Fn(\045)p Fs(')g(follo)m(w)m(ed)0 1575 +y(b)m(y)41 b(a)g(space,)k(or)c(follo)m(w)m(ed)f(b)m(y)h(a)h(single)d +(format)j(c)m(haracter,)j(or)c(follo)m(w)m(ed)g(b)m(y)g(a)g(set)h(of)f +(format)g(c)m(haracters)0 1700 y(surrounded)28 b(b)m(y)i(`)p +Fn({)p Fs(')h(and)e(`)p Fn(})p Fs(')i(as)f(separators.)42 +b(The)30 b(format)g(c)m(haracters)i(are:)0 2091 y Fn(s)432 +b Fs(\014le)29 b(name)0 2357 y Fn(V)432 b Fs(old)30 b(v)m(ersion)f(n)m +(um)m(b)s(er)g(\(pre-c)m(hec)m(kin\))0 2623 y Fn(v)432 +b Fs(new)30 b(v)m(ersion)g(n)m(um)m(b)s(er)f(\(p)s(ost-c)m(hec)m(kin\)) +125 3014 y(All)22 b(other)i(c)m(haracters)h(that)f(app)s(ear)g(in)e(a)i +(format)g(string)f(expand)g(to)h(an)g(empt)m(y)g(\014eld)e(\(commas)j +(separating)0 3138 y(\014elds)k(are)i(still)d(pro)m(vided\).)125 +3458 y(F)-8 b(or)31 b(example,)f(some)h(v)-5 b(alid)28 +b(format)j(strings)e(are)i(`)p Fn(\045)p Fs(',)g(`)p Fn(\045s)p Fs(',)f(`)p Fn(\045{s})p Fs(',)g(and)g(`)p -Fn(\045{sVv})p Fs('.)125 2280 y(The)37 b(output)g(will)e(b)s(e)i(a)h +Fn(\045{sVv})p Fs('.)125 3778 y(The)37 b(output)g(will)e(b)s(e)i(a)h (string)f(of)h(tok)m(ens)g(separated)g(b)m(y)g(spaces.)63 b(F)-8 b(or)38 b(bac)m(kw)m(ards)g(compatibilit)m(y)-8 -b(,)39 b(the)0 2404 y(the)29 b(\014rst)f(tok)m(en)h(will)d(b)s(e)i(the) +b(,)39 b(the)0 3903 y(the)29 b(\014rst)f(tok)m(en)h(will)d(b)s(e)i(the) h(rep)s(ository)f(name.)40 b(The)28 b(rest)h(of)g(the)g(tok)m(ens)g -(will)d(b)s(e)i(comma-delimited)g(lists)f(of)0 2529 y(the)j +(will)d(b)s(e)i(comma-delimited)g(lists)f(of)0 4027 y(the)j (information)f(requested)h(in)f(the)h(format)g(string.)40 b(F)-8 b(or)31 b(example,)f(if)f(`)p Fn(/u/src/master)p -Fs(')e(is)i(the)h(rep)s(ository)-8 b(,)0 2653 y(`)p Fn(\045{sVv})p +Fs(')e(is)i(the)h(rep)s(ository)-8 b(,)0 4152 y(`)p Fn(\045{sVv})p Fs(')38 b(is)g(the)h(format)g(string,)h(and)e(three)i(\014les)d(\()p Fn(ChangeLog)p Fs(,)i Fn(Makefile)p Fs(,)g Fn(foo.c)p -Fs(\))f(w)m(ere)i(mo)s(di\014ed,)f(the)0 2778 y(output)30 -b(migh)m(t)g(b)s(e:)240 3035 y Fn(/u/src/master)44 b(ChangeLog,1.1,1.2) -f(Makefile,1.3,1.4)h(foo.c,1.12,1.13)125 3314 y Fs(As)30 +Fs(\))f(w)m(ere)i(mo)s(di\014ed,)f(the)0 4276 y(output)30 +b(migh)m(t)g(b)s(e:)240 4576 y Fn(/u/src/master)44 b(ChangeLog,1.1,1.2) +f(Makefile,1.3,1.4)h(foo.c,1.12,1.13)125 4896 y Fs(As)30 b(another)g(example,)h(`)p Fn(\045{})p Fs(')f(means)g(that)h(only)f (the)g(name)h(of)f(the)h(rep)s(ository)e(will)f(b)s(e)h(generated.)125 -3592 y(Note:)54 b(when)35 b Fr(CVS)h Fs(is)g(accessing)h(a)g(remote)g +5215 y(Note:)54 b(when)35 b Fr(CVS)h Fs(is)g(accessing)h(a)g(remote)g (rep)s(ository)-8 b(,)37 b(`)p Fn(loginfo)p Fs(')e(will)f(b)s(e)i(run)f -(on)h(the)h Fo(remote)42 b Fs(\(i.e.,)0 3717 y(serv)m(er\))31 +(on)h(the)h Fo(remote)42 b Fs(\(i.e.,)0 5340 y(serv)m(er\))31 b(side,)f(not)g(the)h(clien)m(t)f(side)f(\(see)i(Section)g(4.6)g -([Remote)h(rep)s(ositories],)d(page)i(21\).)0 4172 y -Fk(C.7.1)62 b(Loginfo)31 b(example)125 4451 y Fs(The)d(follo)m(wing)f -(`)p Fn(loginfo)p Fs(')h(\014le,)g(together)i(with)e(the)h(tin)m(y)f -(shell-script)f(b)s(elo)m(w,)h(app)s(ends)f(all)h(log)h(messages)0 -4575 y(to)e(the)g(\014le)f(`)p Fn($CVSROOT/CVSROOT/commitl)o(og)p +([Remote)h(rep)s(ositories],)d(page)i(21\).)p eop +%%Page: 147 149 +147 148 bop 0 -116 a Fs(App)s(endix)28 b(C:)i(Reference)h(man)m(ual)f +(for)g(the)g(Administrativ)m(e)f(\014les)1419 b(147)0 +366 y Fk(C.7.1)62 b(Loginfo)31 b(example)125 682 y Fs(The)d(follo)m +(wing)f(`)p Fn(loginfo)p Fs(')h(\014le,)g(together)i(with)e(the)h(tin)m +(y)f(shell-script)f(b)s(elo)m(w,)h(app)s(ends)f(all)h(log)h(messages)0 +807 y(to)e(the)g(\014le)f(`)p Fn($CVSROOT/CVSROOT/commitl)o(og)p Fs(',)c(and)j(an)m(y)i(commits)g(to)g(the)g(administrativ)m(e)e -(\014les)g(\(inside)g(the)0 4700 y(`)p Fn(CVSROOT)p Fs(')k(directory\)) -h(are)h(also)f(logged)h(in)e(`)p Fn(/usr/adm/cvsroot-log)p -Fs('.)240 4958 y Fn(ALL)620 b(/usr/local/bin/cvs-log)41 -b($CVSROOT/CVSROOT/commitlog)240 5062 y(^CVSROOT)380 +(\014les)g(\(inside)g(the)0 931 y(`)p Fn(CVSROOT)p Fs(')k(directory\))h +(are)h(also)f(logged)h(in)e(`)p Fn(/usr/adm/cvsroot-log)p +Fs('.)240 1226 y Fn(ALL)620 b(/usr/local/bin/cvs-log)41 +b($CVSROOT/CVSROOT/commitlog)240 1330 y(^CVSROOT)380 b(/usr/local/bin/cvs-log)41 b(/usr/adm/cvsroot-log)125 -5340 y Fs(The)29 b(shell-script)f(`)p Fn(/usr/local/bin/cvs-log)p -Fs(')d(lo)s(oks)30 b(lik)m(e)g(this:)p eop -%%Page: 145 147 -145 146 bop 0 -116 a Fs(App)s(endix)28 b(C:)i(Reference)h(man)m(ual)f -(for)g(the)g(Administrativ)m(e)f(\014les)1419 b(145)240 -366 y Fn(#!/bin/sh)240 470 y(\(echo)46 b("-------------------------)o -(---)o(----)o(----)o(---)o(----)o(----)o(---)o(----)o(----)o(---)o -(----)o(";)288 574 y(echo)g(-n)i($USER")93 b(";)288 678 -y(date;)288 782 y(echo;)288 885 y(sed)47 b('1s+'${CVSROOT}'++'\))42 -b(>>)47 b($1)0 1335 y Fk(C.7.2)62 b(Keeping)31 b(a)f(c)m(hec)m(k)m(ed)e -(out)j(cop)m(y)125 1613 y Fs(It)c(is)f(often)i(useful)d(to)j(main)m +1645 y Fs(The)29 b(shell-script)f(`)p Fn(/usr/local/bin/cvs-log)p +Fs(')d(lo)s(oks)30 b(lik)m(e)g(this:)240 1940 y Fn(#!/bin/sh)240 +2044 y(\(echo)46 b("-------------------------)o(---)o(----)o(----)o +(---)o(----)o(----)o(---)o(----)o(----)o(---)o(----)o(";)288 +2147 y(echo)g(-n)i($USER")93 b(";)288 2251 y(date;)288 +2355 y(echo;)288 2459 y(sed)47 b('1s+'${CVSROOT}'++'\))42 +b(>>)47 b($1)0 3248 y Fk(C.7.2)62 b(Keeping)31 b(a)f(c)m(hec)m(k)m(ed)e +(out)j(cop)m(y)125 3563 y Fs(It)c(is)f(often)i(useful)d(to)j(main)m (tain)f(a)g(directory)g(tree)h(whic)m(h)e(con)m(tains)i(\014les)e(whic) -m(h)g(corresp)s(ond)g(to)i(the)f(latest)0 1737 y(v)m(ersion)32 +m(h)g(corresp)s(ond)g(to)i(the)f(latest)0 3688 y(v)m(ersion)32 b(in)g(the)h(rep)s(ository)-8 b(.)47 b(F)-8 b(or)34 b(example,)f(other) g(dev)m(elop)s(ers)g(migh)m(t)f(w)m(an)m(t)i(to)f(refer)g(to)g(the)g -(latest)h(sources)0 1862 y(without)j(ha)m(ving)h(to)i(c)m(hec)m(k)g +(latest)h(sources)0 3812 y(without)j(ha)m(ving)h(to)i(c)m(hec)m(k)g (them)e(out,)j(or)e(y)m(ou)f(migh)m(t)h(b)s(e)e(main)m(taining)g(a)i(w) -m(eb)f(site)h(with)e Fr(cvs)g Fs(and)h(w)m(an)m(t)0 1986 +m(eb)f(site)h(with)e Fr(cvs)g Fs(and)h(w)m(an)m(t)0 3937 y(ev)m(ery)31 b(c)m(hec)m(kin)g(to)g(cause)g(the)f(\014les)g(used)f(b)m (y)i(the)f(w)m(eb)h(serv)m(er)f(to)h(b)s(e)f(up)s(dated.)125 -2264 y(The)25 b(w)m(a)m(y)j(to)f(do)f(this)f(is)h(b)m(y)g(ha)m(ving)g +4252 y(The)25 b(w)m(a)m(y)j(to)f(do)f(this)f(is)h(b)m(y)g(ha)m(ving)g (loginfo)g(in)m(v)m(ok)m(e)h Fn(cvs)i(update)p Fs(.)38 b(Doing)27 b(so)f(in)f(the)i(naiv)m(e)f(w)m(a)m(y)i(will)23 -b(cause)0 2389 y(a)29 b(problem)f(with)g(lo)s(c)m(ks,)h(so)h(the)f +b(cause)0 4377 y(a)29 b(problem)f(with)g(lo)s(c)m(ks,)h(so)h(the)f Fn(cvs)g(update)f Fs(m)m(ust)h(b)s(e)f(run)g(in)g(the)h(bac)m(kground.) -40 b(Here)30 b(is)e(an)h(example)g(\(this)0 2513 y(should)f(all)i(b)s -(e)f(on)i(one)f(line\):)240 2770 y Fn(^cyclic-pages)44 +40 b(Here)30 b(is)e(an)h(example)g(\(this)0 4501 y(should)f(all)i(b)s +(e)f(on)i(one)f(line\):)240 4796 y Fn(^cyclic-pages)44 b(\(date;)i(cat;)h(\(sleep)f(2;)h(cd)g(/u/www/local-docs;)288 -2874 y(cvs)g(-q)g(update)f(-d\))h(&\))g(>>)g($CVSROOT/CVSROOT/updatelo) -o(g)42 b(2>&1)125 3152 y Fs(This)c(will)g(cause)j(c)m(hec)m(kins)g(to)h +4900 y(cvs)g(-q)g(update)f(-d\))h(&\))g(>>)g($CVSROOT/CVSROOT/updatelo) +o(g)42 b(2>&1)125 5215 y Fs(This)c(will)g(cause)j(c)m(hec)m(kins)g(to)h (rep)s(ository)d(directories)h(starting)g(with)f Fn(cyclic-pages)f -Fs(to)j(up)s(date)f(the)0 3276 y(c)m(hec)m(k)m(ed)32 -b(out)f(tree)g(in)e(`)p Fn(/u/www/local-docs)p Fs('.)0 -3759 y Fm(C.8)68 b(Rcsinfo)125 4037 y Fs(The)44 b(`)p -Fn(rcsinfo)p Fs(')g(\014le)h(can)h(b)s(e)e(used)h(to)h(sp)s(ecify)e(a)i -(form)f(to)h(edit)f(when)f(\014lling)f(out)j(the)f(commit)h(log.)0 -4162 y(The)f(`)p Fn(rcsinfo)p Fs(')e(\014le)h(has)h(a)g(syn)m(tax)h -(similar)c(to)k(the)f(`)p Fn(verifymsg)p Fs(',)i(`)p -Fn(commitinfo)p Fs(')c(and)h(`)p Fn(loginfo)p Fs(')g(\014les.)0 -4286 y(See)39 b(Section)f(C.3.1)i([syn)m(tax],)h(page)f(139.)66 -b(Unlik)m(e)37 b(the)i(other)g(\014les)e(the)i(second)f(part)h(is)e -Fo(not)k Fs(a)e(command-)0 4411 y(line)c(template.)61 +Fs(to)j(up)s(date)f(the)0 5340 y(c)m(hec)m(k)m(ed)32 +b(out)f(tree)g(in)e(`)p Fn(/u/www/local-docs)p Fs('.)p +eop +%%Page: 148 150 +148 149 bop 0 -116 a Fs(148)2366 b(CVS|Concurren)m(t)29 +b(V)-8 b(ersions)30 b(System)0 366 y Fm(C.8)68 b(Rcsinfo)125 +644 y Fs(The)44 b(`)p Fn(rcsinfo)p Fs(')g(\014le)h(can)h(b)s(e)e(used)h +(to)h(sp)s(ecify)e(a)i(form)f(to)h(edit)f(when)f(\014lling)f(out)j(the) +f(commit)h(log.)0 769 y(The)f(`)p Fn(rcsinfo)p Fs(')e(\014le)h(has)h(a) +g(syn)m(tax)h(similar)c(to)k(the)f(`)p Fn(verifymsg)p +Fs(',)i(`)p Fn(commitinfo)p Fs(')c(and)h(`)p Fn(loginfo)p +Fs(')g(\014les.)0 893 y(See)39 b(Section)f(C.3.1)i([syn)m(tax],)h(page) +f(141.)66 b(Unlik)m(e)37 b(the)i(other)g(\014les)e(the)i(second)f(part) +h(is)e Fo(not)k Fs(a)e(command-)0 1018 y(line)c(template.)61 b(Instead,)39 b(the)e(part)g(after)h(the)f(regular)f(expression)g (should)f(b)s(e)i(a)g(full)e(pathname)i(to)g(a)h(\014le)0 -4535 y(con)m(taining)30 b(the)g(log)h(message)g(template.)125 -4813 y(If)f(the)g(rep)s(ository)g(name)g(do)s(es)h(not)f(matc)m(h)i(an) +1142 y(con)m(taining)30 b(the)g(log)h(message)g(template.)125 +1420 y(If)f(the)g(rep)s(ository)g(name)g(do)s(es)h(not)f(matc)m(h)i(an) m(y)f(of)f(the)h(regular)f(expressions)f(in)g(this)h(\014le,)g(the)g(`) -p Fn(DEFAULT)p Fs(')0 4938 y(line)f(is)g(used,)h(if)f(it)h(is)g(sp)s -(eci\014ed.)125 5215 y(All)g(o)s(ccurances)i(of)h(the)f(name)g(`)p +p Fn(DEFAULT)p Fs(')0 1545 y(line)f(is)g(used,)h(if)f(it)h(is)g(sp)s +(eci\014ed.)125 1822 y(All)g(o)s(ccurances)i(of)h(the)f(name)g(`)p Fn(ALL)p Fs(')f(app)s(earing)g(as)h(a)g(regular)f(expression)g(are)h -(used)f(in)g(addition)f(to)j(the)0 5340 y(\014rst)d(matc)m(hing)g -(regular)g(expression)f(or)h(`)p Fn(DEFAULT)p Fs('.)p -eop -%%Page: 146 148 -146 147 bop 0 -116 a Fs(146)2366 b(CVS|Concurren)m(t)29 -b(V)-8 b(ersions)30 b(System)125 366 y(The)k(log)g(message)i(template)f -(will)d(b)s(e)i(used)g(as)h(a)g(default)f(log)h(message.)54 -b(If)35 b(y)m(ou)g(sp)s(ecify)e(a)i(log)g(message)0 491 -y(with)29 b(`)p Fn(cvs)h(commit)e(-m)i Fo(message)5 b -Fs(')32 b(or)e(`)p Fn(cvs)g(commit)f(-f)h Fo(\014le)5 -b Fs(')29 b(that)i(log)g(message)g(will)d(o)m(v)m(erride)j(the)f -(template.)125 777 y(See)g(Section)g(C.5)h([v)m(erifymsg],)g(page)g -(140,)h(for)e(an)g(example)g(`)p Fn(rcsinfo)p Fs(')f(\014le.)125 -1063 y(When)j Fr(CVS)g Fs(is)f(accessing)i(a)g(remote)g(rep)s(ository) --8 b(,)32 b(the)h(con)m(ten)m(ts)h(of)e(`)p Fn(rcsinfo)p -Fs(')f(at)i(the)g(time)f(a)g(directory)0 1188 y(is)27 -b(\014rst)h(c)m(hec)m(k)m(ed)i(out)e(will)e(sp)s(ecify)h(a)h(template)h -(whic)m(h)e(do)s(es)g(not)i(then)f(c)m(hange.)41 b(If)28 -b(y)m(ou)g(edit)g(`)p Fn(rcsinfo)p Fs(')e(or)j(its)0 -1312 y(templates,)i(y)m(ou)g(ma)m(y)g(need)f(to)h(c)m(hec)m(k)h(out)e -(a)h(new)f(w)m(orking)g(directory)-8 b(.)0 1869 y Fm(C.9)68 -b(Ignoring)31 b(\014les)g(via)g(cvsignore)125 2155 y +(used)f(in)g(addition)f(to)j(the)0 1947 y(\014rst)d(matc)m(hing)g +(regular)g(expression)f(or)h(`)p Fn(DEFAULT)p Fs('.)125 +2224 y(The)k(log)g(message)i(template)f(will)d(b)s(e)i(used)g(as)h(a)g +(default)f(log)h(message.)54 b(If)35 b(y)m(ou)g(sp)s(ecify)e(a)i(log)g +(message)0 2349 y(with)29 b(`)p Fn(cvs)h(commit)e(-m)i +Fo(message)5 b Fs(')32 b(or)e(`)p Fn(cvs)g(commit)f(-f)h +Fo(\014le)5 b Fs(')29 b(that)i(log)g(message)g(will)d(o)m(v)m(erride)j +(the)f(template.)125 2627 y(See)g(Section)g(C.5)h([v)m(erifymsg],)g +(page)g(142,)h(for)e(an)g(example)g(`)p Fn(rcsinfo)p +Fs(')f(\014le.)125 2904 y(When)j Fr(CVS)g Fs(is)f(accessing)i(a)g +(remote)g(rep)s(ository)-8 b(,)32 b(the)h(con)m(ten)m(ts)h(of)e(`)p +Fn(rcsinfo)p Fs(')f(at)i(the)g(time)f(a)g(directory)0 +3029 y(is)27 b(\014rst)h(c)m(hec)m(k)m(ed)i(out)e(will)e(sp)s(ecify)h +(a)h(template)h(whic)m(h)e(do)s(es)g(not)i(then)f(c)m(hange.)41 +b(If)28 b(y)m(ou)g(edit)g(`)p Fn(rcsinfo)p Fs(')e(or)j(its)0 +3153 y(templates,)i(y)m(ou)g(ma)m(y)g(need)f(to)h(c)m(hec)m(k)h(out)e +(a)h(new)f(w)m(orking)g(directory)-8 b(.)0 3635 y Fm(C.9)68 +b(Ignoring)31 b(\014les)g(via)g(cvsignore)125 3913 y Fs(There)d(are)h(certain)g(\014le)f(names)h(that)h(frequen)m(tly)e(o)s (ccur)h(inside)e(y)m(our)i(w)m(orking)f(cop)m(y)-8 b(,)31 -b(but)d(that)i(y)m(ou)f(don't)0 2279 y(w)m(an)m(t)36 +b(but)d(that)i(y)m(ou)f(don't)0 4037 y(w)m(an)m(t)36 b(to)f(put)f(under)f Fr(cvs)h Fs(con)m(trol.)54 b(Examples)33 b(are)j(all)d(the)i(ob)5 b(ject)36 b(\014les)d(that)i(y)m(ou)g(get)h -(while)d(y)m(ou)i(compile)0 2404 y(y)m(our)29 b(sources.)41 +(while)d(y)m(ou)i(compile)0 4162 y(y)m(our)29 b(sources.)41 b(Normally)-8 b(,)29 b(when)f(y)m(ou)i(run)e(`)p Fn(cvs)h(update)p Fs(',)g(it)g(prin)m(ts)e(a)j(line)e(for)h(eac)m(h)h(\014le)f(it)g -(encoun)m(ters)g(that)0 2528 y(it)h(do)s(esn't)g(kno)m(w)g(ab)s(out)h -(\(see)g(Section)f(A.18.2)i([up)s(date)e(output],)h(page)g(122\).)125 -2814 y Fr(cvs)f Fs(has)h(a)h(list)e(of)i(\014les)e(\(or)i(sh\(1\))g +(encoun)m(ters)g(that)0 4286 y(it)h(do)s(esn't)g(kno)m(w)g(ab)s(out)h +(\(see)g(Section)f(A.18.2)i([up)s(date)e(output],)h(page)g(124\).)125 +4564 y Fr(cvs)f Fs(has)h(a)h(list)e(of)i(\014les)e(\(or)i(sh\(1\))g (\014le)e(name)i(patterns\))g(that)g(it)f(should)e(ignore)i(while)f -(running)e Fn(update)p Fs(,)0 2939 y Fn(import)h Fs(and)g +(running)e Fn(update)p Fs(,)0 4689 y Fn(import)h Fs(and)g Fn(release)p Fs(.)39 b(This)29 b(list)g(is)g(constructed)i(in)e(the)h -(follo)m(wing)f(w)m(a)m(y)-8 b(.)75 3225 y Fq(\017)60 +(follo)m(wing)f(w)m(a)m(y)-8 b(.)75 4966 y Fq(\017)60 b Fs(The)39 b(list)f(is)g(initialized)e(to)k(include)d(certain)i (\014le)g(name)g(patterns:)59 b(names)39 b(asso)s(ciated)g(with)f -Fr(cvs)h Fs(ad-)180 3350 y(ministration,)f(or)h(with)e(other)i(common)g +Fr(cvs)h Fs(ad-)180 5091 y(ministration,)f(or)h(with)e(other)i(common)g (source)f(con)m(trol)h(systems;)k(common)c(names)f(for)h(patc)m(h)g -(\014les,)180 3474 y(ob)5 b(ject)30 b(\014les,)e(arc)m(hiv)m(e)h +(\014les,)180 5215 y(ob)5 b(ject)30 b(\014les,)e(arc)m(hiv)m(e)h (\014les,)f(and)g(editor)g(bac)m(kup)h(\014les;)f(and)g(other)h(names)g -(that)g(are)g(usually)e(artifacts)i(of)180 3599 y(assorted)i +(that)g(are)g(usually)e(artifacts)i(of)180 5340 y(assorted)i (utilities.)38 b(Curren)m(tly)-8 b(,)29 b(the)i(default)e(list)g(of)i -(ignored)e(\014le)h(name)g(patterns)h(is:)611 3739 y -Fn(RCS)238 b(SCCS)190 b(CVS)237 b(CVS.adm)611 3843 y(RCSLOG)94 -b(cvslog.*)611 3947 y(tags)190 b(TAGS)611 4051 y(.make.state)236 -b(.nse_depinfo)611 4154 y(*~)286 b(#*)g(.#*)237 b(,*)286 -b(_$*)238 b(*$)611 4258 y(*.old)142 b(*.bak)g(*.BAK)f(*.orig)94 -b(*.rej)142 b(.del-*)611 4362 y(*.a)238 b(*.olb)142 b(*.o)237 -b(*.obj)142 b(*.so)190 b(*.exe)611 4466 y(*.Z)238 b(*.elc)142 -b(*.ln)611 4570 y(core)75 4731 y Fq(\017)60 b Fs(The)31 -b(p)s(er-rep)s(ository)g(list)f(in)h(`)p Fn($CVSROOT/CVSROOT/cvsignor)o -(e)p Fs(')26 b(is)31 b(app)s(ended)f(to)j(the)f(list,)f(if)g(that)i -(\014le)180 4856 y(exists.)75 5017 y Fq(\017)60 b Fs(The)30 -b(p)s(er-user)f(list)g(in)g(`)p Fn(.cvsignore)p Fs(')f(in)h(y)m(our)h -(home)h(directory)f(is)f(app)s(ended)g(to)i(the)f(list,)g(if)f(it)h -(exists.)75 5179 y Fq(\017)60 b Fs(An)m(y)30 b(en)m(tries)h(in)e(the)h -(en)m(vironmen)m(t)g(v)-5 b(ariable)29 b Fn($CVSIGNORE)f -Fs(is)h(app)s(ended)g(to)i(the)g(list.)75 5340 y Fq(\017)60 -b Fs(An)m(y)30 b(`)p Fn(-I)p Fs(')h(options)e(giv)m(en)i(to)g -Fr(cvs)e Fs(is)h(app)s(ended.)p eop -%%Page: 147 149 -147 148 bop 0 -116 a Fs(App)s(endix)28 b(C:)i(Reference)h(man)m(ual)f -(for)g(the)g(Administrativ)m(e)f(\014les)1419 b(147)75 -366 y Fq(\017)60 b Fs(As)29 b Fr(cvs)f Fs(tra)m(v)m(erses)j(through)d -(y)m(our)h(directories,)g(the)g(con)m(ten)m(ts)i(of)e(an)m(y)h(`)p -Fn(.cvsignore)p Fs(')d(will)f(b)s(e)j(app)s(ended)180 -491 y(to)j(the)g(list.)44 b(The)31 b(patterns)h(found)e(in)g(`)p -Fn(.cvsignore)p Fs(')g(are)i(only)f(v)-5 b(alid)30 b(for)h(the)h -(directory)f(that)i(con)m(tains)180 616 y(them,)e(not)f(for)g(an)m(y)h -(sub-directories.)125 918 y(In)g(an)m(y)i(of)g(the)g(5)g(places)f -(listed)f(ab)s(o)m(v)m(e,)k(a)e(single)e(exclamation)i(mark)f(\(`)p -Fn(!)p Fs('\))h(clears)g(the)g(ignore)f(list.)46 b(This)0 -1042 y(can)31 b(b)s(e)e(used)h(if)f(y)m(ou)i(w)m(an)m(t)g(to)g(store)g -(an)m(y)g(\014le)f(whic)m(h)f(normally)f(is)i(ignored)f(b)m(y)h -Fr(cvs)p Fs(.)125 1318 y(Sp)s(ecifying)25 b(`)p Fn(-I)30 +(ignored)e(\014le)h(name)g(patterns)h(is:)p eop +%%Page: 149 151 +149 150 bop 0 -116 a Fs(App)s(endix)28 b(C:)i(Reference)h(man)m(ual)f +(for)g(the)g(Administrativ)m(e)f(\014les)1419 b(149)611 +366 y Fn(RCS)238 b(SCCS)190 b(CVS)237 b(CVS.adm)611 470 +y(RCSLOG)94 b(cvslog.*)611 574 y(tags)190 b(TAGS)611 +678 y(.make.state)236 b(.nse_depinfo)611 782 y(*~)286 +b(#*)g(.#*)237 b(,*)286 b(_$*)238 b(*$)611 885 y(*.old)142 +b(*.bak)g(*.BAK)f(*.orig)94 b(*.rej)142 b(.del-*)611 +989 y(*.a)238 b(*.olb)142 b(*.o)237 b(*.obj)142 b(*.so)190 +b(*.exe)611 1093 y(*.Z)238 b(*.elc)142 b(*.ln)611 1197 +y(core)75 1342 y Fq(\017)60 b Fs(The)31 b(p)s(er-rep)s(ository)g(list)f +(in)h(`)p Fn($CVSROOT/CVSROOT/cvsignor)o(e)p Fs(')26 +b(is)31 b(app)s(ended)f(to)j(the)f(list,)f(if)g(that)i(\014le)180 +1467 y(exists.)75 1612 y Fq(\017)60 b Fs(The)30 b(p)s(er-user)f(list)g +(in)g(`)p Fn(.cvsignore)p Fs(')f(in)h(y)m(our)h(home)h(directory)f(is)f +(app)s(ended)g(to)i(the)f(list,)g(if)f(it)h(exists.)75 +1757 y Fq(\017)60 b Fs(An)m(y)30 b(en)m(tries)h(in)e(the)h(en)m +(vironmen)m(t)g(v)-5 b(ariable)29 b Fn($CVSIGNORE)f Fs(is)h(app)s +(ended)g(to)i(the)g(list.)75 1903 y Fq(\017)60 b Fs(An)m(y)30 +b(`)p Fn(-I)p Fs(')h(options)e(giv)m(en)i(to)g Fr(cvs)e +Fs(is)h(app)s(ended.)75 2048 y Fq(\017)60 b Fs(As)29 +b Fr(cvs)f Fs(tra)m(v)m(erses)j(through)d(y)m(our)h(directories,)g(the) +g(con)m(ten)m(ts)i(of)e(an)m(y)h(`)p Fn(.cvsignore)p +Fs(')d(will)f(b)s(e)j(app)s(ended)180 2172 y(to)j(the)g(list.)44 +b(The)31 b(patterns)h(found)e(in)g(`)p Fn(.cvsignore)p +Fs(')g(are)i(only)f(v)-5 b(alid)30 b(for)h(the)h(directory)f(that)i +(con)m(tains)180 2297 y(them,)e(not)f(for)g(an)m(y)h(sub-directories.) +125 2592 y(In)g(an)m(y)i(of)g(the)g(5)g(places)f(listed)f(ab)s(o)m(v)m +(e,)k(a)e(single)e(exclamation)i(mark)f(\(`)p Fn(!)p +Fs('\))h(clears)g(the)g(ignore)f(list.)46 b(This)0 2716 +y(can)31 b(b)s(e)e(used)h(if)f(y)m(ou)i(w)m(an)m(t)g(to)g(store)g(an)m +(y)g(\014le)f(whic)m(h)f(normally)f(is)i(ignored)f(b)m(y)h +Fr(cvs)p Fs(.)125 2990 y(Sp)s(ecifying)25 b(`)p Fn(-I)30 b(!)p Fs(')f(to)g Fn(cvs)g(import)e Fs(will)e(imp)s(ort)i(ev)m (erything,)i(whic)m(h)e(is)g(generally)h(what)g(y)m(ou)h(w)m(an)m(t)g -(to)g(do)0 1443 y(if)35 b(y)m(ou)h(are)g(imp)s(orting)e(\014les)g(from) +(to)g(do)0 3115 y(if)35 b(y)m(ou)h(are)g(imp)s(orting)e(\014les)g(from) i(a)g(pristine)d(distribution)f(or)k(an)m(y)g(other)g(source)g(whic)m -(h)f(is)g(kno)m(wn)g(to)i(not)0 1567 y(con)m(tain)32 +(h)f(is)g(kno)m(wn)g(to)i(not)0 3239 y(con)m(tain)32 b(an)m(y)g(extraneous)g(\014les.)44 b(Ho)m(w)m(ev)m(er,)35 b(lo)s(oking)30 b(at)j(the)f(rules)e(ab)s(o)m(v)m(e)j(y)m(ou)f(will)d -(see)j(there)g(is)f(a)h(\015y)f(in)g(the)0 1692 y(oin)m(tmen)m(t;)e(if) +(see)j(there)g(is)f(a)h(\015y)f(in)g(the)0 3364 y(oin)m(tmen)m(t;)e(if) e(the)g(distribution)d(con)m(tains)k(an)m(y)g(`)p Fn(.cvsignore)p Fs(')d(\014les,)i(then)h(the)f(patterns)h(from)f(those)h(\014les)f -(will)0 1816 y(b)s(e)g(pro)s(cessed)h(ev)m(en)g(if)f(`)p +(will)0 3488 y(b)s(e)g(pro)s(cessed)h(ev)m(en)g(if)f(`)p Fn(-I)j(!)p Fs(')e(is)f(sp)s(eci\014ed.)38 b(The)28 b(only)f(w)m(ork)-5 b(around)27 b(is)g(to)h(remo)m(v)m(e)i(the)e(`)p Fn(.cvsignore)p -Fs(')d(\014les)i(in)0 1941 y(order)f(to)h(do)g(the)g(imp)s(ort.)38 +Fs(')d(\014les)i(in)0 3613 y(order)f(to)h(do)g(the)g(imp)s(ort.)38 b(Because)28 b(this)d(is)h(a)m(wkw)m(ard,)h(in)f(the)h(future)e(`)p Fn(-I)30 b(!)p Fs(')d(migh)m(t)f(b)s(e)g(mo)s(di\014ed)e(to)k(o)m(v)m -(erride)0 2065 y(`)p Fn(.cvsignore)p Fs(')g(\014les)h(in)g(eac)m(h)j -(directory)-8 b(.)0 2529 y Fm(C.10)68 b(The)30 b(history)h(\014le)125 -2804 y Fs(The)41 b(\014le)f(`)p Fn($CVSROOT/CVSROOT/history)p +(erride)0 3737 y(`)p Fn(.cvsignore)p Fs(')g(\014les)h(in)g(eac)m(h)j +(directory)-8 b(.)0 4169 y Fm(C.10)68 b(The)30 b(history)h(\014le)125 +4443 y Fs(The)41 b(\014le)f(`)p Fn($CVSROOT/CVSROOT/history)p Fs(')c(is)k(used)h(to)h(log)g(information)e(for)h(the)h -Fn(history)d Fs(command)0 2929 y(\(see)34 b(Section)f(A.10)h -([history],)g(page)g(106\).)50 b(This)31 b(\014le)i(m)m(ust)g(b)s(e)f +Fn(history)d Fs(command)0 4568 y(\(see)34 b(Section)f(A.10)h +([history],)g(page)g(108\).)50 b(This)31 b(\014le)i(m)m(ust)g(b)s(e)f (created)i(to)g(turn)e(on)h(logging.)49 b(This)31 b(is)h(done)0 -3053 y(automatically)e(if)e(the)j Fn(cvs)e(init)g Fs(command)g(is)g +4692 y(automatically)e(if)e(the)j Fn(cvs)e(init)g Fs(command)g(is)g (used)g(to)i(set)f(up)f(the)h(rep)s(ository)f(\(see)h(Section)g(4.5)h -([Creating)0 3178 y(a)g(rep)s(ository],)f(page)h(20\).)125 -3454 y(The)23 b(\014le)h(format)g(of)h(the)f(`)p Fn(history)p +([Creating)0 4817 y(a)g(rep)s(ository],)f(page)h(20\).)125 +5091 y(The)23 b(\014le)h(format)g(of)h(the)f(`)p Fn(history)p Fs(')f(\014le)g(is)g(do)s(cumen)m(ted)h(only)g(in)f(commen)m(ts)i(in)e -(the)h Fr(cvs)f Fs(source)i(co)s(de,)h(but)0 3578 y(generally)31 +(the)h Fr(cvs)f Fs(source)i(co)s(de,)h(but)0 5215 y(generally)31 b(programs)h(should)e(use)i(the)g Fn(cvs)e(history)g Fs(command)i(to)h(access)g(it)f(an)m(yw)m(a)m(y)-8 b(,)34 -b(in)d(case)i(the)g(format)0 3703 y(c)m(hanges)e(with)e(future)h -(releases)g(of)h Fr(cvs)p Fs(.)0 4166 y Fm(C.11)68 b(Expansions)31 -b(in)f(administrativ)l(e)j(\014les)125 4442 y Fs(Sometimes)c(in)f +b(in)d(case)i(the)g(format)0 5340 y(c)m(hanges)e(with)e(future)h +(releases)g(of)h Fr(cvs)p Fs(.)p eop +%%Page: 150 152 +150 151 bop 0 -116 a Fs(150)2366 b(CVS|Concurren)m(t)29 +b(V)-8 b(ersions)30 b(System)0 366 y Fm(C.11)68 b(Expansions)31 +b(in)f(administrativ)l(e)j(\014les)125 640 y Fs(Sometimes)c(in)f (writing)g(an)h(administrativ)m(e)f(\014le,)h(y)m(ou)h(migh)m(t)g(w)m (an)m(t)g(the)g(\014le)f(to)h(b)s(e)f(able)g(to)h(kno)m(w)g(v)-5 -b(arious)0 4566 y(things)29 b(based)h(on)h(en)m(vironmen)m(t)f +b(arious)0 765 y(things)29 b(based)h(on)h(en)m(vironmen)m(t)f Fr(cvs)f Fs(is)g(running)f(in.)39 b(There)30 b(are)h(sev)m(eral)g(mec)m -(hanisms)e(to)i(do)g(that.)125 4842 y(T)-8 b(o)32 b(\014nd)e(the)i +(hanisms)e(to)i(do)g(that.)125 1039 y(T)-8 b(o)32 b(\014nd)e(the)i (home)g(directory)f(of)h(the)g(user)f(running)e Fr(cvs)i Fs(\(from)h(the)g Fn(HOME)e Fs(en)m(vironmen)m(t)i(v)-5 -b(ariable\),)31 b(use)0 4966 y(`)p Fn(~)p Fs(')26 b(follo)m(w)m(ed)g(b) +b(ariable\),)31 b(use)0 1163 y(`)p Fn(~)p Fs(')26 b(follo)m(w)m(ed)g(b) m(y)g(`)p Fn(/)p Fs(')g(or)g(the)g(end)g(of)g(the)g(line.)38 b(Lik)m(ewise)25 b(for)h(the)g(home)g(directory)f(of)i Fo(user)p Fs(,)f(use)g(`)p Fn(~)p Fo(user)7 b Fs('.)38 -b(These)0 5091 y(v)-5 b(ariables)37 b(are)h(expanded)g(on)g(the)g(serv) +b(These)0 1288 y(v)-5 b(ariables)37 b(are)h(expanded)g(on)g(the)g(serv) m(er)g(mac)m(hine,)i(and)e(don't)g(get)h(an)m(y)g(resonable)e -(expansion)g(if)g(pserv)m(er)0 5215 y(\(see)27 b(Section)e(4.6.2)j([P)m +(expansion)g(if)g(pserv)m(er)0 1413 y(\(see)27 b(Section)e(4.6.3)j([P)m (assw)m(ord)e(authen)m(ticated],)h(page)g(23\))g(is)d(in)h(used;)h (therefore)h(user)d(v)-5 b(ariables)25 b(\(see)h(b)s(elo)m(w\))0 -5340 y(ma)m(y)31 b(b)s(e)f(a)g(b)s(etter)h(c)m(hoice)g(to)g(customize)g +1537 y(ma)m(y)31 b(b)s(e)f(a)g(b)s(etter)h(c)m(hoice)g(to)g(customize)g (b)s(eha)m(vior)e(based)h(on)h(the)f(user)g(running)e -Fr(cvs)p Fs(.)p eop -%%Page: 148 150 -148 149 bop 0 -116 a Fs(148)2366 b(CVS|Concurren)m(t)29 -b(V)-8 b(ersions)30 b(System)125 366 y(One)25 b(ma)m(y)h(w)m(an)m(t)g -(to)g(kno)m(w)g(ab)s(out)f(v)-5 b(arious)25 b(pieces)g(of)h -(information)d(in)m(ternal)i(to)h Fr(cvs)p Fs(.)38 b(A)26 -b Fr(cvs)e Fs(in)m(ternal)g(v)-5 b(ari-)0 491 y(able)30 -b(has)g(the)g(syn)m(tax)h Fn(${)p Fo(v)-5 b(ariable)5 -b Fn(})p Fs(,)28 b(where)i Fo(v)-5 b(ariable)34 b Fs(starts)c(with)f(a) -i(letter)f(and)g(consists)f(of)h(alphan)m(um)m(b)s(eric)0 -616 y(c)m(haracters)k(and)d(`)p Fn(_)p Fs('.)47 b(If)32 -b(the)g(c)m(haracter)i(follo)m(wing)d Fo(v)-5 b(ariable)36 -b Fs(is)31 b(a)i(non-alphan)m(umeric)d(c)m(haracter)k(other)e(than)0 -740 y(`)p Fn(_)p Fs(',)f(the)f(`)p Fn({)p Fs(')h(and)f(`)p -Fn(})p Fs(')g(can)h(b)s(e)f(omitted.)40 b(The)30 b Fr(cvs)g -Fs(in)m(ternal)f(v)-5 b(ariables)29 b(are:)0 1039 y Fn(CVSROOT)144 -b Fs(This)35 b(is)h(the)h(v)-5 b(alue)36 b(of)h(the)f -Fr(cvs)g Fs(ro)s(ot)h(in)f(use.)59 b(See)37 b(Chapter)f(4)h([Rep)s -(ository],)h(page)g(15,)h(for)e(a)480 1163 y(description)28 -b(of)j(the)g(v)-5 b(arious)29 b(w)m(a)m(ys)i(to)g(sp)s(ecify)e(this.)0 -1338 y Fn(RCSBIN)192 b Fs(This)30 b(is)i(the)g(v)-5 b(alue)32 -b Fr(cvs)f Fs(is)g(using)g(for)h(where)g(to)h(\014nd)e -Fr(r)n(cs)g Fs(binaries.)44 b(See)32 b(Section)g(A.3)h([Global)480 -1462 y(options],)d(page)h(89,)h(for)e(a)h(description)d(of)j(ho)m(w)f -(to)h(sp)s(ecify)e(this.)0 1637 y Fn(CVSEDITOR)0 1761 -y(VISUAL)0 1886 y(EDITOR)192 b Fs(These)37 b(all)f(expand)g(to)i(the)f -(same)h(v)-5 b(alue,)38 b(whic)m(h)e(is)g(the)h(editor)g(that)h -Fr(cvs)e Fs(is)g(using.)59 b(See)37 b(Sec-)480 2010 y(tion)30 -b(A.3)h([Global)f(options],)g(page)h(89,)h(for)e(ho)m(w)g(to)h(sp)s -(ecify)e(this.)0 2185 y Fn(USER)288 b Fs(Username)30 +Fr(cvs)p Fs(.)125 1811 y(One)d(ma)m(y)h(w)m(an)m(t)g(to)g(kno)m(w)g(ab) +s(out)f(v)-5 b(arious)25 b(pieces)g(of)h(information)d(in)m(ternal)i +(to)h Fr(cvs)p Fs(.)38 b(A)26 b Fr(cvs)e Fs(in)m(ternal)g(v)-5 +b(ari-)0 1936 y(able)30 b(has)g(the)g(syn)m(tax)h Fn(${)p +Fo(v)-5 b(ariable)5 b Fn(})p Fs(,)28 b(where)i Fo(v)-5 +b(ariable)34 b Fs(starts)c(with)f(a)i(letter)f(and)g(consists)f(of)h +(alphan)m(um)m(b)s(eric)0 2060 y(c)m(haracters)k(and)d(`)p +Fn(_)p Fs('.)47 b(If)32 b(the)g(c)m(haracter)i(follo)m(wing)d +Fo(v)-5 b(ariable)36 b Fs(is)31 b(a)i(non-alphan)m(umeric)d(c)m +(haracter)k(other)e(than)0 2185 y(`)p Fn(_)p Fs(',)f(the)f(`)p +Fn({)p Fs(')h(and)f(`)p Fn(})p Fs(')g(can)h(b)s(e)f(omitted.)40 +b(The)30 b Fr(cvs)g Fs(in)m(ternal)f(v)-5 b(ariables)29 +b(are:)0 2480 y Fn(CVSROOT)144 b Fs(This)35 b(is)h(the)h(v)-5 +b(alue)36 b(of)h(the)f Fr(cvs)g Fs(ro)s(ot)h(in)f(use.)59 +b(See)37 b(Chapter)f(4)h([Rep)s(ository],)h(page)g(15,)h(for)e(a)480 +2605 y(description)28 b(of)j(the)g(v)-5 b(arious)29 b(w)m(a)m(ys)i(to)g +(sp)s(ecify)e(this.)0 2773 y Fn(RCSBIN)192 b Fs(This)30 +b(is)i(the)g(v)-5 b(alue)32 b Fr(cvs)f Fs(is)g(using)g(for)h(where)g +(to)h(\014nd)e Fr(r)n(cs)g Fs(binaries.)44 b(See)32 b(Section)g(A.3)h +([Global)480 2897 y(options],)d(page)h(91,)h(for)e(a)h(description)d +(of)j(ho)m(w)f(to)h(sp)s(ecify)e(this.)0 3065 y Fn(CVSEDITOR)0 +3190 y(VISUAL)0 3314 y(EDITOR)192 b Fs(These)37 b(all)f(expand)g(to)i +(the)f(same)h(v)-5 b(alue,)38 b(whic)m(h)e(is)g(the)h(editor)g(that)h +Fr(cvs)e Fs(is)g(using.)59 b(See)37 b(Sec-)480 3439 y(tion)30 +b(A.3)h([Global)f(options],)g(page)h(91,)h(for)e(ho)m(w)g(to)h(sp)s +(ecify)e(this.)0 3607 y Fn(USER)288 b Fs(Username)30 b(of)h(the)g(user)e(running)f Fr(cvs)h Fs(\(on)i(the)f -Fr(cvs)g Fs(serv)m(er)h(mac)m(hine\).)125 2484 y(If)i(y)m(ou)h(w)m(an)m +Fr(cvs)g Fs(serv)m(er)h(mac)m(hine\).)125 3903 y(If)i(y)m(ou)h(w)m(an)m (t)h(to)g(pass)f(a)g(v)-5 b(alue)33 b(to)i(the)f(administrativ)m(e)f (\014les)g(whic)m(h)f(the)i(user)g(that)g(is)f(running)f -Fr(cvs)h Fs(can)0 2608 y(sp)s(ecify)-8 b(,)24 b(use)e(a)h(user)f(v)-5 +Fr(cvs)h Fs(can)0 4027 y(sp)s(ecify)-8 b(,)24 b(use)e(a)h(user)f(v)-5 b(ariable.)37 b(T)-8 b(o)23 b(expand)f(a)i(user)e(v)-5 b(ariable,)23 b(the)g(administrativ)m(e)e(\014le)h(con)m(tains)h -Fn(${=)p Fo(v)-5 b(ariable)5 b Fn(})p Fs(.)0 2733 y(T)-8 +Fn(${=)p Fo(v)-5 b(ariable)5 b Fn(})p Fs(.)0 4152 y(T)-8 b(o)29 b(set)g(a)f(user)g(v)-5 b(ariable,)28 b(sp)s(ecify)f(the)h (global)g(option)g(`)p Fn(-s)p Fs(')g(to)h Fr(cvs)p Fs(,)f(with)f (argumen)m(t)i Fo(v)-5 b(ariable)5 b Fn(=)p Fo(v)-5 b(alue)5 -b Fs(.)38 b(It)28 b(ma)m(y)0 2857 y(b)s(e)i(particularly)e(useful)g(to) +b Fs(.)38 b(It)28 b(ma)m(y)0 4276 y(b)s(e)i(particularly)e(useful)g(to) j(sp)s(ecify)e(this)h(option)f(via)h(`)p Fn(.cvsrc)p -Fs(')g(\(see)h(Section)f(A.2)h([)p Fn(~)p Fs(/.cvsrc],)h(page)f(87\).) -125 3131 y(F)-8 b(or)37 b(example,)i(if)d(y)m(ou)h(w)m(an)m(t)h(the)f +Fs(')g(\(see)h(Section)f(A.2)h([)p Fn(~)p Fs(/.cvsrc],)h(page)f(89\).) +125 4550 y(F)-8 b(or)37 b(example,)i(if)d(y)m(ou)h(w)m(an)m(t)h(the)f (administrativ)m(e)e(\014le)i(to)g(refer)g(to)h(a)f(test)h(directory)e -(y)m(ou)i(migh)m(t)e(create)0 3256 y(a)43 b(user)f(v)-5 +(y)m(ou)i(migh)m(t)e(create)0 4675 y(a)43 b(user)f(v)-5 b(ariable)41 b Fn(TESTDIR)p Fs(.)75 b(Then)41 b(if)h Fr(cvs)f Fs(is)h(in)m(v)m(ok)m(ed)h(as)f Fn(cvs)30 b(-s)g -(TESTDIR=/work/local/tes)o(ts)p Fs(,)40 b(and)0 3380 +(TESTDIR=/work/local/tes)o(ts)p Fs(,)40 b(and)0 4799 y(the)j(administrativ)m(e)d(\014le)i(con)m(tains)h Fn(sh)29 b(${=TESTDIR}/runtests)p Fs(,)41 b(then)h(that)h(string)e(is)h -(expanded)f(to)j Fn(sh)0 3505 y(/work/local/tests/runtes)o(ts)p -Fs(.)125 3779 y(All)28 b(other)i(strings)e(con)m(taining)i(`)p +(expanded)f(to)j Fn(sh)0 4924 y(/work/local/tests/runtes)o(ts)p +Fs(.)125 5198 y(All)28 b(other)i(strings)e(con)m(taining)i(`)p Fn($)p Fs(')g(are)g(reserv)m(ed;)g(there)g(is)f(no)h(w)m(a)m(y)g(to)h (quote)f(a)g(`)p Fn($)p Fs(')g(c)m(haracter)h(so)f(that)h(`)p -Fn($)p Fs(')0 3903 y(represen)m(ts)f(itself.)p eop -%%Page: 149 151 -149 150 bop 0 -116 a Fs(App)s(endix)28 b(D:)j(All)e(en)m(vironmen)m(t)h +Fn($)p Fs(')0 5322 y(represen)m(ts)f(itself.)p eop +%%Page: 151 153 +151 152 bop 0 -116 a Fs(App)s(endix)28 b(D:)j(All)e(en)m(vironmen)m(t)h (v)-5 b(ariables)29 b(whic)m(h)g(a\013ect)j(CVS)1483 -b(149)0 230 y Fp(App)t(endix)30 b(D)80 b(All)32 b(en)l(vironmen)l(t)c +b(151)0 230 y Fp(App)t(endix)30 b(D)80 b(All)32 b(en)l(vironmen)l(t)c (v)-9 b(ariables)32 b(whic)l(h)d(a\013ect)0 366 y(CVS)125 -735 y Fs(This)f(is)i(a)g(complete)h(list)e(of)i(all)e(en)m(vironmen)m +758 y Fs(This)f(is)i(a)g(complete)h(list)e(of)i(all)e(en)m(vironmen)m (t)h(v)-5 b(ariables)29 b(that)i(a\013ect)h Fr(cvs)p -Fs(.)0 1056 y Fn($CVSIGNORE)480 1180 y Fs(A)41 b(whitespace-separated)h +Fs(.)0 1092 y Fn($CVSIGNORE)480 1217 y Fs(A)41 b(whitespace-separated)h (list)d(of)j(\014le)e(name)h(patterns)g(that)h Fr(cvs)e -Fs(should)f(ignore.)72 b(See)41 b(Sec-)480 1305 y(tion)30 -b(C.9)h([cvsignore],)g(page)g(146.)0 1476 y Fn($CVSWRAPPERS)480 -1601 y Fs(A)k(whitespace-separated)h(list)e(of)i(\014le)e(name)i +Fs(should)f(ignore.)72 b(See)41 b(Sec-)480 1341 y(tion)30 +b(C.9)h([cvsignore],)g(page)g(148.)0 1523 y Fn($CVSWRAPPERS)480 +1647 y Fs(A)k(whitespace-separated)h(list)e(of)i(\014le)e(name)i (patterns)f(that)h Fr(cvs)e Fs(should)g(treat)i(as)g(wrapp)s(ers.)480 -1725 y(See)31 b(Section)f(C.2)g([W)-8 b(rapp)s(ers],)31 -b(page)g(137.)0 1897 y Fn($CVSREAD)96 b Fs(If)39 b(this)e(is)h(set,)k +1772 y(See)31 b(Section)f(C.2)g([W)-8 b(rapp)s(ers],)31 +b(page)g(139.)0 1953 y Fn($CVSREAD)96 b Fs(If)39 b(this)e(is)h(set,)k Fn(checkout)37 b Fs(and)i Fn(update)e Fs(will)f(try)j(hard)f(to)i(mak)m -(e)g(the)f(\014les)f(in)g(y)m(our)h(w)m(orking)480 2022 +(e)g(the)f(\014les)f(in)g(y)m(our)h(w)m(orking)480 2078 y(directory)23 b(read-only)-8 b(.)38 b(When)24 b(this)e(is)h(not)g (set,)j(the)e(default)e(b)s(eha)m(vior)h(is)f(to)j(p)s(ermit)d(mo)s -(di\014cation)480 2146 y(of)31 b(y)m(our)f(w)m(orking)g(\014les.)0 -2318 y Fn($CVSROOT)96 b Fs(Should)42 b(con)m(tain)i(the)g(full)d +(di\014cation)480 2202 y(of)31 b(y)m(our)f(w)m(orking)g(\014les.)0 +2384 y Fn($CVSROOT)96 b Fs(Should)42 b(con)m(tain)i(the)g(full)d (pathname)j(to)h(the)f(ro)s(ot)g(of)g(the)g Fr(cvs)f -Fs(source)h(rep)s(ository)f(\(where)480 2442 y(the)38 +Fs(source)h(rep)s(ository)f(\(where)480 2508 y(the)38 b Fr(r)n(cs)g Fs(history)f(\014les)g(are)h(k)m(ept\).)66 b(This)36 b(information)g(m)m(ust)i(b)s(e)g(a)m(v)-5 -b(ailable)38 b(to)g Fr(cvs)g Fs(for)g(most)480 2567 y(commands)k(to)g +b(ailable)38 b(to)g Fr(cvs)g Fs(for)g(most)480 2633 y(commands)k(to)g (execute;)50 b(if)41 b Fn($CVSROOT)e Fs(is)i(not)i(set,)i(or)d(if)f(y)m (ou)h(wish)f(to)h(o)m(v)m(erride)g(it)g(for)g(one)480 -2691 y(in)m(v)m(o)s(cation,)29 b(y)m(ou)g(can)g(supply)d(it)j(on)f(the) +2757 y(in)m(v)m(o)s(cation,)29 b(y)m(ou)g(can)g(supply)d(it)j(on)f(the) h(command)g(line:)38 b(`)p Fn(cvs)30 b(-d)f(cvsroot)g(cvs_command)p -Fh(:)15 b(:)g(:)n Fs(')480 2816 y(Once)26 b(y)m(ou)g(ha)m(v)m(e)h(c)m +Fh(:)15 b(:)g(:)n Fs(')480 2882 y(Once)26 b(y)m(ou)g(ha)m(v)m(e)h(c)m (hec)m(k)m(ed)h(out)e(a)g(w)m(orking)f(directory)-8 b(,)27 b Fr(cvs)e Fs(stores)i(the)f(appropriate)f(ro)s(ot)h(\(in)f(the)480 -2940 y(\014le)h(`)p Fn(CVS/Root)p Fs('\),)h(so)g(normally)e(y)m(ou)j +3006 y(\014le)h(`)p Fn(CVS/Root)p Fs('\),)h(so)g(normally)e(y)m(ou)j (only)e(need)h(to)h(w)m(orry)f(ab)s(out)f(this)g(when)h(initially)c(c)m -(hec)m(king)480 3065 y(out)31 b(a)f(w)m(orking)g(directory)-8 -b(.)0 3237 y Fn($EDITOR)0 3361 y($CVSEDITOR)480 3486 +(hec)m(king)480 3131 y(out)31 b(a)f(w)m(orking)g(directory)-8 +b(.)0 3312 y Fn($EDITOR)0 3437 y($CVSEDITOR)480 3561 y Fs(Sp)s(eci\014es)28 b(the)j(program)f(to)g(use)g(for)g(recording)f (log)h(messages)h(during)d(commit.)41 b(If)29 b(not)i(set,)g(the)480 -3610 y(default)h(is)g(`)p Fn(/usr/ucb/vi)p Fs('.)46 b -Fn($CVSEDITOR)30 b Fs(o)m(v)m(errides)j Fn($EDITOR)p -Fs(.)46 b Fn($CVSEDITOR)30 b Fs(do)s(es)j(not)g(exist)480 -3735 y(in)c Fr(cvs)g Fs(1.3,)j(but)e(the)g(next)h(release)g(will)c -(probably)i(include)f(it.)0 3906 y Fn($PATH)240 b Fs(If)27 -b Fn($RCSBIN)f Fs(is)h(not)h(set,)h(and)e(no)h(path)f(is)g(compiled)f -(in)m(to)i Fr(cvs)p Fs(,)g(it)f(will)e(use)j Fn($PATH)e -Fs(to)i(try)g(to)g(\014nd)480 4031 y(all)h(programs)h(it)g(uses.)0 -4202 y Fn($RCSBIN)144 b Fs(This)30 b(is)i(the)g(v)-5 -b(alue)32 b Fr(cvs)f Fs(is)g(using)g(for)h(where)g(to)h(\014nd)e -Fr(r)n(cs)g Fs(binaries.)44 b(See)32 b(Section)g(A.3)h([Global)480 -4327 y(options],)40 b(page)f(89,)i(for)d(a)h(description)d(of)i(ho)m(w) -h(to)g(sp)s(ecify)d(this.)64 b(If)37 b(not)i(set,)i(a)d(compiled-in)480 -4452 y(v)-5 b(alue)30 b(is)f(used,)h(or)g(y)m(our)h Fn($PATH)e -Fs(is)g(searc)m(hed.)0 4623 y Fn($HOME)0 4795 y($HOMEPATH)480 -4919 y Fs(Used)g(to)h(lo)s(cate)f(the)h(directory)e(where)h(the)g(`)p +3686 y(default)f(is)f(`)p Fn(/usr/ucb/vi)p Fs('.)38 b +Fn($CVSEDITOR)28 b Fs(o)m(v)m(errides)i Fn($EDITOR)p +Fs(.)0 3867 y Fn($PATH)240 b Fs(If)27 b Fn($RCSBIN)f +Fs(is)h(not)h(set,)h(and)e(no)h(path)f(is)g(compiled)f(in)m(to)i +Fr(cvs)p Fs(,)g(it)f(will)e(use)j Fn($PATH)e Fs(to)i(try)g(to)g(\014nd) +480 3992 y(all)h(programs)h(it)g(uses.)0 4173 y Fn($RCSBIN)144 +b Fs(This)30 b(is)i(the)g(v)-5 b(alue)32 b Fr(cvs)f Fs(is)g(using)g +(for)h(where)g(to)h(\014nd)e Fr(r)n(cs)g Fs(binaries.)44 +b(See)32 b(Section)g(A.3)h([Global)480 4298 y(options],)40 +b(page)f(91,)i(for)d(a)h(description)d(of)i(ho)m(w)h(to)g(sp)s(ecify)d +(this.)64 b(If)37 b(not)i(set,)i(a)d(compiled-in)480 +4422 y(v)-5 b(alue)30 b(is)f(used,)h(or)g(y)m(our)h Fn($PATH)e +Fs(is)g(searc)m(hed.)0 4604 y Fn($HOME)0 4785 y($HOMEPATH)480 +4910 y Fs(Used)g(to)h(lo)s(cate)f(the)h(directory)e(where)h(the)g(`)p Fn(.cvsrc)p Fs(')e(\014le)i(is)f(searc)m(hed)h(\()p Fn($HOMEPATH)e -Fs(is)h(used)g(for)480 5044 y(Windo)m(ws-NT\).)i(see)h(Section)f(A.2)i -([)p Fn(~)p Fs(/.cvsrc],)f(page)g(87)0 5215 y Fn($CVS_RSH)96 +Fs(is)h(used)g(for)480 5034 y(Windo)m(ws-NT\).)i(see)h(Section)f(A.2)i +([)p Fn(~)p Fs(/.cvsrc],)f(page)g(89)0 5215 y Fn($CVS_RSH)96 b Fs(Sp)s(eci\014es)31 b(the)i(external)g(program)g(whic)m(h)f(CVS)g (connects)i(with,)f(when)f Fn(:ext:)f Fs(access)j(metho)s(d)480 -5340 y(is)29 b(sp)s(eci\014ed.)39 b(see)31 b(Section)g(4.6.1)h -([Connecting)e(via)g(rsh],)g(page)h(21.)p eop -%%Page: 150 152 -150 151 bop 0 -116 a Fs(150)2366 b(CVS|Concurren)m(t)29 +5340 y(is)29 b(sp)s(eci\014ed.)39 b(see)31 b(Section)g(4.6.2)h +([Connecting)e(via)g(rsh],)g(page)h(22.)p eop +%%Page: 152 154 +152 153 bop 0 -116 a Fs(152)2366 b(CVS|Concurren)m(t)29 b(V)-8 b(ersions)30 b(System)0 366 y Fn($CVS_SERVER)480 491 y Fs(Used)i(in)f(clien)m(t-serv)m(er)h(mo)s(de)f(when)g(accessing)i (a)f(remote)h(rep)s(ository)e(using)g Fr(rsh)p Fs(.)44 @@ -9432,16 +9503,16 @@ b(It)32 b(sp)s(eci\014es)480 616 y(the)26 b(name)g(of)g(the)g(program)g (to)g(start)h(on)f(the)g(serv)m(er)g(side)f(when)g(accessing)h(a)g (remote)h(rep)s(ository)480 740 y(using)i Fr(rsh)p Fs(.)40 b(The)30 b(default)f(v)-5 b(alue)30 b(is)f Fn(cvs)p Fs(.)40 -b(see)31 b(Section)f(4.6.1)j([Connecting)d(via)g(rsh],)f(page)i(21)0 +b(see)31 b(Section)f(4.6.2)j([Connecting)d(via)g(rsh],)f(page)i(22)0 933 y Fn($CVS_PASSFILE)480 1057 y Fs(Used)42 b(in)e(clien)m(t-serv)m (er)i(mo)s(de)f(when)g(accessing)h(the)g Fn(cvs)30 b(login)f(server)p Fs(.)73 b(Default)42 b(v)-5 b(alue)41 b(is)480 1182 y(`)p -Fn($HOME/.cvspass)p Fs('.)c(see)31 b(Section)f(4.6.2.2)j([P)m(assw)m +Fn($HOME/.cvspass)p Fs('.)c(see)31 b(Section)f(4.6.3.2)j([P)m(assw)m (ord)e(authen)m(tication)g(clien)m(t],)f(page)h(25)0 1375 y Fn($CVS_CLIENT_PORT)480 1499 y Fs(Used)k(in)e(clien)m(t-serv)m (er)j(mo)s(de)e(when)g(accessing)i(the)f(serv)m(er)g(via)f(Kerb)s -(eros.)54 b(see)35 b(Section)g(4.6.3)480 1624 y([Kerb)s(eros)30 -b(authen)m(ticated],)h(page)g(26)0 1817 y Fn($CVS_RCMD_PORT)480 +(eros.)54 b(see)35 b(Section)g(4.6.4)480 1624 y([Kerb)s(eros)30 +b(authen)m(ticated],)h(page)g(27)0 1817 y Fn($CVS_RCMD_PORT)480 1941 y Fs(Used)c(in)g(clien)m(t-serv)m(er)g(mo)s(de.)40 b(If)27 b(set,)i(sp)s(eci\014es)d(the)i(p)s(ort)f(n)m(um)m(b)s(er)f(to) i(b)s(e)f(used)g(when)f(accessing)480 2066 y(the)31 b @@ -9473,7 +9544,7 @@ b(v)-5 b(alue)25 b(found)f(is)g(tak)m(en;)k(if)c(none)h(of)g(them)g (are)h(set,)g(a)g(host-dep)s(enden)m(t)e(default)h(is)f(used,)h(t)m (yp-)480 4649 y(ically)31 b(`)p Fn(/tmp)p Fs('.)45 b(The)32 b Fr(cvs)f Fs(serv)m(er)h(uses)g Fn(TMPDIR)p Fs(.)45 -b(See)32 b(Section)g(A.3)h([Global)e(options],)i(page)g(89,)480 +b(See)32 b(Section)g(A.3)h([Global)e(options],)i(page)g(91,)480 4774 y(for)e(a)h(description)d(of)i(ho)m(w)h(to)g(sp)s(ecify)e(this.)42 b(Some)31 b(parts)g(of)h Fr(cvs)e Fs(will)f(alw)m(a)m(ys)i(use)g(`)p Fn(/tmp)p Fs(')g(\(via)480 4898 y(the)g Fn(tmpnam)d Fs(function)h(pro)m @@ -9484,10 +9555,10 @@ Fs(program)i(whic)m(h)e(is)h(used)g(b)m(y)g(the)h Fr(cvs)f Fs(clien)m(t)g(uses)g Fn(TMPDIR)p Fs(,)g(and)g(if)f(it)i(is)e(not)i (set,)480 5340 y(uses)c(`)p Fn(/tmp)p Fs(')g(\(at)h(least)g(with)e(GNU) i(patc)m(h)g(2.1\).)p eop -%%Page: 151 153 -151 152 bop 0 -116 a Fs(App)s(endix)28 b(D:)j(All)e(en)m(vironmen)m(t)h +%%Page: 153 155 +153 154 bop 0 -116 a Fs(App)s(endix)28 b(D:)j(All)e(en)m(vironmen)m(t)h (v)-5 b(ariables)29 b(whic)m(h)g(a\013ect)j(CVS)1483 -b(151)125 366 y Fr(cvs)27 b Fs(in)m(v)m(ok)m(es)i Fr(r)n(cs)e +b(153)125 366 y Fr(cvs)27 b Fs(in)m(v)m(ok)m(es)i Fr(r)n(cs)e Fs(to)h(p)s(erform)f(certain)h(op)s(erations.)39 b(The)28 b(follo)m(wing)f(en)m(vironmen)m(t)g(v)-5 b(ariables)27 b(a\013ect)j Fr(r)n(cs)p Fs(.)0 491 y(Note)35 b(that)f(if)e(y)m(ou)i @@ -9508,12 +9579,12 @@ b(A)41 b(bac)m(kslash)g(escap)s(es)480 1612 y(spaces)28 b(within)d(an)j(option.)39 b(The)27 b Fn($RCSINIT)f Fs(options)h(are)h (prep)s(ended)d(to)k(the)e(argumen)m(t)i(lists)d(of)480 1736 y(most)31 b Fr(r)n(cs)e Fs(commands.)p eop -%%Page: 152 154 -152 153 bop 0 -116 a Fs(152)2366 b(CVS|Concurren)m(t)29 +%%Page: 154 156 +154 155 bop 0 -116 a Fs(154)2366 b(CVS|Concurren)m(t)29 b(V)-8 b(ersions)30 b(System)p eop -%%Page: 153 155 -153 154 bop 0 -116 a Fs(App)s(endix)28 b(E:)i(T)-8 b(roublesho)s(oting) -2586 b(153)0 366 y Fp(App)t(endix)30 b(E)81 b(T)-13 b(roublesho)t +%%Page: 155 157 +155 156 bop 0 -116 a Fs(App)s(endix)28 b(E:)i(T)-8 b(roublesho)s(oting) +2586 b(155)0 366 y Fp(App)t(endix)30 b(E)81 b(T)-13 b(roublesho)t (oting)0 914 y Fm(E.1)68 b(Magic)31 b(branc)l(h)f(n)l(um)l(b)t(ers)125 1188 y Fs(Externally)-8 b(,)37 b(branc)m(h)g(n)m(um)m(b)s(ers)e (consist)i(of)g(an)g(o)s(dd)e(n)m(um)m(b)s(er)h(of)h(dot-separated)h @@ -9545,12 +9616,12 @@ b(v)m(ery)g(careful)f(so)g(that)0 3584 y(y)m(ou)30 b(do)g(not)g(assign) f(the)g(tag)i(to)g(the)f(wrong)f(n)m(um)m(b)s(er.)39 b(\(There)30 b(is)e(no)i(w)m(a)m(y)h(to)f(see)g(ho)m(w)g(the)g(tag)h(w) m(as)f(assigned)0 3708 y(y)m(esterda)m(y\).)p eop -%%Page: 154 156 -154 155 bop 0 -116 a Fs(154)2366 b(CVS|Concurren)m(t)29 +%%Page: 156 158 +156 157 bop 0 -116 a Fs(156)2366 b(CVS|Concurren)m(t)29 b(V)-8 b(ersions)30 b(System)p eop -%%Page: 155 157 -155 156 bop 0 -116 a Fs(App)s(endix)28 b(F:)j(GNU)g(GENERAL)f(PUBLIC)g -(LICENSE)1730 b(155)0 366 y Fp(App)t(endix)30 b(F)81 +%%Page: 157 159 +157 158 bop 0 -116 a Fs(App)s(endix)28 b(F:)j(GNU)g(GENERAL)f(PUBLIC)g +(LICENSE)1730 b(157)0 366 y Fp(App)t(endix)30 b(F)81 b(GNU)31 b(GENERAL)f(PUBLIC)g(LICENSE)1537 615 y Fs(V)-8 b(ersion)30 b(2,)h(June)f(1991)240 874 y(Cop)m(yrigh)m(t)692 871 y(c)667 874 y Fq(\015)g Fs(1989,)j(1991)f(F)-8 b(ree)31 @@ -9610,8 +9681,8 @@ m(one)i(understands)0 5340 y(that)37 b(there)f(is)f(no)h(w)m(arran)m(t) m(y)h(for)f(this)f(free)i(soft)m(w)m(are.)59 b(If)36 b(the)g(soft)m(w)m(are)i(is)d(mo)s(di\014ed)f(b)m(y)i(someone)h(else)f (and)p eop -%%Page: 156 158 -156 157 bop 0 -116 a Fs(156)2366 b(CVS|Concurren)m(t)29 +%%Page: 158 160 +158 159 bop 0 -116 a Fs(158)2366 b(CVS|Concurren)m(t)29 b(V)-8 b(ersions)30 b(System)0 366 y(passed)39 b(on,)j(w)m(e)e(w)m(an)m (t)g(its)f(recipien)m(ts)g(to)h(kno)m(w)f(that)i(what)e(they)h(ha)m(v)m (e)g(is)f(not)h(the)f(original,)i(so)e(that)i(an)m(y)0 @@ -9681,9 +9752,9 @@ y(a.)61 b(Y)-8 b(ou)26 b(m)m(ust)g(cause)h(the)f(mo)s(di\014ed)e (\014les)h(to)h(carry)g(prominen)m(t)f(notices)h(stating)g(that)h(y)m (ou)f(c)m(hanged)h(the)360 5340 y(\014les)i(and)h(the)h(date)g(of)f(an) m(y)h(c)m(hange.)p eop -%%Page: 157 159 -157 158 bop 0 -116 a Fs(App)s(endix)28 b(F:)j(GNU)g(GENERAL)f(PUBLIC)g -(LICENSE)1730 b(157)224 366 y(b.)60 b(Y)-8 b(ou)28 b(m)m(ust)f(cause)h +%%Page: 159 161 +159 160 bop 0 -116 a Fs(App)s(endix)28 b(F:)j(GNU)g(GENERAL)f(PUBLIC)g +(LICENSE)1730 b(159)224 366 y(b.)60 b(Y)-8 b(ou)28 b(m)m(ust)f(cause)h (an)m(y)f(w)m(ork)h(that)f(y)m(ou)h(distribute)d(or)i(publish,)d(that)k (in)e(whole)h(or)g(in)f(part)h(con)m(tains)360 491 y(or)h(is)e(deriv)m (ed)h(from)g(the)g(Program)h(or)g(an)m(y)f(part)h(thereof,)h(to)f(b)s @@ -9760,8 +9831,8 @@ y(y)m(ou)g(receiv)m(ed)g(the)f(program)h(in)e(ob)5 b(ject)31 b(co)s(de)g(or)g(executable)g(form)f(with)f(suc)m(h)h(an)h(o\013er,)g (in)e(accord)360 5340 y(with)g(Subsection)g(b)h(ab)s(o)m(v)m(e.\))p eop -%%Page: 158 160 -158 159 bop 0 -116 a Fs(158)2366 b(CVS|Concurren)m(t)29 +%%Page: 160 162 +160 161 bop 0 -116 a Fs(160)2366 b(CVS|Concurren)m(t)29 b(V)-8 b(ersions)30 b(System)180 366 y(The)f(source)h(co)s(de)g(for)f (a)h(w)m(ork)g(means)g(the)g(preferred)e(form)h(of)h(the)g(w)m(ork)g (for)f(making)g(mo)s(di\014cations)f(to)180 491 y(it.)57 @@ -9848,9 +9919,9 @@ g(only)f(w)m(a)m(y)i(y)m(ou)f(could)f(satisfy)h(b)s(oth)f(it)h(and)f (section)g(is)f(in)m(tended)f(to)j(apply)d(and)i(the)g(section)g(as)g (a)g(whole)f(is)g(in)m(tended)g(to)h(apply)180 5340 y(in)g(other)i (circumstances.)p eop -%%Page: 159 161 -159 160 bop 0 -116 a Fs(App)s(endix)28 b(F:)j(GNU)g(GENERAL)f(PUBLIC)g -(LICENSE)1730 b(159)180 366 y(It)36 b(is)e(not)i(the)g(purp)s(ose)e(of) +%%Page: 161 163 +161 162 bop 0 -116 a Fs(App)s(endix)28 b(F:)j(GNU)g(GENERAL)f(PUBLIC)g +(LICENSE)1730 b(161)180 366 y(It)36 b(is)e(not)i(the)g(purp)s(ose)e(of) i(this)e(section)i(to)h(induce)d(y)m(ou)i(to)g(infringe)e(an)m(y)i (paten)m(ts)g(or)g(other)g(prop)s(ert)m(y)180 491 y(righ)m(t)41 b(claims)g(or)h(to)g(con)m(test)h(v)-5 b(alidit)m(y)41 @@ -9929,8 +10000,8 @@ b(PURPOSE.)f(THE)h(ENTIRE)f(RISK)g(AS)h(TO)f(THE)h(QUALITY)g(AND)h (PERF)m(OR-)180 5340 y(MANCE)i(OF)f(THE)g(PR)m(OGRAM)h(IS)e(WITH)i (YOU.)f(SHOULD)h(THE)f(PR)m(OGRAM)h(PR)m(O)m(VE)f(DE-)p eop -%%Page: 160 162 -160 161 bop 0 -116 a Fs(160)2366 b(CVS|Concurren)m(t)29 +%%Page: 162 164 +162 163 bop 0 -116 a Fs(162)2366 b(CVS|Concurren)m(t)29 b(V)-8 b(ersions)30 b(System)180 366 y(FECTIVE,)35 b(YOU)g(ASSUME)g (THE)g(COST)f(OF)i(ALL)f(NECESSAR)-8 b(Y)34 b(SER)-10 b(VICING,)35 b(REP)-8 b(AIR)35 b(OR)180 491 y(CORRECTION.)4 @@ -9952,9 +10023,9 @@ b(OF)g(THE)f(PR)m(OGRAM)i(TO)e(OPERA)-8 b(TE)28 b(WITH)h(ANY)g(OTHER)f (P)-8 b(AR)g(TY)38 b(HAS)g(BEEN)g(AD)m(VISED)g(OF)g(THE)f(POSSI-)180 1761 y(BILITY)30 b(OF)g(SUCH)g(D)m(AMA)m(GES.)0 2210 y Fm(END)h(OF)f(TERMS)f(AND)i(CONDITIONS)p eop -%%Page: 161 163 -161 162 bop 0 -116 a Fs(App)s(endix)28 b(F:)j(GNU)g(GENERAL)f(PUBLIC)g -(LICENSE)1730 b(161)0 366 y Fm(Ho)l(w)31 b(to)g(Apply)f(These)g(T)-11 +%%Page: 163 165 +163 164 bop 0 -116 a Fs(App)s(endix)28 b(F:)j(GNU)g(GENERAL)f(PUBLIC)g +(LICENSE)1730 b(163)0 366 y Fm(Ho)l(w)31 b(to)g(Apply)f(These)g(T)-11 b(erms)30 b(to)h(Y)-11 b(our)29 b(New)i(Programs)125 677 y Fs(If)e(y)m(ou)i(dev)m(elop)f(a)h(new)e(program,)i(and)e(y)m(ou)i (w)m(an)m(t)g(it)f(to)h(b)s(e)e(of)i(the)f(greatest)i(p)s(ossible)c @@ -10007,8 +10078,8 @@ h(than)f(`)p Fn(show)0 5340 y(w)p Fs(')30 b(and)g(`)p Fn(show)g(c)p Fs(';)g(they)h(could)e(ev)m(en)i(b)s(e)f(mouse-clic)m(ks) g(or)g(men)m(u)g(items|whatev)m(er)h(suits)e(y)m(our)h(program.)p eop -%%Page: 162 164 -162 163 bop 0 -116 a Fs(162)2366 b(CVS|Concurren)m(t)29 +%%Page: 164 166 +164 165 bop 0 -116 a Fs(164)2366 b(CVS|Concurren)m(t)29 b(V)-8 b(ersions)30 b(System)125 366 y(Y)-8 b(ou)28 b(should)f(also)h (get)h(y)m(our)f(emplo)m(y)m(er)h(\(if)e(y)m(ou)i(w)m(ork)f(as)h(a)g (programmer\))f(or)g(y)m(our)g(sc)m(ho)s(ol,)h(if)e(an)m(y)-8 @@ -10029,18 +10100,18 @@ y Fs(This)28 b(General)j(Public)d(License)i(do)s(es)h(not)g(p)s(ermit)d (w)m(an)m(t)h(to)g(do,)h(use)d(the)h(GNU)h(Library)0 1807 y(General)30 b(Public)e(License)i(instead)g(of)g(this)g(License.)p eop -%%Page: 163 165 -163 164 bop 0 -116 a Fs(Index)3541 b(163)0 366 y Fp(Index)0 +%%Page: 165 167 +165 166 bop 0 -116 a Fs(Index)3541 b(165)0 366 y Fp(Index)0 846 y Fm(-)0 979 y Ff(-j)26 b(\(merging)f(branc)n(hes\))16 b Fe(.)d(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.) g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)43 -b Ff(51)0 1095 y(-k)25 b(\(R)n(CS)g(k\015ags\))15 b Fe(.)e(.)g(.)g(.)g +b Ff(53)0 1095 y(-k)25 b(\(R)n(CS)g(k\015ags\))15 b Fe(.)e(.)g(.)g(.)g (.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.) f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)42 -b Ff(77)0 1320 y Fm(.)0 1453 y Ff(.#)26 b(\014les)17 +b Ff(79)0 1320 y Fm(.)0 1453 y Ff(.#)26 b(\014les)17 b Fe(.)c(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.) g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g -(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)44 b Ff(122)0 1569 +(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)44 b Ff(124)0 1569 y(.bashrc,)26 b(setting)h(CVSR)n(OOT)d(in)7 b Fe(.)14 b(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g (.)g(.)g(.)g(.)34 b Ff(15)0 1686 y(.cshrc,)27 b(setting)f(CVSR)n(OOT)e @@ -10048,7 +10119,7 @@ b(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g (.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)40 b Ff(15)0 1802 y(.cvsrc)26 b(\014le)15 b Fe(.)f(.)f(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.) g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f -(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)42 b Ff(87)0 +(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)42 b Ff(89)0 1918 y(.pro\014le,)27 b(setting)f(CVSR)n(OOT)e(in)12 b Fe(.)h(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.) g(.)g(.)h(.)f(.)g(.)38 b Ff(15)0 2034 y(.tcshrc,)26 b(setting)h(CVSR)n @@ -10059,10 +10130,10 @@ y Fm(/)0 2392 y Ff(/usr/lo)r(cal/cvsro)r(ot,)30 b(as)c(example)f(rep)r b Ff(15)0 2618 y Fm(:)0 2750 y Ff(:ext:)14 b Fe(.)f(.)g(.)g(.)g(.)g(.)h (.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.) g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g -(.)g(.)g(.)h(.)f(.)g(.)40 b Ff(22)0 2867 y(:kserv)n(er:)15 +(.)g(.)g(.)h(.)f(.)g(.)40 b Ff(23)0 2867 y(:kserv)n(er:)15 b Fe(.)f(.)f(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.) g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g -(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)42 b Ff(26)0 2983 +(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)42 b Ff(27)0 2983 y(:lo)r(cal:)25 b Fe(.)13 b(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g (.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.) g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)49 @@ -10072,57 +10143,57 @@ g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)41 b Ff(25)0 3215 y(:serv)n(er:)19 b Fe(.)13 b(.)h(.)f(.)g(.)g(.)g(.)g(.)g (.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.) f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g -(.)45 b Ff(22)0 3441 y Fm(=)0 3573 y Ff(=======)15 b +(.)45 b Ff(23)0 3441 y Fm(=)0 3573 y Ff(=======)15 b Fe(.)c(.)i(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g (.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.) -g(.)h(.)f(.)g(.)41 b Ff(37)p 8 3799 41 6 v 5 3932 24 +g(.)h(.)f(.)g(.)41 b Ff(39)p 8 3799 41 6 v 5 3932 24 4 v 32 3932 V 81 3932 a(\014les)26 b(\(VMS\))6 b Fe(.)12 b(.)i(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f (.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.) -g(.)33 b Ff(122)0 4157 y Fg(>)0 4290 y Fd(>>>>>>>)18 +g(.)33 b Ff(124)0 4157 y Fg(>)0 4290 y Fd(>>>>>>>)18 b Fe(.)d(.)e(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.) g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g -(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)45 b Ff(37)0 4515 +(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)45 b Ff(39)0 4515 y Fg(<)0 4648 y Fd(<<<<<<<)18 b Fe(.)d(.)e(.)g(.)g(.)g(.)h(.)f(.)g(.)g (.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.) g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)45 -b Ff(37)0 4873 y Fm(A)0 5006 y Ff(A)25 b(sample)h(session)8 +b Ff(39)0 4873 y Fm(A)0 5006 y Ff(A)25 b(sample)h(session)8 b Fe(.)15 b(.)e(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f (.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.) g(.)35 b Ff(11)0 5122 y(abandoning)26 b(w)n(ork)21 b Fe(.)13 b(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g (.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.) -48 b Ff(42)0 5238 y(Ab)r(out)25 b(this)h(man)n(ual)11 +48 b Ff(44)0 5238 y(Ab)r(out)25 b(this)h(man)n(ual)11 b Fe(.)h(.)i(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.) g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)38 b Ff(1)0 5355 y(add)25 b(\(sub)r(command\))18 b Fe(.)11 b(.)i(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g (.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)44 -b Ff(57)2031 846 y(Adding)25 b(a)h(tag)21 b Fe(.)13 b(.)g(.)g(.)g(.)g +b Ff(59)2031 846 y(Adding)25 b(a)h(tag)21 b Fe(.)13 b(.)g(.)g(.)g(.)g (.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.) h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)47 -b Ff(46)2031 962 y(Adding)25 b(\014les)7 b Fe(.)13 b(.)h(.)f(.)g(.)g(.) +b Ff(48)2031 962 y(Adding)25 b(\014les)7 b Fe(.)13 b(.)h(.)f(.)g(.)g(.) g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g (.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)34 -b Ff(57)2031 1078 y(Admin)24 b(\(sub)r(command\))17 b +b Ff(59)2031 1078 y(Admin)24 b(\(sub)r(command\))17 b Fe(.)10 b(.)j(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g (.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)43 -b Ff(93)2031 1195 y(Administrativ)n(e)25 b(\014les)h(\(in)n(tro\))12 +b Ff(95)2031 1195 y(Administrativ)n(e)25 b(\014les)h(\(in)n(tro\))12 b Fe(.)h(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.) h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)38 b Ff(19)2031 1311 y(Administrativ)n(e)25 b(\014les)h(\(reference\))10 b Fe(.)j(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g -(.)g(.)g(.)37 b Ff(135)2031 1427 y(Administrativ)n(e)25 +(.)g(.)g(.)37 b Ff(137)2031 1427 y(Administrativ)n(e)25 b(\014les,)h(editing)g(them)17 b Fe(.)12 b(.)h(.)g(.)g(.)h(.)f(.)g(.)g -(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)44 b Ff(19)2031 +(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)44 b Ff(20)2031 1543 y(ALL)25 b(in)h(commitinfo)18 b Fe(.)12 b(.)h(.)h(.)f(.)g(.)g(.)g (.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.) -h(.)f(.)g(.)g(.)g(.)g(.)45 b Ff(139)2031 1660 y(annotate)26 +h(.)f(.)g(.)g(.)g(.)g(.)45 b Ff(142)2031 1660 y(annotate)26 b(\(sub)r(command\))18 b Fe(.)11 b(.)i(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f (.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)44 -b Ff(74)2031 1776 y(A)n(tomic)25 b(transactions,)i(lac)n(k)f(of)9 +b Ff(76)2031 1776 y(A)n(tomic)25 b(transactions,)i(lac)n(k)f(of)9 b Fe(.)14 b(.)f(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f -(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)35 b Ff(39)2031 1892 y(authen)n(ticated) +(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)35 b Ff(41)2031 1892 y(authen)n(ticated) 25 b(clien)n(t,)i(using)19 b Fe(.)13 b(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g (.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)45 b Ff(25)2031 2008 y(authen)n(ticating)26 b(serv)n(er,)g(setting)g(up)19 @@ -10130,47 +10201,47 @@ b Fe(.)13 b(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g (.)g(.)g(.)46 b Ff(23)2031 2124 y(Author)25 b(k)n(eyw)n(ord)19 b Fe(.)13 b(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g (.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.) -h(.)46 b Ff(75)2031 2241 y(Automatically)25 b(ignored)i(\014les)8 +h(.)46 b Ff(77)2031 2241 y(Automatically)25 b(ignored)i(\014les)8 b Fe(.)13 b(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g -(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)35 b Ff(146)2031 2357 +(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)35 b Ff(148)2031 2357 y(Av)n(oiding)25 b(editor)h(in)n(v)n(o)r(cation)16 b Fe(.)e(.)f(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g -(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)42 b Ff(92)2031 2619 y +(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)42 b Ff(94)2031 2619 y Fm(B)2031 2752 y Ff(bill)26 b(of)h(materials)11 b Fe(.)j(.)f(.)g(.)g(.) g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h (.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)38 -b Ff(81)2031 2868 y(Binary)26 b(\014les)16 b Fe(.)e(.)f(.)g(.)g(.)g(.)g +b Ff(83)2031 2868 y(Binary)26 b(\014les)16 b Fe(.)e(.)f(.)g(.)g(.)g(.)g (.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.) h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)43 -b Ff(79)2031 2984 y(Branc)n(h)26 b(merge)f(example)11 +b Ff(81)2031 2984 y(Branc)n(h)26 b(merge)f(example)11 b Fe(.)h(.)h(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.) g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)37 b -Ff(51)2031 3100 y(Branc)n(h)26 b(n)n(um)n(b)r(er)17 b +Ff(53)2031 3100 y(Branc)n(h)26 b(n)n(um)n(b)r(er)17 b Fe(.)11 b(.)i(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g (.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.) g(.)h(.)f(.)44 b Ff(9)2031 3216 y(Branc)n(h)26 b(n)n(um)n(b)r(ers)17 b Fe(.)11 b(.)i(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g (.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.) -h(.)43 b Ff(49)2031 3333 y(Branc)n(h,)26 b(creating)h(a)16 +h(.)43 b Ff(51)2031 3333 y(Branc)n(h,)26 b(creating)h(a)16 b Fe(.)d(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.) g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)43 -b Ff(48)2031 3449 y(Branc)n(h,)26 b(v)n(endor-)c Fe(.)13 +b Ff(50)2031 3449 y(Branc)n(h,)26 b(v)n(endor-)c Fe(.)13 b(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g (.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)49 -b Ff(63)2031 3565 y(Branc)n(hes)21 b Fe(.)13 b(.)g(.)g(.)g(.)h(.)f(.)g +b Ff(65)2031 3565 y(Branc)n(hes)21 b Fe(.)13 b(.)g(.)g(.)g(.)h(.)f(.)g (.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.) g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)47 -b Ff(45)2031 3681 y(Branc)n(hes)26 b(motiv)l(ation)15 +b Ff(47)2031 3681 y(Branc)n(hes)26 b(motiv)l(ation)15 b Fe(.)e(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.) g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)41 -b Ff(47)2031 3798 y(Branc)n(hes,)27 b(cop)n(ying)e(c)n(hanges)h(b)r(et) +b Ff(49)2031 3798 y(Branc)n(hes,)27 b(cop)n(ying)e(c)n(hanges)h(b)r(et) n(w)n(een)c Fe(.)14 b(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g -(.)g(.)g(.)49 b Ff(51)2031 3914 y(Branc)n(hes,)27 b(stic)n(ky)18 +(.)g(.)g(.)49 b Ff(53)2031 3914 y(Branc)n(hes,)27 b(stic)n(ky)18 b Fe(.)13 b(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g (.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.) -h(.)45 b Ff(49)2031 4030 y(Bringing)27 b(a)f(\014le)g(up)e(to)i(date)20 +h(.)45 b Ff(51)2031 4030 y(Bringing)27 b(a)f(\014le)g(up)e(to)i(date)20 b Fe(.)13 b(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g -(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)46 b Ff(34)2031 +(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)46 b Ff(36)2031 4146 y(Bugs,)27 b(kno)n(wn)e(in)g(this)h(man)n(ual)12 b Fe(.)g(.)h(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.) g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)39 b Ff(3)2031 4263 y(Bugs,)27 @@ -10182,39 +10253,39 @@ h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g b Ff(3)2031 4495 y(builds)21 b Fe(.)13 b(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.) g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g (.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.) -h(.)47 b Ff(81)2031 4757 y Fm(C)2031 4890 y Ff(Changes,)27 +h(.)47 b Ff(83)2031 4757 y Fm(C)2031 4890 y Ff(Changes,)27 b(cop)n(ying)f(b)r(et)n(w)n(een)f(branc)n(hes)16 b Fe(.)d(.)h(.)f(.)g -(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)43 b Ff(51)2031 +(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)43 b Ff(53)2031 5006 y(Changing)27 b(a)f(log)g(message)10 b Fe(.)k(.)f(.)g(.)g(.)h(.)f (.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.) -g(.)g(.)g(.)g(.)37 b Ff(94)2031 5122 y(c)n(hec)n(k)n(ed)25 +g(.)g(.)g(.)g(.)37 b Ff(96)2031 5122 y(c)n(hec)n(k)n(ed)25 b(out)g(cop)n(y)-6 b(,)25 b(k)n(eeping)11 b Fe(.)j(.)f(.)g(.)g(.)g(.)g (.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.) -f(.)38 b Ff(145)2031 5238 y(Chec)n(kin)25 b(program)19 +f(.)38 b Ff(147)2031 5238 y(Chec)n(kin)25 b(program)19 b Fe(.)13 b(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g (.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)46 -b Ff(136)2031 5355 y(Chec)n(king)26 b(commits)17 b Fe(.)12 +b Ff(138)2031 5355 y(Chec)n(king)26 b(commits)17 b Fe(.)12 b(.)h(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g (.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)44 -b Ff(139)p eop -%%Page: 164 166 -164 165 bop 0 -116 a Fs(164)2366 b(CVS|Concurren)m(t)29 +b Ff(141)p eop +%%Page: 166 168 +166 167 bop 0 -116 a Fs(166)2366 b(CVS|Concurren)m(t)29 b(V)-8 b(ersions)30 b(System)0 366 y Ff(Chec)n(king)c(out)f(source)d Fe(.)13 b(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g (.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)47 b Ff(11)0 483 y(Chec)n(k)n(out)25 b(\(sub)r(command\))8 b Fe(.)j(.)i(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.) -g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)35 b Ff(97)0 +g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)35 b Ff(99)0 599 y(Chec)n(k)n(out)25 b(program)13 b Fe(.)h(.)f(.)g(.)g(.)g(.)g(.)g (.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.) -g(.)g(.)g(.)g(.)g(.)h(.)f(.)40 b Ff(136)0 715 y(c)n(hec)n(k)n(out,)25 +g(.)g(.)g(.)g(.)g(.)h(.)f(.)40 b Ff(138)0 715 y(c)n(hec)n(k)n(out,)25 b(as)h(term)f(for)i(getting)f(ready)f(to)h(edit)d Fe(.)13 -b(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)49 b Ff(42)0 831 y(Chec)n(k)n(out,)26 +b(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)49 b Ff(44)0 831 y(Chec)n(k)n(out,)26 b(example)8 b Fe(.)k(.)h(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.) g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g (.)g(.)35 b Ff(11)0 948 y(c)n(ho)r(osing,)27 b(reserv)n(ed)f(or)g (unreserv)n(ed)f(c)n(hec)n(k)n(outs)19 b Fe(.)13 b(.)g(.)g(.)g(.)g(.)h -(.)f(.)g(.)46 b Ff(44)0 1064 y(Cleaning)27 b(up)20 b +(.)f(.)g(.)46 b Ff(46)0 1064 y(Cleaning)27 b(up)20 b Fe(.)14 b(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h (.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.) g(.)g(.)g(.)g(.)g(.)48 b Ff(12)0 1180 y(Clien)n(t/Serv)n(er)26 @@ -10223,48 +10294,47 @@ b(Op)r(eration)21 b Fe(.)13 b(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f b Ff(21)0 1296 y(Co)26 b(\(sub)r(command\))16 b Fe(.)11 b(.)i(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g (.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)42 -b Ff(97)0 1413 y(Command)24 b(reference)7 b Fe(.)14 b(.)f(.)h(.)f(.)g +b Ff(99)0 1413 y(Command)24 b(reference)7 b Fe(.)14 b(.)f(.)h(.)f(.)g (.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.) -g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)34 b Ff(125)0 1529 y(Command)24 +g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)34 b Ff(127)0 1529 y(Command)24 b(structure)f Fe(.)13 b(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g (.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.) -49 b Ff(87)0 1645 y(Commen)n(t)24 b(leader)16 b Fe(.)e(.)f(.)g(.)g(.)g +49 b Ff(89)0 1645 y(Commen)n(t)24 b(leader)16 b Fe(.)e(.)f(.)g(.)g(.)g (.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.) g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)42 b -Ff(96)0 1761 y(Commit)25 b(\(sub)r(command\))11 b Fe(.)g(.)i(.)g(.)g(.) -g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h -(.)f(.)g(.)g(.)g(.)g(.)38 b Ff(99)0 1877 y(Commit)25 -b(\014les)8 b Fe(.)13 b(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g -(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.) -g(.)g(.)g(.)h(.)f(.)g(.)g(.)35 b Ff(138)0 1994 y(Commit,)25 -b(when)h(to)15 b Fe(.)e(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g +Ff(98)0 1761 y(Commit)25 b(\(sub)r(command\))9 b Fe(.)i(.)i(.)g(.)g(.)g (.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.) -h(.)f(.)g(.)41 b Ff(85)0 2110 y(Commitinfo)22 b Fe(.)13 -b(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g -(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.) -g(.)g(.)49 b Ff(139)0 2226 y(Committing)25 b(c)n(hanges)16 -b Fe(.)d(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.) -g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)42 -b Ff(11)0 2342 y(Common)25 b(options)e Fe(.)13 b(.)g(.)h(.)f(.)g(.)g(.) -g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g -(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)50 b Ff(90)0 2459 -y(Common)25 b(syn)n(tax)f(of)j(info)f(\014les)7 b Fe(.)14 -b(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g -(.)g(.)g(.)g(.)g(.)34 b Ff(139)0 2575 y(compatibilit)n(y)-6 -b(,)25 b(b)r(et)n(w)n(een)h(CVS)f(v)n(ersions)20 b Fe(.)13 -b(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)46 -b Ff(83)0 2691 y(COMSPEC)10 b Fe(.)15 b(.)e(.)g(.)g(.)g(.)g(.)h(.)f(.)g +h(.)f(.)g(.)g(.)36 b Ff(101)0 1877 y(Commit)25 b(\014les)8 +b Fe(.)13 b(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g +(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.) +h(.)f(.)g(.)g(.)35 b Ff(140)0 1994 y(Commit,)25 b(when)h(to)15 +b Fe(.)e(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.) +f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)41 +b Ff(87)0 2110 y(Commitinfo)22 b Fe(.)13 b(.)g(.)g(.)h(.)f(.)g(.)g(.)g +(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.) +g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)49 b +Ff(141)0 2226 y(Committing)25 b(c)n(hanges)16 b Fe(.)d(.)g(.)g(.)h(.)f +(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.) +g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)42 b Ff(11)0 2342 y(Common)25 +b(options)e Fe(.)13 b(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g (.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.) -g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)37 b -Ff(150)0 2807 y(Con\015ict)26 b(mark)n(ers)14 b Fe(.)f(.)g(.)g(.)g(.)g -(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.) -f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)41 b -Ff(37)0 2924 y(Con\015ict)26 b(resolution)17 b Fe(.)d(.)f(.)g(.)g(.)g +g(.)g(.)g(.)50 b Ff(92)0 2459 y(Common)25 b(syn)n(tax)f(of)j(info)f +(\014les)7 b Fe(.)14 b(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g +(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)34 b Ff(141)0 +2575 y(compatibilit)n(y)-6 b(,)25 b(b)r(et)n(w)n(een)h(CVS)f(v)n +(ersions)20 b Fe(.)13 b(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g +(.)g(.)46 b Ff(85)0 2691 y(COMSPEC)10 b Fe(.)15 b(.)e(.)g(.)g(.)g(.)g (.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.) -g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)43 b Ff(37)0 +g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)37 +b Ff(152)0 2807 y(Con\015ict)26 b(mark)n(ers)14 b Fe(.)f(.)g(.)g(.)g(.) +g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h +(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)41 +b Ff(39)0 2924 y(Con\015ict)26 b(resolution)17 b Fe(.)d(.)f(.)g(.)g(.)g +(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.) +g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)43 b Ff(39)0 3040 y(Con\015icts)26 b(\(merge)g(example\))21 b Fe(.)13 b(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g -(.)g(.)g(.)g(.)g(.)h(.)f(.)48 b Ff(36)0 3156 y(Con)n(tributors)26 +(.)g(.)g(.)g(.)g(.)h(.)f(.)48 b Ff(38)0 3156 y(Con)n(tributors)26 b(\(CVS)f(program\))10 b Fe(.)j(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g (.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)37 b Ff(5)0 3272 y(Con)n(tributors)26 b(\(man)n(ual\))16 @@ -10273,15 +10343,15 @@ g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)44 b Ff(2)0 3388 y(Cop)n(ying)26 b(c)n(hanges)11 b Fe(.)j(.)f(.)g(.)g(.)g (.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.) g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)38 b -Ff(51)0 3505 y(Correcting)27 b(a)f(log)h(message)10 b +Ff(53)0 3505 y(Correcting)27 b(a)f(log)h(message)10 b Fe(.)j(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h -(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)36 b Ff(94)0 3621 +(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)36 b Ff(96)0 3621 y(Creating)27 b(a)f(branc)n(h)21 b Fe(.)13 b(.)h(.)f(.)g(.)g(.)g(.)g(.) g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h -(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)48 b Ff(48)0 3737 y(Creating)27 +(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)48 b Ff(50)0 3737 y(Creating)27 b(a)f(pro)t(ject)18 b Fe(.)c(.)f(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.) g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g -(.)h(.)f(.)g(.)44 b Ff(29)0 3853 y(Creating)27 b(a)f(rep)r(ository)19 +(.)h(.)f(.)g(.)44 b Ff(31)0 3853 y(Creating)27 b(a)f(rep)r(ository)19 b Fe(.)13 b(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g (.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)45 b Ff(20)0 3970 y(Credits)26 b(\(CVS)g(program\))17 b @@ -10292,13 +10362,13 @@ Fe(.)c(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)34 b Ff(2)0 4202 y(CVS)25 b(1.6,)i(and)f(w)n(atc)n(hes)9 b Fe(.)14 b(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g -(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)36 b Ff(43)0 +(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)36 b Ff(45)0 4318 y(CVS)25 b(command)f(structure)11 b Fe(.)i(.)g(.)g(.)g(.)h(.)f(.)g (.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.) -g(.)g(.)38 b Ff(87)0 4435 y(CVS)25 b(passwd)i(\014le)19 +g(.)g(.)38 b Ff(89)0 4435 y(CVS)25 b(passwd)i(\014le)19 b Fe(.)14 b(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h (.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.) -g(.)46 b Ff(23)0 4551 y(CVS,)26 b(history)f(of)15 b Fe(.)g(.)e(.)g(.)g +g(.)46 b Ff(24)0 4551 y(CVS,)26 b(history)f(of)15 b Fe(.)g(.)e(.)g(.)g (.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.) h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)43 b Ff(5)0 4667 y(CVS,)26 b(in)n(tro)r(duction)f(to)7 b @@ -10307,57 +10377,57 @@ Fe(.)14 b(.)f(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g b Ff(5)0 4783 y(CVS,)26 b(v)n(ersions)g(of)14 b Fe(.)g(.)f(.)g(.)g(.)h (.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.) g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)41 b -Ff(83)0 4899 y(CVS)p 161 4899 24 4 v 27 w(CLIENT)p 484 +Ff(85)0 4899 y(CVS)p 161 4899 24 4 v 27 w(CLIENT)p 484 4899 V 28 w(LOG)21 b Fe(.)13 b(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g (.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.) -f(.)47 b Ff(150)0 5016 y(CVS)p 161 5016 V 27 w(CLIENT)p +f(.)47 b Ff(152)0 5016 y(CVS)p 161 5016 V 27 w(CLIENT)p 484 5016 V 28 w(POR)-6 b(T)15 b Fe(.)e(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g (.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.) -g(.)h(.)f(.)41 b Ff(26)0 5132 y(CVS)p 161 5132 V 27 w(IGNORE)p +g(.)h(.)f(.)41 b Ff(27)0 5132 y(CVS)p 161 5132 V 27 w(IGNORE)p 503 5132 V 27 w(REMOTE)p 876 5132 V 28 w(R)n(OOT)16 b Fe(.)c(.)i(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)43 -b Ff(150)0 5248 y(CVS)p 161 5248 V 27 w(P)-6 b(ASSFILE,)25 +b Ff(152)0 5248 y(CVS)p 161 5248 V 27 w(P)-6 b(ASSFILE,)25 b(en)n(vironmen)n(t)f(v)l(ariable)17 b Fe(.)c(.)g(.)h(.)f(.)g(.)g(.)g -(.)g(.)g(.)h(.)f(.)g(.)43 b Ff(25)2031 366 y(CVS)p 2192 +(.)g(.)g(.)h(.)f(.)g(.)43 b Ff(26)2031 366 y(CVS)p 2192 366 V 27 w(R)n(CMD)p 2458 366 V 28 w(POR)-6 b(T)7 b Fe(.)13 b(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g (.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)34 -b Ff(150)2031 483 y(CVS)p 2192 483 V 27 w(RSH)17 b Fe(.)c(.)g(.)g(.)g +b Ff(152)2031 483 y(CVS)p 2192 483 V 27 w(RSH)17 b Fe(.)c(.)g(.)g(.)g (.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.) g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f -(.)44 b Ff(149)2031 599 y(CVS)p 2192 599 V 27 w(SER)-9 +(.)44 b Ff(151)2031 599 y(CVS)p 2192 599 V 27 w(SER)-9 b(VER)12 b Fe(.)g(.)h(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g (.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.) g(.)h(.)f(.)g(.)g(.)38 b Ff(22)2031 715 y(CVS)p 2192 715 V 27 w(SER)-9 b(VER)p 2529 715 V 27 w(SLEEP)8 b Fe(.)14 b(.)f(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g -(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)35 b Ff(150)2031 +(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)35 b Ff(152)2031 831 y(CVSEDITOR)22 b Fe(.)13 b(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g (.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.) -h(.)f(.)g(.)g(.)g(.)g(.)g(.)50 b Ff(149)2031 948 y(CVSEDITOR,)25 +h(.)f(.)g(.)g(.)g(.)g(.)g(.)50 b Ff(151)2031 948 y(CVSEDITOR,)25 b(en)n(vironmen)n(t)f(v)l(ariable)8 b Fe(.)13 b(.)g(.)g(.)g(.)h(.)f(.)g (.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)34 b Ff(11)2031 1064 y(CVSIGNORE)20 b Fe(.)13 b(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g (.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.) -h(.)f(.)g(.)g(.)g(.)g(.)48 b Ff(149)2031 1180 y(cvsignore)27 +h(.)f(.)g(.)g(.)g(.)g(.)48 b Ff(151)2031 1180 y(cvsignore)27 b(\(admin)d(\014le\),)i(global)7 b Fe(.)15 b(.)e(.)g(.)g(.)g(.)g(.)g(.) g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)34 -b Ff(146)2031 1296 y(CVSREAD)14 b Fe(.)e(.)h(.)g(.)g(.)h(.)f(.)g(.)g(.) +b Ff(148)2031 1296 y(CVSREAD)14 b Fe(.)e(.)h(.)g(.)g(.)h(.)f(.)g(.)g(.) g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g (.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)41 -b Ff(149)2031 1413 y(CVSREAD,)25 b(o)n(v)n(erriding)13 +b Ff(151)2031 1413 y(CVSREAD,)25 b(o)n(v)n(erriding)13 b Fe(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.) g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)39 b -Ff(90)2031 1529 y(cvsro)r(ot)17 b Fe(.)c(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.) +Ff(92)2031 1529 y(cvsro)r(ot)17 b Fe(.)c(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.) g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f (.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.) 43 b Ff(15)2031 1645 y(CVSR)n(OOT)12 b Fe(.)g(.)h(.)g(.)h(.)f(.)g(.)g (.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.) g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)39 -b Ff(149)2031 1761 y(CVSR)n(OOT)25 b(\(\014le\))d Fe(.)13 +b Ff(151)2031 1761 y(CVSR)n(OOT)25 b(\(\014le\))d Fe(.)13 b(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h (.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)50 -b Ff(135)2031 1877 y(CVSR)n(OOT,)25 b(en)n(vironmen)n(t)f(v)l(ariable) +b Ff(137)2031 1877 y(CVSR)n(OOT,)25 b(en)n(vironmen)n(t)f(v)l(ariable) 14 b Fe(.)f(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g (.)h(.)40 b Ff(15)2031 1994 y(CVSR)n(OOT,)25 b(mo)r(dule)g(name)c Fe(.)13 b(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g @@ -10367,164 +10437,167 @@ Fe(.)15 b(.)e(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g (.)g(.)g(.)34 b Ff(20)2031 2226 y(CVSR)n(OOT,)25 b(o)n(v)n(erriding)11 b Fe(.)i(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.) g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)37 b -Ff(89)2031 2342 y(CVSUMASK)18 b Fe(.)13 b(.)g(.)g(.)g(.)g(.)g(.)h(.)f +Ff(91)2031 2342 y(CVSUMASK)18 b Fe(.)13 b(.)g(.)g(.)g(.)g(.)g(.)h(.)f (.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.) g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)46 b Ff(18)2031 2459 y(CVSWRAPPERS)20 b Fe(.)13 b(.)h(.)f(.)g(.)g(.)g(.)g(.) g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h -(.)f(.)g(.)g(.)g(.)g(.)g(.)49 b Ff(149)2031 2575 y(cvswrapp)r(ers)26 +(.)f(.)g(.)g(.)g(.)g(.)g(.)49 b Ff(151)2031 2575 y(cvswrapp)r(ers)26 b(\(admin)f(\014le\))12 b Fe(.)h(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.) g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)39 -b Ff(137)2031 2691 y(CVSWRAPPERS,)25 b(en)n(vironmen)n(t)e(v)l(ariable) -f Fe(.)14 b(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)48 b Ff(137)2031 +b Ff(139)2031 2691 y(CVSWRAPPERS,)25 b(en)n(vironmen)n(t)e(v)l(ariable) +f Fe(.)14 b(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)48 b Ff(139)2031 2999 y Fm(D)2031 3132 y Ff(Date)26 b(k)n(eyw)n(ord)9 b Fe(.)j(.)h(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.) g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g -(.)g(.)h(.)f(.)35 b Ff(75)2031 3248 y(Dates)9 b Fe(.)k(.)g(.)g(.)g(.)h +(.)g(.)h(.)f(.)35 b Ff(77)2031 3248 y(Dates)9 b Fe(.)k(.)g(.)g(.)g(.)h (.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.) g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g -(.)g(.)g(.)h(.)f(.)g(.)35 b Ff(90)2031 3364 y(Decimal)26 +(.)g(.)g(.)h(.)f(.)g(.)35 b Ff(92)2031 3364 y(Decimal)26 b(revision)g(n)n(um)n(b)r(er)13 b Fe(.)e(.)i(.)g(.)g(.)g(.)g(.)h(.)f(.) g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g (.)g(.)40 b Ff(9)2031 3480 y(DEF)-9 b(A)n(UL)j(T)25 b(in)h(commitinfo) 16 b Fe(.)c(.)h(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g -(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)43 b Ff(139)2031 3597 +(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)43 b Ff(142)2031 3597 y(DEF)-9 b(A)n(UL)j(T)25 b(in)h(editinfo)9 b Fe(.)14 b(.)f(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g -(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)36 b Ff(142)2031 +(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)36 b Ff(144)2031 3713 y(DEF)-9 b(A)n(UL)j(T)25 b(in)h(v)n(erifymsg)10 b Fe(.)j(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.) -f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)37 b Ff(140)2031 +f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)37 b Ff(142)2031 3829 y(De\014ning)25 b(a)h(mo)r(dule)18 b Fe(.)13 b(.)g(.)g(.)g(.)h(.)f (.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.) -g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)45 b Ff(31)2031 3945 +g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)45 b Ff(33)2031 3945 y(De\014ning)25 b(mo)r(dules)g(\(in)n(tro\))15 b Fe(.)e(.)g(.)h(.)f(.)g (.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.) g(.)g(.)g(.)h(.)41 b Ff(19)2031 4061 y(De\014ning)25 b(mo)r(dules)g(\(reference)i(man)n(ual\))14 b Fe(.)e(.)h(.)g(.)g(.)g(.) -g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)41 b Ff(135)2031 4178 +g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)41 b Ff(137)2031 4178 y(Deleting)26 b(\014les)6 b Fe(.)14 b(.)f(.)g(.)h(.)f(.)g(.)g(.)g(.)g (.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.) h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)33 b -Ff(59)2031 4294 y(Deleting)26 b(revisions)11 b Fe(.)k(.)e(.)g(.)g(.)g +Ff(61)2031 4294 y(Deleting)26 b(revisions)11 b Fe(.)k(.)e(.)g(.)g(.)g (.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.) -f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)38 b Ff(94)2031 +f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)38 b Ff(96)2031 4410 y(Deleting)26 b(stic)n(ky)f(tags)12 b Fe(.)i(.)f(.)g(.)g(.)g(.)h (.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.) -g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)38 b Ff(50)2031 4526 +g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)38 b Ff(52)2031 4526 y(Descending)26 b(directories)20 b Fe(.)13 b(.)g(.)g(.)g(.)h(.)f(.)g(.) g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g -(.)g(.)h(.)f(.)45 b Ff(55)2031 4643 y(Di\013)8 b Fe(.)13 +(.)g(.)h(.)f(.)45 b Ff(57)2031 4643 y(Di\013)8 b Fe(.)13 b(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g (.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.) g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)34 b Ff(13)2031 4759 y(Di\013)25 b(\(sub)r(command\))15 b Fe(.)c(.)i(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g (.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)42 -b Ff(103)2031 4875 y(Di\013erences,)26 b(merging)20 b +b Ff(105)2031 4875 y(Di\013erences,)26 b(merging)20 b Fe(.)14 b(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h (.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)47 -b Ff(53)2031 4991 y(Directories,)27 b(mo)n(ving)17 b +b Ff(55)2031 4991 y(Directories,)27 b(mo)n(ving)17 b Fe(.)c(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f (.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)43 -b Ff(71)2031 5108 y(directories,)27 b(remo)n(ving)10 +b Ff(73)2031 5108 y(directories,)27 b(remo)n(ving)10 b Fe(.)j(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.) g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)36 -b Ff(61)2031 5224 y(Directory)-6 b(,)26 b(descending)17 +b Ff(63)2031 5224 y(Directory)-6 b(,)26 b(descending)17 b Fe(.)c(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.) g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)43 -b Ff(55)2031 5340 y(Disjoin)n(t)26 b(rep)r(ositories)7 +b Ff(57)2031 5340 y(Disjoin)n(t)26 b(rep)r(ositories)7 b Fe(.)16 b(.)d(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h (.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)33 b Ff(20)p eop -%%Page: 165 167 -165 166 bop 0 -116 a Fs(Index)3541 b(165)0 366 y Ff(Distributing)26 +%%Page: 167 169 +167 168 bop 0 -116 a Fs(Index)3541 b(167)0 366 y Ff(Distributing)26 b(log)g(messages)14 b Fe(.)h(.)e(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.) g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)41 -b Ff(143)0 483 y(driv)n(er.c)26 b(\(merge)f(example\))9 +b Ff(145)0 483 y(driv)n(er.c)26 b(\(merge)f(example\))9 b Fe(.)j(.)h(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.) -g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)36 b Ff(35)0 -768 y Fm(E)0 901 y Ff(edit)26 b(\(sub)r(command\))16 +g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)36 b Ff(37)0 +729 y Fm(E)0 862 y Ff(edit)26 b(\(sub)r(command\))16 b Fe(.)10 b(.)j(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g (.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)42 -b Ff(42)0 1017 y(editinfo)26 b(\(admin)f(\014le\))d Fe(.)13 +b Ff(44)0 978 y(editinfo)26 b(\(admin)f(\014le\))d Fe(.)13 b(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h -(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)49 b Ff(141)0 -1133 y(Editing)26 b(administrativ)n(e)f(\014les)7 b Fe(.)14 +(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)49 b Ff(143)0 +1094 y(Editing)26 b(administrativ)n(e)f(\014les)7 b Fe(.)14 b(.)f(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g -(.)h(.)f(.)g(.)g(.)g(.)g(.)34 b Ff(19)0 1249 y(Editing)26 +(.)h(.)f(.)g(.)g(.)g(.)g(.)34 b Ff(20)0 1211 y(Editing)26 b(the)f(mo)r(dules)h(\014le)9 b Fe(.)j(.)i(.)f(.)g(.)g(.)g(.)g(.)g(.)h (.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.) -g(.)35 b Ff(31)0 1366 y(EDITOR)15 b Fe(.)e(.)g(.)g(.)g(.)g(.)g(.)h(.)f +g(.)35 b Ff(33)0 1327 y(EDITOR)15 b Fe(.)e(.)g(.)g(.)g(.)g(.)g(.)h(.)f (.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.) g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)42 -b Ff(149)0 1482 y(Editor,)26 b(a)n(v)n(oiding)h(in)n(v)n(o)r(cation)f +b Ff(151)0 1443 y(Editor,)26 b(a)n(v)n(oiding)h(in)n(v)n(o)r(cation)f (of)14 b Fe(.)g(.)f(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h -(.)f(.)g(.)g(.)g(.)g(.)g(.)41 b Ff(92)0 1598 y(EDITOR,)25 +(.)f(.)g(.)g(.)g(.)g(.)g(.)41 b Ff(94)0 1559 y(EDITOR,)25 b(en)n(vironmen)n(t)f(v)l(ariable)17 b Fe(.)d(.)f(.)g(.)g(.)g(.)h(.)f (.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)44 -b Ff(11)0 1714 y(EDITOR,)25 b(o)n(v)n(erriding)14 b Fe(.)g(.)f(.)g(.)g +b Ff(11)0 1676 y(EDITOR,)25 b(o)n(v)n(erriding)14 b Fe(.)g(.)f(.)g(.)g (.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.) -g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)41 b Ff(89)0 1831 +g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)41 b Ff(91)0 1792 y(Editor,)26 b(sp)r(ecifying)h(p)r(er)f(mo)r(dule)13 b Fe(.)f(.)h(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.) -g(.)g(.)g(.)g(.)40 b Ff(141)0 1947 y(editors)26 b(\(sub)r(command\))17 +g(.)g(.)g(.)g(.)40 b Ff(143)0 1908 y(editors)26 b(\(sub)r(command\))17 b Fe(.)12 b(.)h(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h (.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)44 -b Ff(43)0 2063 y(emerge)21 b Fe(.)13 b(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g +b Ff(45)0 2024 y(emerge)21 b Fe(.)13 b(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g (.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.) g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)47 -b Ff(38)0 2179 y(En)n(vironmen)n(t)24 b(v)l(ariables)16 +b Ff(40)0 2141 y(En)n(vironmen)n(t)24 b(v)l(ariables)16 b Fe(.)e(.)f(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.) -g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)43 b Ff(149)0 -2296 y(Errors,)27 b(rep)r(orting)f(\(CVS\))9 b Fe(.)k(.)g(.)g(.)g(.)h +g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)43 b Ff(151)0 +2257 y(Errors,)27 b(rep)r(orting)f(\(CVS\))9 b Fe(.)k(.)g(.)g(.)g(.)h (.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.) -g(.)g(.)g(.)g(.)h(.)f(.)36 b Ff(6)0 2412 y(Errors,)27 +g(.)g(.)g(.)g(.)h(.)f(.)36 b Ff(6)0 2373 y(Errors,)27 b(rep)r(orting)f(\(man)n(ual\))16 b Fe(.)c(.)h(.)g(.)g(.)h(.)f(.)g(.)g (.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.) -43 b Ff(3)0 2528 y(Example)25 b(of)h(a)g(w)n(ork-session)c +43 b Ff(3)0 2489 y(Example)25 b(of)h(a)g(w)n(ork-session)c Fe(.)13 b(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h -(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)46 b Ff(11)0 2644 +(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)46 b Ff(11)0 2605 y(Example)25 b(of)h(merge)d Fe(.)13 b(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g (.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.) -g(.)g(.)h(.)f(.)g(.)g(.)49 b Ff(35)0 2760 y(Example,)25 +g(.)g(.)h(.)f(.)g(.)g(.)49 b Ff(37)0 2722 y(Example,)25 b(branc)n(h)g(merge)14 b Fe(.)f(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g (.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)40 -b Ff(51)0 2877 y(Exp)r(ort)25 b(\(sub)r(command\))11 +b Ff(53)0 2838 y(Exp)r(ort)25 b(\(sub)r(command\))11 b Fe(.)g(.)i(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.) -g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)38 b Ff(105)0 -2993 y(Exp)r(ort)25 b(program)18 b Fe(.)c(.)f(.)g(.)g(.)g(.)g(.)h(.)f +g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)38 b Ff(107)0 +2954 y(Exp)r(ort)25 b(program)18 b Fe(.)c(.)f(.)g(.)g(.)g(.)g(.)h(.)f (.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.) -g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)45 b Ff(136)0 3278 y -Fm(F)0 3411 y Ff(F)-6 b(etc)n(hing)25 b(source)15 b Fe(.)f(.)f(.)g(.)h +g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)45 b Ff(138)0 3201 y +Fm(F)0 3333 y Ff(F)-6 b(etc)n(hing)25 b(source)15 b Fe(.)f(.)f(.)g(.)h (.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.) g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)41 -b Ff(11)0 3527 y(File)27 b(lo)r(c)n(king)12 b Fe(.)h(.)h(.)f(.)g(.)g(.) -g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g -(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)39 -b Ff(33)0 3643 y(File)27 b(p)r(ermissions)22 b Fe(.)13 +b Ff(11)0 3450 y(File)27 b(had)e(con\015icts)h(on)g(merge)8 +b Fe(.)13 b(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g +(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)35 b Ff(36)0 3566 +y(File)27 b(lo)r(c)n(king)12 b Fe(.)h(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h +(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.) +g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)39 +b Ff(35)0 3682 y(File)27 b(p)r(ermissions)22 b Fe(.)13 b(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g (.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)48 -b Ff(18)0 3760 y(File)27 b(status)13 b Fe(.)g(.)g(.)g(.)g(.)g(.)g(.)g +b Ff(18)0 3798 y(File)27 b(status)13 b Fe(.)g(.)g(.)g(.)g(.)g(.)g(.)g (.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.) g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)39 -b Ff(33)0 3876 y(Files,)27 b(mo)n(ving)17 b Fe(.)c(.)g(.)g(.)g(.)g(.)g +b Ff(35)0 3915 y(Files,)27 b(mo)n(ving)17 b Fe(.)c(.)g(.)g(.)g(.)g(.)g (.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.) f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)44 -b Ff(67)0 3992 y(Files,)27 b(reference)g(man)n(ual)6 +b Ff(69)0 4031 y(Files,)27 b(reference)g(man)n(ual)6 b Fe(.)12 b(.)i(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g -(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)33 b Ff(135)0 -4108 y(Fixing)26 b(a)g(log)h(message)12 b Fe(.)h(.)g(.)g(.)g(.)h(.)f(.) +(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)33 b Ff(137)0 +4147 y(Fixing)26 b(a)g(log)h(message)12 b Fe(.)h(.)g(.)g(.)g(.)h(.)f(.) g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g -(.)g(.)g(.)h(.)f(.)g(.)g(.)38 b Ff(94)0 4225 y(F)-6 b(orcing)26 +(.)g(.)g(.)h(.)f(.)g(.)g(.)38 b Ff(96)0 4263 y(F)-6 b(orcing)26 b(a)g(tag)h(matc)n(h)20 b Fe(.)13 b(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g (.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.) -f(.)g(.)g(.)48 b Ff(91)0 4341 y(F)-6 b(orm)25 b(for)h(log)h(message)20 +f(.)g(.)g(.)48 b Ff(93)0 4380 y(F)-6 b(orm)25 b(for)h(log)h(message)20 b Fe(.)13 b(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f (.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)46 -b Ff(145)0 4457 y(F)-6 b(ormat)25 b(of)h(CVS)g(commands)16 +b Ff(148)0 4496 y(F)-6 b(ormat)25 b(of)h(CVS)g(commands)16 b Fe(.)11 b(.)j(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g -(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)43 b Ff(87)0 4742 +(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)43 b Ff(89)0 4742 y Fm(G)0 4875 y Ff(Getting)26 b(started)16 b Fe(.)e(.)f(.)g(.)g(.)g(.)g (.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.) g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)43 b @@ -10533,26 +10606,26 @@ g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g (.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)41 b Ff(11)0 5108 y(Global)27 b(cvsignore)11 b Fe(.)j(.)f(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g (.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.) -h(.)f(.)g(.)g(.)g(.)g(.)38 b Ff(146)0 5224 y(Global)27 +h(.)f(.)g(.)g(.)g(.)g(.)38 b Ff(148)0 5224 y(Global)27 b(options)12 b Fe(.)i(.)f(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g (.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.) -f(.)g(.)g(.)g(.)g(.)g(.)39 b Ff(89)0 5340 y(Group)14 +f(.)g(.)g(.)g(.)g(.)g(.)39 b Ff(91)0 5340 y(Group)14 b Fe(.)g(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.) h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g (.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)41 b Ff(18)2031 366 y Fm(H)2031 499 y Ff(Header)26 b(k)n(eyw)n(ord)21 b Fe(.)13 b(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g (.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.) -h(.)48 b Ff(75)2031 616 y(History)26 b(\(sub)r(command\))19 +h(.)48 b Ff(77)2031 616 y(History)26 b(\(sub)r(command\))19 b Fe(.)13 b(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g -(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)49 b Ff(106)2031 +(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)49 b Ff(108)2031 732 y(History)26 b(bro)n(wsing)7 b Fe(.)14 b(.)f(.)g(.)g(.)g(.)g(.)g(.) g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f -(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)33 b Ff(73)2031 +(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)33 b Ff(75)2031 848 y(History)26 b(\014le)18 b Fe(.)c(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h (.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.) g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)46 b -Ff(147)2031 964 y(History)26 b(\014les)d Fe(.)13 b(.)g(.)g(.)g(.)g(.)h +Ff(149)2031 964 y(History)26 b(\014les)d Fe(.)13 b(.)g(.)g(.)g(.)g(.)h (.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.) g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)49 b Ff(18)2031 1080 y(History)26 b(of)g(CVS)18 b Fe(.)c(.)f(.)g(.)g(.)g @@ -10561,44 +10634,44 @@ g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)46 b Ff(5)2031 1197 y(HOME)16 b Fe(.)d(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h (.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.) g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)43 -b Ff(149)2031 1313 y(HOMEP)-6 b(A)g(TH)14 b Fe(.)e(.)h(.)g(.)g(.)g(.)g +b Ff(151)2031 1313 y(HOMEP)-6 b(A)g(TH)14 b Fe(.)e(.)h(.)g(.)g(.)g(.)g (.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.) g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)41 -b Ff(149)2031 1548 y Fm(I)2031 1680 y Ff(Id)25 b(k)n(eyw)n(ord)19 +b Ff(151)2031 1548 y Fm(I)2031 1680 y Ff(Id)25 b(k)n(eyw)n(ord)19 b Fe(.)14 b(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h (.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.) -g(.)g(.)g(.)g(.)g(.)h(.)46 b Ff(75)2031 1797 y(Iden)n(t)25 +g(.)g(.)g(.)g(.)g(.)h(.)46 b Ff(77)2031 1797 y(Iden)n(t)25 b(\(shell)h(command\))14 b Fe(.)d(.)j(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f (.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.) -g(.)41 b Ff(76)2031 1913 y(Iden)n(tifying)25 b(\014les)17 +g(.)41 b Ff(78)2031 1913 y(Iden)n(tifying)25 b(\014les)17 b Fe(.)c(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.) h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f -(.)g(.)43 b Ff(75)2031 2029 y(Ignored)26 b(\014les)18 +(.)g(.)43 b Ff(77)2031 2029 y(Ignored)26 b(\014les)18 b Fe(.)13 b(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f (.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.) -g(.)g(.)g(.)h(.)44 b Ff(146)2031 2145 y(Ignoring)26 b(\014les)d +g(.)g(.)g(.)h(.)44 b Ff(148)2031 2145 y(Ignoring)26 b(\014les)d Fe(.)13 b(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h (.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.) -g(.)g(.)g(.)49 b Ff(146)2031 2262 y(Imp)r(ort)24 b(\(sub)r(command\))11 +g(.)g(.)g(.)49 b Ff(148)2031 2262 y(Imp)r(ort)24 b(\(sub)r(command\))11 b Fe(.)g(.)j(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.) -h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)38 b Ff(108)2031 +h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)38 b Ff(110)2031 2378 y(Imp)r(orting)25 b(\014les)12 b Fe(.)i(.)f(.)g(.)g(.)g(.)g(.)g(.) h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g -(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)39 b Ff(29)2031 +(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)39 b Ff(31)2031 2494 y(Imp)r(orting)23 b(\014les,)j(from)e(other)g(v)n(ersion)h(con)n -(trol)g(systesm)10 b Fe(.)j(.)35 b Ff(30)2031 2610 y(Imp)r(orting)25 +(trol)g(systesm)10 b Fe(.)j(.)35 b Ff(32)2031 2610 y(Imp)r(orting)25 b(mo)r(dules)7 b Fe(.)12 b(.)i(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g (.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.) -g(.)g(.)h(.)33 b Ff(63)2031 2727 y(Index)8 b Fe(.)k(.)h(.)g(.)h(.)f(.)g +g(.)g(.)h(.)33 b Ff(65)2031 2727 y(Index)8 b Fe(.)k(.)h(.)g(.)h(.)f(.)g (.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.) g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g -(.)h(.)f(.)g(.)35 b Ff(163)2031 2843 y(Info)26 b(\014les)g(\(syn)n +(.)h(.)f(.)g(.)35 b Ff(165)2031 2843 y(Info)26 b(\014les)g(\(syn)n (tax\))11 b Fe(.)h(.)h(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f (.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.) -g(.)38 b Ff(139)2031 2959 y(Informing)25 b(others)12 +g(.)38 b Ff(141)2031 2959 y(Informing)25 b(others)12 b Fe(.)i(.)f(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.) g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g -(.)39 b Ff(38)2031 3075 y(init)26 b(\(sub)r(command\))19 +(.)39 b Ff(40)2031 3075 y(init)26 b(\(sub)r(command\))19 b Fe(.)14 b(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h (.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)48 b Ff(21)2031 3191 y(In)n(tro)r(duction)25 b(to)h(CVS)15 @@ -10607,29 +10680,29 @@ g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)42 b Ff(5)2031 3308 y(In)n(v)n(oking)25 b(CVS)20 b Fe(.)14 b(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f (.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.) -48 b Ff(125)2031 3424 y(Isolation)11 b Fe(.)k(.)e(.)g(.)g(.)g(.)g(.)h +48 b Ff(127)2031 3424 y(Isolation)11 b Fe(.)k(.)e(.)g(.)g(.)g(.)g(.)h (.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.) g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g -(.)38 b Ff(73)2031 3659 y Fm(J)2031 3791 y Ff(Join)16 +(.)38 b Ff(75)2031 3659 y Fm(J)2031 3791 y Ff(Join)16 b Fe(.)e(.)f(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.) g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h (.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)43 -b Ff(51)2031 4026 y Fm(K)2031 4159 y Ff(k)n(eeping)25 +b Ff(53)2031 4026 y Fm(K)2031 4159 y Ff(k)n(eeping)25 b(a)h(c)n(hec)n(k)n(ed)f(out)h(cop)n(y)20 b Fe(.)13 b(.)g(.)h(.)f(.)g (.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.) -48 b Ff(145)2031 4275 y(k)n(erb)r(eros)15 b Fe(.)f(.)f(.)g(.)g(.)g(.)g +48 b Ff(147)2031 4275 y(k)n(erb)r(eros)15 b Fe(.)f(.)f(.)g(.)g(.)g(.)g (.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.) g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g -(.)g(.)42 b Ff(26)2031 4391 y(Keyw)n(ord)25 b(expansion)15 +(.)g(.)42 b Ff(27)2031 4391 y(Keyw)n(ord)25 b(expansion)15 b Fe(.)f(.)f(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.) g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)42 -b Ff(75)2031 4508 y(Keyw)n(ord)25 b(substitution)14 b +b Ff(77)2031 4508 y(Keyw)n(ord)25 b(substitution)14 b Fe(.)g(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f (.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)41 -b Ff(75)2031 4624 y(K\015ag)15 b Fe(.)e(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g +b Ff(77)2031 4624 y(K\015ag)15 b Fe(.)e(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g (.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.) g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f -(.)g(.)41 b Ff(77)2031 4740 y(kinit)9 b Fe(.)k(.)g(.)g(.)h(.)f(.)g(.)g +(.)g(.)41 b Ff(79)2031 4740 y(kinit)9 b Fe(.)k(.)g(.)g(.)h(.)f(.)g(.)g (.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.) g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h (.)f(.)g(.)g(.)g(.)36 b Ff(27)2031 4856 y(Kno)n(wn)25 @@ -10641,205 +10714,210 @@ g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g (.)g(.)g(.)45 b Ff(15)2031 5340 y(Left-hand)25 b(options)11 b Fe(.)j(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.) f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)37 -b Ff(89)p eop -%%Page: 166 168 -166 167 bop 0 -116 a Fs(166)2366 b(CVS|Concurren)m(t)29 +b Ff(91)p eop +%%Page: 168 170 +168 169 bop 0 -116 a Fs(168)2366 b(CVS|Concurren)m(t)29 b(V)-8 b(ersions)30 b(System)0 366 y Ff(Linear)c(dev)n(elopmen)n(t)15 b Fe(.)d(.)h(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.) g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)42 -b Ff(9)0 483 y(List,)26 b(mailing)g(list)18 b Fe(.)c(.)g(.)f(.)g(.)g(.) -g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g -(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)45 -b Ff(5)0 599 y(Lo)r(cally)27 b(Added)13 b Fe(.)f(.)h(.)g(.)g(.)g(.)g(.) -h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g -(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)40 -b Ff(33)0 715 y(Lo)r(cally)27 b(Mo)r(di\014ed)10 b Fe(.)j(.)g(.)h(.)f +b Ff(9)0 483 y(link,)26 b(sym)n(b)r(olic,)f(imp)r(orting)d +Fe(.)13 b(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g +(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)49 b Ff(112)0 599 +y(List,)26 b(mailing)g(list)18 b Fe(.)c(.)g(.)f(.)g(.)g(.)g(.)g(.)g(.)g +(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.) +g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)45 b Ff(5)0 715 y(Lo)r(cally)27 +b(Added)13 b Fe(.)f(.)h(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h +(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.) +g(.)g(.)g(.)g(.)g(.)40 b Ff(35)0 831 y(Lo)r(cally)27 +b(Mo)r(di\014ed)10 b Fe(.)j(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f +(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.) +g(.)g(.)g(.)g(.)h(.)36 b Ff(35)0 948 y(Lo)r(cally)27 +b(Remo)n(v)n(ed)19 b Fe(.)13 b(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h +(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.) +g(.)g(.)g(.)g(.)g(.)48 b Ff(36)0 1064 y(Lo)r(c)n(k)n(er)26 +b(k)n(eyw)n(ord)12 b Fe(.)g(.)h(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f (.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.) -g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)36 -b Ff(33)0 831 y(Lo)r(cally)27 b(Remo)n(v)n(ed)19 b Fe(.)13 -b(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g -(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)48 -b Ff(34)0 948 y(Lo)r(c)n(k)n(er)26 b(k)n(eyw)n(ord)12 -b Fe(.)g(.)h(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.) -g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h -(.)f(.)38 b Ff(75)0 1064 y(Lo)r(c)n(king)26 b(\014les)15 -b Fe(.)f(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.) -f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g -(.)g(.)g(.)g(.)g(.)42 b Ff(33)0 1180 y(lo)r(c)n(ks,)27 +g(.)g(.)g(.)g(.)h(.)f(.)38 b Ff(77)0 1180 y(Lo)r(c)n(king)26 +b(\014les)15 b Fe(.)f(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g +(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.) +h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)42 b Ff(35)0 1296 y(lo)r(c)n(ks,)27 b(cvs)14 b Fe(.)f(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f (.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.) -g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)41 b Ff(38)0 -1296 y(Log)26 b(\(sub)r(command\))15 b Fe(.)c(.)i(.)h(.)f(.)g(.)g(.)g +g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)41 b Ff(40)0 +1413 y(Log)26 b(\(sub)r(command\))15 b Fe(.)c(.)i(.)h(.)f(.)g(.)g(.)g (.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.) -g(.)h(.)f(.)g(.)g(.)g(.)42 b Ff(110)0 1413 y(Log)26 b(information,)h +g(.)h(.)f(.)g(.)g(.)g(.)42 b Ff(113)0 1529 y(Log)26 b(information,)h (sa)n(ving)11 b Fe(.)i(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f (.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)38 -b Ff(147)0 1529 y(Log)26 b(k)n(eyw)n(ord)10 b Fe(.)j(.)g(.)g(.)g(.)g(.) +b Ff(149)0 1645 y(Log)26 b(k)n(eyw)n(ord)10 b Fe(.)j(.)g(.)g(.)g(.)g(.) g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f (.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)36 -b Ff(75)0 1645 y(Log)26 b(k)n(eyw)n(ord,)g(selecting)h(commen)n(t)c +b Ff(77)0 1761 y(Log)26 b(k)n(eyw)n(ord,)g(selecting)h(commen)n(t)c (leader)8 b Fe(.)15 b(.)e(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)35 -b Ff(96)0 1761 y(Log)26 b(message)h(en)n(try)16 b Fe(.)c(.)h(.)g(.)g(.) +b Ff(98)0 1877 y(Log)26 b(message)h(en)n(try)16 b Fe(.)c(.)h(.)g(.)g(.) g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g (.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)42 b Ff(11)0 -1877 y(Log)26 b(message)h(template)21 b Fe(.)13 b(.)h(.)f(.)g(.)g(.)g +1994 y(Log)26 b(message)h(template)21 b Fe(.)13 b(.)h(.)f(.)g(.)g(.)g (.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.) -g(.)h(.)f(.)g(.)49 b Ff(145)0 1994 y(Log)26 b(message,)h(correcting)11 +g(.)h(.)f(.)g(.)49 b Ff(148)0 2110 y(Log)26 b(message,)h(correcting)11 b Fe(.)k(.)e(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.) -g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)38 b Ff(94)0 -2110 y(log)27 b(message,)f(v)n(erifying)10 b Fe(.)k(.)f(.)g(.)g(.)g(.)g +g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)38 b Ff(96)0 +2226 y(log)27 b(message,)f(v)n(erifying)10 b Fe(.)k(.)f(.)g(.)g(.)g(.)g (.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.) -f(.)g(.)g(.)g(.)g(.)37 b Ff(140)0 2226 y(Log)26 b(messages)14 +f(.)g(.)g(.)g(.)g(.)37 b Ff(142)0 2342 y(Log)26 b(messages)14 b Fe(.)g(.)f(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.) g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g -(.)g(.)h(.)40 b Ff(143)0 2342 y(Log)26 b(messages,)h(editing)11 +(.)g(.)h(.)40 b Ff(145)0 2459 y(Log)26 b(messages,)h(editing)11 b Fe(.)j(.)f(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.) g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)38 b -Ff(141)0 2459 y(Login)26 b(\(sub)r(command\))17 b Fe(.)d(.)f(.)g(.)g(.) +Ff(143)0 2575 y(Login)26 b(\(sub)r(command\))17 b Fe(.)d(.)f(.)g(.)g(.) g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g -(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)46 b Ff(25)0 2575 y(loginfo)28 +(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)46 b Ff(25)0 2691 y(loginfo)28 b(\(admin)c(\014le\))c Fe(.)13 b(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.) h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g -(.)g(.)g(.)47 b Ff(143)0 2691 y(LOGNAME)19 b Fe(.)13 +(.)g(.)g(.)47 b Ff(145)0 2807 y(LOGNAME)19 b Fe(.)13 b(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g (.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.) -g(.)g(.)46 b Ff(151)0 2999 y Fm(M)0 3132 y Ff(Mail,)27 -b(automatic)f(mail)g(on)f(commit)19 b Fe(.)13 b(.)g(.)g(.)h(.)f(.)g(.)g -(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)47 b Ff(38)0 -3248 y(Mailing)27 b(list)18 b Fe(.)c(.)f(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.) -g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g -(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)45 -b Ff(5)0 3364 y(Mailing)27 b(log)g(messages)7 b Fe(.)14 -b(.)f(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g -(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)33 b Ff(143)0 -3480 y(Main)26 b(trunk)f(\(in)n(tro\))13 b Fe(.)g(.)g(.)g(.)h(.)f(.)g -(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.) -g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)41 b Ff(9)0 3597 -y(Main)26 b(trunk)f(and)g(branc)n(hes)20 b Fe(.)13 b(.)g(.)g(.)g(.)g(.) -g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h -(.)f(.)g(.)46 b Ff(45)0 3713 y(mak)n(e)17 b Fe(.)12 b(.)h(.)g(.)g(.)g -(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.) -g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g -(.)g(.)g(.)g(.)h(.)f(.)43 b Ff(81)0 3829 y(Man)n(y)25 -b(rep)r(ositories)10 b Fe(.)15 b(.)f(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.) -g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g -(.)g(.)g(.)g(.)h(.)f(.)36 b Ff(20)0 3945 y(Mark)n(ers,)27 -b(con\015ict)11 b Fe(.)i(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.) -h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g -(.)g(.)g(.)g(.)g(.)38 b Ff(37)0 4061 y(Merge,)27 b(an)f(example)8 -b Fe(.)k(.)h(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.) -g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)35 -b Ff(35)0 4178 y(Merge,)27 b(branc)n(h)e(example)19 b -Fe(.)13 b(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g -(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)46 b Ff(51)0 -4294 y(Merging)18 b Fe(.)c(.)f(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f +g(.)g(.)46 b Ff(153)0 2924 y(Logout)26 b(\(sub)r(command\))13 +b Fe(.)e(.)i(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.) +g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)39 b +Ff(26)0 3231 y Fm(M)0 3364 y Ff(Mail,)27 b(automatic)f(mail)g(on)f +(commit)19 b Fe(.)13 b(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g +(.)g(.)g(.)g(.)g(.)g(.)47 b Ff(40)0 3480 y(Mailing)27 +b(list)18 b Fe(.)c(.)f(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g (.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.) -g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)44 -b Ff(51)0 4410 y(Merging)27 b(a)f(branc)n(h)12 b Fe(.)h(.)g(.)g(.)g(.)g -(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.) -g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)39 b Ff(51)0 -4526 y(Merging)27 b(a)f(\014le)9 b Fe(.)14 b(.)f(.)g(.)g(.)g(.)g(.)g(.) -g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f -(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)36 -b Ff(34)0 4643 y(Merging)27 b(t)n(w)n(o)f(revisions)10 +g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)45 b Ff(5)0 3597 +y(Mailing)27 b(log)g(messages)7 b Fe(.)14 b(.)f(.)g(.)g(.)g(.)h(.)f(.)g +(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.) +g(.)g(.)g(.)h(.)33 b Ff(145)0 3713 y(Main)26 b(trunk)f(\(in)n(tro\))13 +b Fe(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.) +g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)41 +b Ff(9)0 3829 y(Main)26 b(trunk)f(and)g(branc)n(hes)20 +b Fe(.)13 b(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f +(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)46 b Ff(47)0 3945 +y(mak)n(e)17 b Fe(.)12 b(.)h(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.) +g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f +(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)43 +b Ff(83)0 4061 y(Man)n(y)25 b(rep)r(ositories)10 b Fe(.)15 +b(.)f(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f +(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)36 +b Ff(20)0 4178 y(Mark)n(ers,)27 b(con\015ict)11 b Fe(.)i(.)g(.)g(.)g(.) +h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g +(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)38 +b Ff(39)0 4294 y(Merge,)27 b(an)f(example)8 b Fe(.)k(.)h(.)h(.)f(.)g(.) +g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g +(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)35 b Ff(37)0 4410 +y(Merge,)27 b(branc)n(h)e(example)19 b Fe(.)13 b(.)g(.)h(.)f(.)g(.)g(.) +g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g +(.)g(.)h(.)f(.)46 b Ff(53)0 4526 y(Merging)18 b Fe(.)c(.)f(.)h(.)f(.)g +(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.) +g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g +(.)h(.)f(.)44 b Ff(53)0 4643 y(Merging)27 b(a)f(branc)n(h)12 +b Fe(.)h(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.) +g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)39 +b Ff(53)0 4759 y(Merging)27 b(a)f(\014le)9 b Fe(.)14 +b(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f +(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.) +g(.)g(.)36 b Ff(36)0 4875 y(Merging)27 b(t)n(w)n(o)f(revisions)10 b Fe(.)k(.)f(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.) g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)36 -b Ff(53)0 4759 y(Mo)r(di\014cations,)28 b(cop)n(ying)d(b)r(et)n(w)n +b Ff(55)0 4991 y(Mo)r(di\014cations,)28 b(cop)n(ying)d(b)r(et)n(w)n (een)h(branc)n(hes)16 b Fe(.)d(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)43 -b Ff(51)0 4875 y(Mo)r(dule)26 b(status)16 b Fe(.)e(.)f(.)g(.)h(.)f(.)g +b Ff(53)0 5108 y(Mo)r(dule)26 b(status)16 b Fe(.)e(.)f(.)g(.)h(.)f(.)g (.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.) g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)43 b -Ff(136)0 4991 y(Mo)r(dule,)27 b(de\014ning)10 b Fe(.)j(.)g(.)g(.)g(.)g +Ff(138)0 5224 y(Mo)r(dule,)27 b(de\014ning)10 b Fe(.)j(.)g(.)g(.)g(.)g (.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.) f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)37 b -Ff(31)0 5108 y(Mo)r(dules)27 b(\(admin)d(\014le\))8 b +Ff(33)0 5340 y(Mo)r(dules)27 b(\(admin)d(\014le\))8 b Fe(.)13 b(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g (.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)35 -b Ff(135)0 5224 y(Mo)r(dules)27 b(\(in)n(tro\))13 b Fe(.)g(.)g(.)g(.)g -(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.) -f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)40 -b Ff(9)0 5340 y(Mo)r(dules)27 b(\014le)21 b Fe(.)13 b(.)g(.)g(.)g(.)g -(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.) -f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)47 -b Ff(19)2031 366 y(Mo)r(dules)27 b(\014le,)f(c)n(hanging)20 -b Fe(.)13 b(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g -(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)46 -b Ff(31)2031 483 y(Motiv)l(ation)26 b(for)h(branc)n(hes)10 +b Ff(137)2031 366 y(Mo)r(dules)27 b(\(in)n(tro\))13 b +Fe(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g +(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.) +g(.)h(.)40 b Ff(9)2031 483 y(Mo)r(dules)27 b(\014le)21 +b Fe(.)13 b(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f +(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.) +g(.)g(.)g(.)g(.)h(.)47 b Ff(19)2031 599 y(Mo)r(dules)27 +b(\014le,)f(c)n(hanging)20 b Fe(.)13 b(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g +(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.) +h(.)f(.)46 b Ff(33)2031 715 y(Motiv)l(ation)26 b(for)h(branc)n(hes)10 b Fe(.)j(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.) -g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)37 b Ff(47)2031 -599 y(Mo)n(ving)26 b(directories)15 b Fe(.)g(.)e(.)g(.)g(.)h(.)f(.)g(.) +g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)37 b Ff(49)2031 +831 y(Mo)n(ving)26 b(directories)15 b Fe(.)g(.)e(.)g(.)g(.)h(.)f(.)g(.) g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g -(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)42 b Ff(71)2031 715 y(Mo)n(ving)26 +(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)42 b Ff(73)2031 948 y(Mo)n(ving)26 b(\014les)d Fe(.)13 b(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g (.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.) -h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)48 b Ff(67)2031 831 y(Multiple)26 -b(dev)n(elop)r(ers)14 b Fe(.)g(.)f(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h -(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.) -g(.)g(.)g(.)41 b Ff(33)2031 948 y(Multiple)26 b(rep)r(ositories)14 -b Fe(.)i(.)d(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.) -f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)41 -b Ff(20)2031 1272 y Fm(N)2031 1404 y Ff(Name)25 b(k)n(eyw)n(ord)9 -b Fe(.)k(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.) -f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g -(.)g(.)g(.)36 b Ff(75)2031 1521 y(Name,)25 b(sym)n(b)r(olic)g(\(tag\)) -14 b Fe(.)g(.)f(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g -(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)41 -b Ff(45)2031 1637 y(Needs)25 b(Chec)n(k)n(out)e Fe(.)13 -b(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g -(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)50 -b Ff(34)2031 1753 y(Needs)25 b(Merge)8 b Fe(.)15 b(.)e(.)g(.)g(.)g(.)g -(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.) -f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)34 -b Ff(34)2031 1869 y(Needs)25 b(P)n(atc)n(h)15 b Fe(.)f(.)f(.)g(.)g(.)g +h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)48 b Ff(69)2031 1064 +y(Multiple)26 b(dev)n(elop)r(ers)14 b Fe(.)g(.)f(.)g(.)h(.)f(.)g(.)g(.) +g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g +(.)g(.)h(.)f(.)g(.)g(.)g(.)41 b Ff(35)2031 1180 y(Multiple)26 +b(rep)r(ositories)14 b Fe(.)i(.)d(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g +(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.) +g(.)g(.)41 b Ff(20)2031 1427 y Fm(N)2031 1559 y Ff(Name)25 +b(k)n(eyw)n(ord)9 b Fe(.)k(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g +(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.) +g(.)h(.)f(.)g(.)g(.)g(.)g(.)36 b Ff(77)2031 1676 y(Name,)25 +b(sym)n(b)r(olic)g(\(tag\))14 b Fe(.)g(.)f(.)h(.)f(.)g(.)g(.)g(.)g(.)g +(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.) +f(.)g(.)g(.)41 b Ff(47)2031 1792 y(Needs)25 b(Chec)n(k)n(out)e +Fe(.)13 b(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g (.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.) -h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)42 -b Ff(34)2031 1986 y(Newsgroups)9 b Fe(.)14 b(.)f(.)g(.)g(.)g(.)h(.)f(.) -g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g -(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)36 -b Ff(5)2031 2102 y(notify)26 b(\(admin)e(\014le\))19 -b Fe(.)13 b(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g -(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)45 -b Ff(41)2031 2218 y(Nro\013)25 b(\(selecting)i(commen)n(t)d(leader\))15 -b Fe(.)f(.)f(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.) -g(.)g(.)42 b Ff(96)2031 2334 y(Num)n(b)r(er,)24 b(branc)n(h)c -Fe(.)14 b(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g -(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.) -g(.)g(.)48 b Ff(9)2031 2451 y(Num)n(b)r(er,)24 b(revision-)10 +g(.)50 b Ff(36)2031 1908 y(Needs)25 b(Merge)8 b Fe(.)15 +b(.)e(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g +(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.) +g(.)g(.)h(.)34 b Ff(36)2031 2024 y(Needs)25 b(P)n(atc)n(h)15 +b Fe(.)f(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.) +f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g +(.)g(.)g(.)g(.)g(.)42 b Ff(36)2031 2141 y(Newsgroups)9 +b Fe(.)14 b(.)f(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g +(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.) +g(.)g(.)h(.)f(.)g(.)g(.)g(.)36 b Ff(5)2031 2257 y(notify)26 +b(\(admin)e(\014le\))19 b Fe(.)13 b(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f +(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.) +g(.)g(.)g(.)g(.)h(.)45 b Ff(43)2031 2373 y(Nro\013)25 +b(\(selecting)i(commen)n(t)d(leader\))15 b Fe(.)f(.)f(.)g(.)g(.)g(.)h +(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)42 +b Ff(98)2031 2489 y(Num)n(b)r(er,)24 b(branc)n(h)c Fe(.)14 +b(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f +(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.) +48 b Ff(9)2031 2605 y(Num)n(b)r(er,)24 b(revision-)10 b Fe(.)k(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.) h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g -(.)37 b Ff(9)2031 2774 y Fm(O)2031 2907 y Ff(option)26 +(.)37 b Ff(9)2031 2852 y Fm(O)2031 2985 y Ff(option)26 b(defaults)7 b Fe(.)14 b(.)f(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.) g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f -(.)g(.)g(.)g(.)g(.)g(.)g(.)34 b Ff(87)2031 3024 y(Options,)26 +(.)g(.)g(.)g(.)g(.)g(.)g(.)34 b Ff(89)2031 3101 y(Options,)26 b(global)20 b Fe(.)13 b(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g (.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.) -g(.)g(.)g(.)h(.)f(.)45 b Ff(89)2031 3140 y(Outdating)25 +g(.)g(.)g(.)h(.)f(.)45 b Ff(91)2031 3217 y(Outdating)25 b(revisions)13 b Fe(.)h(.)g(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g (.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.) -g(.)40 b Ff(94)2031 3256 y(Ov)n(erlap)6 b Fe(.)13 b(.)g(.)g(.)g(.)g(.)h +g(.)40 b Ff(96)2031 3333 y(Ov)n(erlap)6 b Fe(.)13 b(.)g(.)g(.)g(.)g(.)h (.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.) g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g -(.)g(.)g(.)33 b Ff(35)2031 3372 y(Ov)n(erriding)25 b(CVSREAD)12 +(.)g(.)g(.)33 b Ff(37)2031 3450 y(Ov)n(erriding)25 b(CVSREAD)12 b Fe(.)g(.)h(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.) g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)38 b -Ff(90)2031 3488 y(Ov)n(erriding)25 b(CVSR)n(OOT)10 b +Ff(92)2031 3566 y(Ov)n(erriding)25 b(CVSR)n(OOT)10 b Fe(.)i(.)h(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g -(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)36 b Ff(89)2031 -3605 y(Ov)n(erriding)25 b(EDITOR)13 b Fe(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.) +(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)36 b Ff(91)2031 +3682 y(Ov)n(erriding)25 b(EDITOR)13 b Fe(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.) f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g -(.)g(.)g(.)g(.)g(.)h(.)39 b Ff(89)2031 3721 y(Ov)n(erriding)25 +(.)g(.)g(.)g(.)g(.)h(.)39 b Ff(91)2031 3798 y(Ov)n(erriding)25 b(R)n(CSBIN)d Fe(.)13 b(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g (.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.) -49 b Ff(89)2031 3837 y(Ov)n(erriding)25 b(TMPDIR)8 b +49 b Ff(91)2031 3915 y(Ov)n(erriding)25 b(TMPDIR)8 b Fe(.)13 b(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g (.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)34 -b Ff(89)2031 4161 y Fm(P)2031 4294 y Ff(P)n(arallel)28 +b Ff(91)2031 4161 y Fm(P)2031 4294 y Ff(P)n(arallel)28 b(rep)r(ositories)11 b Fe(.)k(.)e(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h (.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.) g(.)g(.)g(.)38 b Ff(20)2031 4410 y(passwd)26 b(\(admin)f(\014le\))14 b Fe(.)f(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.) g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)41 -b Ff(23)2031 4526 y(passw)n(ord)27 b(clien)n(t,)f(using)10 +b Ff(24)2031 4526 y(passw)n(ord)27 b(clien)n(t,)f(using)10 b Fe(.)j(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.) g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)36 b Ff(25)2031 4643 y(passw)n(ord)27 b(serv)n(er,)f(setting)g(up)6 @@ -10848,90 +10926,90 @@ b Fe(.)12 b(.)i(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g y(P)-6 b(A)g(TH)14 b Fe(.)e(.)i(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g (.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.) g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)41 -b Ff(149)2031 4875 y(P)n(er-mo)r(dule)25 b(editor)c Fe(.)13 +b Ff(151)2031 4875 y(P)n(er-mo)r(dule)25 b(editor)c Fe(.)13 b(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g (.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)47 -b Ff(141)2031 4991 y(P)n(olicy)18 b Fe(.)c(.)g(.)f(.)g(.)g(.)g(.)g(.)g +b Ff(143)2031 4991 y(P)n(olicy)18 b Fe(.)c(.)g(.)f(.)g(.)g(.)g(.)g(.)g (.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.) f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g -(.)g(.)45 b Ff(85)2031 5108 y(Precommit)25 b(c)n(hec)n(king)19 +(.)g(.)45 b Ff(87)2031 5108 y(Precommit)25 b(c)n(hec)n(king)19 b Fe(.)13 b(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g (.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)46 -b Ff(139)2031 5224 y(Preface)17 b Fe(.)e(.)e(.)g(.)g(.)h(.)f(.)g(.)g(.) +b Ff(141)2031 5224 y(Preface)17 b Fe(.)e(.)e(.)g(.)g(.)h(.)f(.)g(.)g(.) g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g (.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.) h(.)44 b Ff(1)2031 5340 y(Pserv)n(er)26 b(\(sub)r(command\))6 b Fe(.)11 b(.)i(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g (.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)33 b Ff(23)p eop -%%Page: 167 169 -167 168 bop 0 -116 a Fs(Index)3541 b(167)0 366 y Fm(R)0 +%%Page: 169 171 +169 170 bop 0 -116 a Fs(Index)3541 b(169)0 366 y Fm(R)0 499 y Ff(R)n(CS)25 b(history)h(\014les)9 b Fe(.)14 b(.)f(.)g(.)g(.)g(.) g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f (.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)36 b Ff(18)0 616 y(R)n(CS)25 b(k)n(eyw)n(ords)15 b Fe(.)e(.)g(.)g(.)g(.)h(.)f(.)g(.) g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g -(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)41 b Ff(75)0 +(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)41 b Ff(77)0 732 y(R)n(CS)25 b(revision)h(n)n(um)n(b)r(ers)20 b Fe(.)13 b(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g -(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)48 b Ff(45)0 +(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)48 b Ff(47)0 848 y(R)n(CS,)25 b(imp)r(orting)h(\014les)g(from)13 b Fe(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f -(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)39 b Ff(30)0 964 y(R)n(CS-st)n(yle) +(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)39 b Ff(32)0 964 y(R)n(CS-st)n(yle) 25 b(lo)r(c)n(king)12 b Fe(.)h(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g (.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.) -g(.)g(.)g(.)h(.)f(.)38 b Ff(33)0 1080 y(R)n(CSBIN)7 b +g(.)g(.)g(.)h(.)f(.)38 b Ff(35)0 1080 y(R)n(CSBIN)7 b Fe(.)13 b(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h (.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.) -g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)34 b Ff(149)0 1197 y(R)n(CSBIN,)25 +g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)34 b Ff(151)0 1197 y(R)n(CSBIN,)25 b(o)n(v)n(erriding)e Fe(.)14 b(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g (.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.) -g(.)g(.)50 b Ff(89)0 1313 y(R)n(CS\014le)25 b(k)n(eyw)n(ord)15 +g(.)g(.)50 b Ff(91)0 1313 y(R)n(CS\014le)25 b(k)n(eyw)n(ord)15 b Fe(.)e(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.) g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g -(.)42 b Ff(75)0 1429 y(rcsinfo)27 b(\(admin)d(\014le\))e +(.)42 b Ff(77)0 1429 y(rcsinfo)27 b(\(admin)d(\014le\))e Fe(.)13 b(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g (.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)49 -b Ff(145)0 1545 y(R)n(CSINIT)10 b Fe(.)i(.)h(.)g(.)g(.)h(.)f(.)g(.)g(.) +b Ff(148)0 1545 y(R)n(CSINIT)10 b Fe(.)i(.)h(.)g(.)g(.)h(.)f(.)g(.)g(.) g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g (.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)37 -b Ff(151)0 1662 y(Rdi\013)25 b(\(sub)r(command\))12 b +b Ff(153)0 1662 y(Rdi\013)25 b(\(sub)r(command\))12 b Fe(.)f(.)i(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f (.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)39 -b Ff(112)0 1778 y(read-only)25 b(\014les,)i(and)e(-r)17 +b Ff(115)0 1778 y(read-only)25 b(\014les,)i(and)e(-r)17 b Fe(.)c(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.) g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)44 -b Ff(89)0 1894 y(read-only)25 b(\014les,)i(and)e(CVSREAD)6 +b Ff(91)0 1894 y(read-only)25 b(\014les,)i(and)e(CVSREAD)6 b Fe(.)12 b(.)h(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g -(.)g(.)h(.)f(.)33 b Ff(149)0 2010 y(read-only)25 b(\014les,)i(and)e(w)n +(.)g(.)h(.)f(.)33 b Ff(151)0 2010 y(read-only)25 b(\014les,)i(and)e(w)n (atc)n(hes)17 b Fe(.)d(.)f(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g -(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)44 b Ff(40)0 +(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)44 b Ff(42)0 2127 y(read-only)25 b(\014les,)i(in)e(rep)r(ository)9 b Fe(.)14 b(.)f(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g (.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)35 b Ff(18)0 2243 y(Read-only)25 b(mo)r(de)18 b Fe(.)13 b(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.) g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h -(.)f(.)g(.)g(.)g(.)45 b Ff(89)0 2359 y(read-only)25 b(rep)r(ository)i +(.)f(.)g(.)g(.)g(.)45 b Ff(91)0 2359 y(read-only)25 b(rep)r(ository)i (access)11 b Fe(.)j(.)f(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h -(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)37 b Ff(27)0 +(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)37 b Ff(28)0 2475 y(readers)26 b(\(admin)f(\014le\))14 b Fe(.)f(.)g(.)h(.)f(.)g(.)g (.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.) -g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)41 b Ff(27)0 2591 y(Recursiv)n(e)25 +g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)41 b Ff(28)0 2591 y(Recursiv)n(e)25 b(\(directory)h(descending\))17 b Fe(.)c(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.) -f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)43 b Ff(55)0 +f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)43 b Ff(57)0 2708 y(Reference)26 b(man)n(ual)f(\(\014les\))d Fe(.)14 b(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g -(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)49 b Ff(135)0 2824 y(Reference)26 +(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)49 b Ff(137)0 2824 y(Reference)26 b(man)n(ual)f(for)h(v)l(ariables)14 b Fe(.)g(.)f(.)g(.)g(.)h(.)f(.)g(.) g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)41 b -Ff(149)0 2940 y(Reference,)26 b(commands)13 b Fe(.)f(.)h(.)g(.)g(.)g(.) +Ff(151)0 2940 y(Reference,)26 b(commands)13 b Fe(.)f(.)h(.)g(.)g(.)g(.) g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f -(.)g(.)g(.)g(.)g(.)g(.)40 b Ff(125)0 3056 y(regular)27 +(.)g(.)g(.)g(.)g(.)g(.)40 b Ff(127)0 3056 y(regular)27 b(expression)f(syn)n(tax)18 b Fe(.)12 b(.)h(.)g(.)g(.)h(.)f(.)g(.)g(.)g (.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)45 -b Ff(139)0 3173 y(Release)27 b(\(sub)r(command\))19 b +b Ff(141)0 3173 y(Release)27 b(\(sub)r(command\))19 b Fe(.)13 b(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h -(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)48 b Ff(114)0 +(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)48 b Ff(116)0 3289 y(Releases,)27 b(revisions)g(and)e(v)n(ersions)c Fe(.)13 b(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g (.)g(.)g(.)g(.)47 b Ff(10)0 3405 y(Releasing)27 b(y)n(our)e(w)n(orking) @@ -10942,26 +11020,26 @@ g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g (.)h(.)f(.)g(.)g(.)g(.)g(.)37 b Ff(21)0 3638 y(Remo)n(v)n(e)24 b(\(sub)r(command\))16 b Fe(.)11 b(.)i(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g (.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.) -43 b Ff(59)0 3754 y(Remo)n(ving)24 b(a)i(c)n(hange)17 +43 b Ff(61)0 3754 y(Remo)n(ving)24 b(a)i(c)n(hange)17 b Fe(.)d(.)f(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.) g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)44 -b Ff(53)0 3870 y(remo)n(ving)25 b(directories)d Fe(.)13 +b Ff(55)0 3870 y(remo)n(ving)25 b(directories)d Fe(.)13 b(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g (.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)47 -b Ff(61)0 3986 y(Remo)n(ving)24 b(\014les)14 b Fe(.)g(.)f(.)g(.)g(.)g +b Ff(63)0 3986 y(Remo)n(ving)24 b(\014les)14 b Fe(.)g(.)f(.)g(.)g(.)g (.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.) g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)40 -b Ff(59)0 4102 y(Remo)n(ving)24 b(y)n(our)i(w)n(orking)g(cop)n(y)8 +b Ff(61)0 4102 y(Remo)n(ving)24 b(y)n(our)i(w)n(orking)g(cop)n(y)8 b Fe(.)k(.)h(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.) g(.)g(.)h(.)f(.)g(.)g(.)34 b Ff(12)0 4219 y(Renaming)25 b(directories)e Fe(.)14 b(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g (.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.) -49 b Ff(71)0 4335 y(Renaming)25 b(\014les)12 b Fe(.)h(.)g(.)g(.)g(.)h +49 b Ff(73)0 4335 y(Renaming)25 b(\014les)12 b Fe(.)h(.)g(.)g(.)g(.)h (.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.) g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)38 -b Ff(67)0 4451 y(Replacing)26 b(a)g(log)h(message)c Fe(.)13 +b Ff(69)0 4451 y(Replacing)26 b(a)g(log)h(message)c Fe(.)13 b(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g -(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)49 b Ff(94)0 4567 +(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)49 b Ff(96)0 4567 y(Rep)r(orting)26 b(bugs)f(\(CVS\))18 b Fe(.)13 b(.)g(.)g(.)g(.)h(.)f (.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.) g(.)g(.)g(.)g(.)h(.)f(.)45 b Ff(6)0 4684 y(Rep)r(orting)26 @@ -10987,28 +11065,28 @@ b(,)26 b(setting)g(up)6 b Fe(.)13 b(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g g(.)g(.)33 b Ff(20)2031 483 y(reserv)n(ed)25 b(c)n(hec)n(k)n(outs)16 b Fe(.)d(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.) g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)43 -b Ff(33)2031 599 y(Resetting)26 b(stic)n(ky)f(tags)10 +b Ff(35)2031 599 y(Resetting)26 b(stic)n(ky)f(tags)10 b Fe(.)k(.)g(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.) g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)37 -b Ff(50)2031 715 y(Resolving)26 b(a)g(con\015ict)15 b +b Ff(52)2031 715 y(Resolving)26 b(a)g(con\015ict)15 b Fe(.)f(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f (.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)42 -b Ff(37)2031 831 y(Restoring)26 b(old)g(v)n(ersion)g(of)h(remo)n(v)n +b Ff(39)2031 831 y(Restoring)26 b(old)g(v)n(ersion)g(of)h(remo)n(v)n (ed)d(\014le)c Fe(.)13 b(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.) -h(.)f(.)46 b Ff(50)2031 948 y(Resurrecting)26 b(old)g(v)n(ersion)g(of)g +h(.)f(.)46 b Ff(52)2031 948 y(Resurrecting)26 b(old)g(v)n(ersion)g(of)g (dead)g(\014le)12 b Fe(.)h(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f -(.)g(.)g(.)g(.)39 b Ff(50)2031 1064 y(Retrieving)26 b(an)f(old)h +(.)g(.)g(.)g(.)39 b Ff(52)2031 1064 y(Retrieving)26 b(an)f(old)h (revision)h(using)f(tags)18 b Fe(.)13 b(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g -(.)g(.)h(.)f(.)g(.)g(.)44 b Ff(46)2031 1180 y(rev)n(erting)26 +(.)g(.)h(.)f(.)g(.)g(.)44 b Ff(48)2031 1180 y(rev)n(erting)26 b(to)g(rep)r(ository)g(v)n(ersion)d Fe(.)13 b(.)g(.)g(.)g(.)g(.)g(.)g (.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)49 -b Ff(42)2031 1296 y(Revision)26 b(k)n(eyw)n(ord)15 b +b Ff(44)2031 1296 y(Revision)26 b(k)n(eyw)n(ord)15 b Fe(.)d(.)i(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g (.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)41 -b Ff(75)2031 1413 y(Revision)26 b(managemen)n(t)10 b +b Ff(77)2031 1413 y(Revision)26 b(managemen)n(t)10 b Fe(.)h(.)i(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g (.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)36 -b Ff(85)2031 1529 y(Revision)26 b(n)n(um)n(b)r(ers)14 +b Ff(87)2031 1529 y(Revision)26 b(n)n(um)n(b)r(ers)14 b Fe(.)d(.)i(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.) g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g (.)41 b Ff(9)2031 1645 y(Revision)26 b(tree)6 b Fe(.)14 @@ -11016,29 +11094,29 @@ b(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f (.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.) g(.)g(.)g(.)h(.)33 b Ff(9)2031 1761 y(Revision)26 b(tree,)g(making)f (branc)n(hes)6 b Fe(.)13 b(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g -(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)33 b Ff(45)2031 1877 +(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)33 b Ff(47)2031 1877 y(Revisions,)26 b(merging)g(di\013erences)g(b)r(et)n(w)n(een)16 b Fe(.)e(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)43 -b Ff(53)2031 1994 y(Revisions,)26 b(v)n(ersions)h(and)e(releases)d +b Ff(55)2031 1994 y(Revisions,)26 b(v)n(ersions)h(and)e(releases)d Fe(.)13 b(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g (.)g(.)g(.)g(.)47 b Ff(10)2031 2110 y(Righ)n(t-hand)24 b(options)c Fe(.)13 b(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g (.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.) -g(.)46 b Ff(90)2031 2226 y(rsh)19 b Fe(.)13 b(.)g(.)g(.)g(.)g(.)g(.)h +g(.)46 b Ff(92)2031 2226 y(rsh)19 b Fe(.)13 b(.)g(.)g(.)g(.)g(.)g(.)h (.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.) g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g -(.)g(.)g(.)h(.)f(.)g(.)45 b Ff(21)2031 2342 y(R)n(tag)26 +(.)g(.)g(.)h(.)f(.)g(.)45 b Ff(22)2031 2342 y(R)n(tag)26 b(\(sub)r(command\))14 b Fe(.)c(.)k(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g (.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.) -g(.)41 b Ff(116)2031 2459 y(rtag,)27 b(creating)f(a)g(branc)n(h)f +g(.)41 b Ff(118)2031 2459 y(rtag,)27 b(creating)f(a)g(branc)n(h)f (using)11 b Fe(.)j(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g -(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)38 b Ff(48)2031 2766 +(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)38 b Ff(50)2031 2766 y Fm(S)2031 2899 y Ff(Sa)n(ving)25 b(space)10 b Fe(.)k(.)g(.)f(.)g(.)g (.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.) g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)37 -b Ff(94)2031 3015 y(SCCS,)26 b(imp)r(orting)g(\014les)g(from)8 +b Ff(96)2031 3015 y(SCCS,)26 b(imp)r(orting)g(\014les)g(from)8 b Fe(.)13 b(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h -(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)34 b Ff(30)2031 3132 +(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)34 b Ff(32)2031 3132 y(Securit)n(y)18 b Fe(.)13 b(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.) f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g (.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)45 @@ -11060,7 +11138,7 @@ b(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f 48 b Ff(1)2031 3829 y(Source)26 b(k)n(eyw)n(ord)12 b Fe(.)h(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f (.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.) -g(.)39 b Ff(75)2031 3945 y(Source,)26 b(getting)g(CVS)g(source)c +g(.)39 b Ff(77)2031 3945 y(Source,)26 b(getting)g(CVS)g(source)c Fe(.)13 b(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g (.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)49 b Ff(5)2031 4061 y(Source,)26 b(getting)g(from)g(CVS)12 b Fe(.)h(.)g(.)g(.)g(.)g(.)h(.)f @@ -11068,243 +11146,246 @@ y(Source,)26 b(getting)g(from)g(CVS)12 b Fe(.)h(.)g(.)g(.)g(.)g(.)h(.)f g(.)39 b Ff(11)2031 4178 y(Sp)r(ecifying)26 b(dates)20 b Fe(.)13 b(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g (.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.) -f(.)46 b Ff(90)2031 4294 y(Spreading)26 b(information)20 +f(.)46 b Ff(92)2031 4294 y(Spreading)26 b(information)20 b Fe(.)13 b(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g (.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)46 -b Ff(38)2031 4410 y(Starting)26 b(a)g(pro)t(ject)g(with)g(CVS)19 +b Ff(40)2031 4410 y(Starting)26 b(a)g(pro)t(ject)g(with)g(CVS)19 b Fe(.)13 b(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g -(.)g(.)g(.)g(.)g(.)h(.)f(.)45 b Ff(29)2031 4526 y(State)26 +(.)g(.)g(.)g(.)g(.)h(.)f(.)45 b Ff(31)2031 4526 y(State)26 b(k)n(eyw)n(ord)18 b Fe(.)13 b(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g (.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.) -f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)45 b Ff(76)2031 4643 +f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)45 b Ff(78)2031 4643 y(Status)25 b(\(sub)r(command\))20 b Fe(.)13 b(.)g(.)g(.)g(.)g(.)h(.)f (.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.) -g(.)g(.)g(.)49 b Ff(117)2031 4759 y(Status)25 b(of)i(a)f(\014le)13 +g(.)g(.)g(.)49 b Ff(119)2031 4759 y(Status)25 b(of)i(a)f(\014le)13 b Fe(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.) h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g -(.)g(.)g(.)40 b Ff(33)2031 4875 y(Status)25 b(of)i(a)f(mo)r(dule)c +(.)g(.)g(.)40 b Ff(35)2031 4875 y(Status)25 b(of)i(a)f(mo)r(dule)c Fe(.)13 b(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g (.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)50 -b Ff(136)2031 4991 y(stic)n(ky)25 b(date)7 b Fe(.)13 +b Ff(138)2031 4991 y(stic)n(ky)25 b(date)7 b Fe(.)13 b(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h (.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.) -g(.)g(.)g(.)g(.)g(.)34 b Ff(50)2031 5108 y(Stic)n(ky)25 +g(.)g(.)g(.)g(.)g(.)34 b Ff(52)2031 5108 y(Stic)n(ky)25 b(tags)d Fe(.)14 b(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g (.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.) -h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)48 b Ff(49)2031 5224 +h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)48 b Ff(51)2031 5224 y(Stic)n(ky)25 b(tags,)h(resetting)7 b Fe(.)14 b(.)f(.)g(.)g(.)h(.)f(.) g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g -(.)g(.)g(.)g(.)h(.)f(.)g(.)33 b Ff(50)2031 5340 y(Storing)26 +(.)g(.)g(.)g(.)h(.)f(.)g(.)33 b Ff(52)2031 5340 y(Storing)26 b(log)h(messages)12 b Fe(.)i(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.) g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g -(.)39 b Ff(143)p eop -%%Page: 168 170 -168 169 bop 0 -116 a Fs(168)2366 b(CVS|Concurren)m(t)29 +(.)39 b Ff(145)p eop +%%Page: 170 172 +170 171 bop 0 -116 a Fs(170)2366 b(CVS|Concurren)m(t)29 b(V)-8 b(ersions)30 b(System)0 366 y Ff(Structure)15 b Fe(.)d(.)h(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.) g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g -(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)41 b Ff(87)0 483 y(Sub)r(directories)20 +(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)41 b Ff(89)0 483 y(Sub)r(directories)20 b Fe(.)13 b(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g (.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.) -h(.)f(.)g(.)46 b Ff(55)0 599 y(Supp)r(ort,)25 b(getting)h(CVS)g(supp)r +h(.)f(.)g(.)46 b Ff(57)0 599 y(Supp)r(ort,)25 b(getting)h(CVS)g(supp)r (ort)7 b Fe(.)12 b(.)h(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g -(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)34 b Ff(1)0 715 y(Sym)n(b)r(olic)25 -b(name)f(\(tag\))9 b Fe(.)14 b(.)f(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f -(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.) -g(.)g(.)36 b Ff(45)0 831 y(Syn)n(tax)24 b(of)j(info)f(\014les)11 +(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)34 b Ff(1)0 715 y(sym)n(b)r(olic)25 +b(link,)h(imp)r(orting)15 b Fe(.)e(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f +(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)42 +b Ff(112)0 831 y(Sym)n(b)r(olic)25 b(name)f(\(tag\))9 +b Fe(.)14 b(.)f(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g +(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)36 +b Ff(47)0 948 y(Syn)n(tax)24 b(of)j(info)f(\014les)11 b Fe(.)j(.)f(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.) g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)38 -b Ff(139)0 1047 y Fm(T)0 1180 y Ff(T)-6 b(ag)26 b(\(sub)r(command\))14 +b Ff(141)0 1163 y Fm(T)0 1296 y Ff(T)-6 b(ag)26 b(\(sub)r(command\))14 b Fe(.)e(.)h(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.) g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)41 -b Ff(118)0 1296 y(T)-6 b(ag)26 b(program)c Fe(.)14 b(.)f(.)g(.)g(.)g(.) +b Ff(120)0 1413 y(T)-6 b(ag)26 b(program)c Fe(.)14 b(.)f(.)g(.)g(.)g(.) g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g (.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)49 -b Ff(136)0 1413 y(tag,)27 b(command,)d(in)n(tro)r(duction)10 +b Ff(138)0 1529 y(tag,)27 b(command,)d(in)n(tro)r(duction)10 b Fe(.)j(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.) -g(.)g(.)h(.)f(.)g(.)g(.)g(.)37 b Ff(45)0 1529 y(tag,)27 +g(.)g(.)h(.)f(.)g(.)g(.)g(.)37 b Ff(47)0 1645 y(tag,)27 b(example)9 b Fe(.)j(.)h(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.) g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g -(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)36 b Ff(46)0 1645 y(T)-6 +(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)36 b Ff(48)0 1761 y(T)-6 b(ag,)27 b(retrieving)f(old)g(revisions)11 b Fe(.)j(.)f(.)g(.)g(.)g(.)g (.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.) -37 b Ff(46)0 1761 y(T)-6 b(ag,)27 b(sym)n(b)r(olic)e(name)8 +37 b Ff(48)0 1877 y(T)-6 b(ag,)27 b(sym)n(b)r(olic)e(name)8 b Fe(.)k(.)i(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.) h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)35 -b Ff(45)0 1877 y(taginfo)24 b Fe(.)13 b(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g +b Ff(47)0 1994 y(taginfo)24 b Fe(.)13 b(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g (.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.) g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)49 -b Ff(73)0 1994 y(T)-6 b(ags)9 b Fe(.)14 b(.)g(.)f(.)g(.)g(.)g(.)g(.)g +b Ff(75)0 2110 y(T)-6 b(ags)9 b Fe(.)14 b(.)g(.)f(.)g(.)g(.)g(.)g(.)g (.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.) f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g -(.)g(.)g(.)g(.)36 b Ff(45)0 2110 y(T)-6 b(ags,)27 b(stic)n(ky)8 +(.)g(.)g(.)g(.)36 b Ff(47)0 2226 y(T)-6 b(ags,)27 b(stic)n(ky)8 b Fe(.)13 b(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h (.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.) -g(.)g(.)g(.)g(.)g(.)h(.)34 b Ff(49)0 2226 y(tc,)26 b(T)-6 +g(.)g(.)g(.)g(.)g(.)h(.)34 b Ff(51)0 2342 y(tc,)26 b(T)-6 b(rivial)27 b(Compiler)f(\(example\))18 b Fe(.)11 b(.)i(.)h(.)f(.)g(.)g (.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)44 -b Ff(11)0 2342 y(T)-6 b(eam)25 b(of)i(dev)n(elop)r(ers)20 +b Ff(11)0 2459 y(T)-6 b(eam)25 b(of)i(dev)n(elop)r(ers)20 b Fe(.)13 b(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g (.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)46 -b Ff(33)0 2459 y(TEMP)22 b Fe(.)14 b(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.) +b Ff(35)0 2575 y(TEMP)22 b Fe(.)14 b(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.) g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g (.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)48 -b Ff(150)0 2575 y(T)-6 b(emplate)25 b(for)i(log)f(message)18 +b Ff(152)0 2691 y(T)-6 b(emplate)25 b(for)i(log)f(message)18 b Fe(.)d(.)e(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.) -g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)45 b Ff(145)0 2691 y(temp)r(orary)25 +g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)45 b Ff(148)0 2807 y(temp)r(orary)25 b(\014les,)h(lo)r(cation)h(of)8 b Fe(.)14 b(.)f(.)h(.)f(.)g(.)g(.)g(.)g (.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)35 -b Ff(150)0 2807 y(Third-part)n(y)25 b(sources)12 b Fe(.)i(.)f(.)g(.)g +b Ff(152)0 2924 y(Third-part)n(y)25 b(sources)12 b Fe(.)i(.)f(.)g(.)g (.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.) -g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)38 b Ff(63)0 -2924 y(Time)17 b Fe(.)c(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g +g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)38 b Ff(65)0 +3040 y(Time)17 b Fe(.)c(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g (.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.) g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)43 -b Ff(90)0 3040 y(timezone,)26 b(in)f(input)18 b Fe(.)13 +b Ff(92)0 3156 y(timezone,)26 b(in)f(input)18 b Fe(.)13 b(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f (.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)45 -b Ff(91)0 3156 y(timezone,)26 b(in)f(output)10 b Fe(.)j(.)g(.)g(.)g(.)g +b Ff(93)0 3272 y(timezone,)26 b(in)f(output)10 b Fe(.)j(.)g(.)g(.)g(.)g (.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.) -g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)37 b Ff(111)0 3272 y(TMP)13 +g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)37 b Ff(113)0 3388 y(TMP)13 b Fe(.)h(.)f(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.) g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f -(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)40 b Ff(150)0 -3388 y(TMPDIR)10 b Fe(.)j(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g +(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)40 b Ff(152)0 +3505 y(TMPDIR)10 b Fe(.)j(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g (.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.) -g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)37 b Ff(150)0 -3505 y(TMPDIR,)26 b(o)n(v)n(erriding)9 b Fe(.)k(.)g(.)g(.)g(.)h(.)f(.)g +g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)37 b Ff(152)0 +3621 y(TMPDIR,)26 b(o)n(v)n(erriding)9 b Fe(.)k(.)g(.)g(.)g(.)h(.)f(.)g (.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.) -g(.)g(.)g(.)h(.)f(.)g(.)35 b Ff(89)0 3621 y(T)-6 b(race)11 +g(.)g(.)g(.)h(.)f(.)g(.)35 b Ff(91)0 3737 y(T)-6 b(race)11 b Fe(.)j(.)f(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.) g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f -(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)38 b Ff(90)0 -3737 y(T)-6 b(raceabilit)n(y)7 b Fe(.)14 b(.)g(.)f(.)g(.)g(.)g(.)g(.)g +(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)38 b Ff(92)0 +3853 y(T)-6 b(raceabilit)n(y)7 b Fe(.)14 b(.)g(.)f(.)g(.)g(.)g(.)g(.)g (.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.) f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)34 -b Ff(73)0 3853 y(T)-6 b(rac)n(king)26 b(sources)13 b +b Ff(75)0 3970 y(T)-6 b(rac)n(king)26 b(sources)13 b Fe(.)h(.)f(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g (.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.) -40 b Ff(63)0 3970 y(T)-6 b(ransactions,)27 b(atomic,)g(lac)n(k)e(of)14 +40 b Ff(65)0 4086 y(T)-6 b(ransactions,)27 b(atomic,)g(lac)n(k)e(of)14 b Fe(.)h(.)e(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.) -f(.)g(.)g(.)g(.)g(.)g(.)41 b Ff(39)0 4086 y(T)-6 b(rivial)27 +f(.)g(.)g(.)g(.)g(.)g(.)41 b Ff(41)0 4202 y(T)-6 b(rivial)27 b(Compiler)f(\(example\))21 b Fe(.)13 b(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f (.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)48 -b Ff(11)0 4202 y(T)n(ypical)26 b(rep)r(ository)20 b Fe(.)13 +b Ff(11)0 4318 y(T)n(ypical)26 b(rep)r(ository)20 b Fe(.)13 b(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g (.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)45 -b Ff(15)0 4418 y Fm(U)0 4551 y Ff(umask,)25 b(for)h(rep)r(ository)h +b Ff(15)0 4534 y Fm(U)0 4667 y Ff(umask,)25 b(for)h(rep)r(ository)h (\014les)10 b Fe(.)j(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.) h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)36 b -Ff(18)0 4667 y(Undoing)25 b(a)h(c)n(hange)8 b Fe(.)14 +Ff(18)0 4783 y(Undoing)25 b(a)h(c)n(hange)8 b Fe(.)14 b(.)f(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g (.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)35 -b Ff(53)0 4783 y(unedit)25 b(\(sub)r(command\))7 b Fe(.)k(.)i(.)g(.)g +b Ff(55)0 4899 y(unedit)25 b(\(sub)r(command\))7 b Fe(.)k(.)i(.)g(.)g (.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.) -h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)34 b Ff(42)0 4899 y(Unkno)n(wn)14 +h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)34 b Ff(44)0 5016 y(Unkno)n(wn)14 b Fe(.)e(.)h(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.) f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g -(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)40 b Ff(34)2031 366 y(unreserv)n(ed)25 +(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)40 b Ff(36)2031 366 y(unreserv)n(ed)25 b(c)n(hec)n(k)n(outs)8 b Fe(.)k(.)h(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g (.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.) -f(.)g(.)34 b Ff(33)2031 483 y(Unresolv)n(ed)25 b(Con\015ict)13 -b Fe(.)h(.)f(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.) -g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)40 -b Ff(34)2031 599 y(Up-to-date)7 b Fe(.)12 b(.)h(.)g(.)h(.)f(.)g(.)g(.)g +f(.)g(.)34 b Ff(35)2031 483 y(Up-to-date)7 b Fe(.)12 +b(.)h(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g +(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.) +f(.)g(.)g(.)g(.)g(.)34 b Ff(35)2031 599 y(Up)r(date)25 +b(\(sub)r(command\))20 b Fe(.)13 b(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g +(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)49 +b Ff(122)2031 715 y(Up)r(date)25 b(program)12 b Fe(.)i(.)f(.)g(.)g(.)g (.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.) -g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)34 -b Ff(33)2031 715 y(Up)r(date)25 b(\(sub)r(command\))20 -b Fe(.)13 b(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g -(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)49 b Ff(120)2031 -831 y(Up)r(date)25 b(program)12 b Fe(.)i(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.) -h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g -(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)39 b Ff(136)2031 948 y(up)r(date,)25 -b(in)n(tro)r(duction)14 b Fe(.)f(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.) -g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f -(.)g(.)g(.)40 b Ff(34)2031 1064 y(Up)r(dating)25 b(a)h(\014le)6 -b Fe(.)14 b(.)f(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f -(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.) -g(.)g(.)g(.)33 b Ff(34)2031 1180 y(USER)15 b Fe(.)d(.)h(.)g(.)g(.)g(.)h -(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.) -g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g -(.)g(.)g(.)42 b Ff(151)2031 1296 y(user)26 b(aliases)18 -b Fe(.)d(.)e(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.) -g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h -(.)f(.)g(.)g(.)g(.)g(.)45 b Ff(24)2031 1413 y(users)26 -b(\(admin)f(\014le\))16 b Fe(.)d(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.) -g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h -(.)f(.)g(.)g(.)g(.)g(.)43 b Ff(41)2031 1628 y Fm(V)2031 -1761 y Ff(V)-6 b(endor)18 b Fe(.)13 b(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g +g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)39 b Ff(138)2031 +831 y(up)r(date,)25 b(in)n(tro)r(duction)14 b Fe(.)f(.)g(.)g(.)h(.)f(.) +g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g +(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)40 b Ff(36)2031 948 y(Up)r(dating)25 +b(a)h(\014le)6 b Fe(.)14 b(.)f(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g (.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.) -h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)45 -b Ff(63)2031 1877 y(V)-6 b(endor)25 b(branc)n(h)11 b -Fe(.)i(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f -(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.) -g(.)g(.)38 b Ff(63)2031 1994 y(v)n(erifymsg)25 b(\(admin)g(\014le\))e +h(.)f(.)g(.)g(.)g(.)g(.)g(.)33 b Ff(36)2031 1064 y(USER)15 +b Fe(.)d(.)h(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.) +g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g +(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)42 b Ff(153)2031 +1180 y(user)26 b(aliases)18 b Fe(.)d(.)e(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.) +g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f +(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)45 +b Ff(25)2031 1296 y(users)26 b(\(admin)f(\014le\))16 +b Fe(.)d(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.) +g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)43 +b Ff(43)2031 1551 y Fm(V)2031 1684 y Ff(V)-6 b(endor)18 +b Fe(.)13 b(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g +(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.) +g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)45 b Ff(65)2031 +1800 y(V)-6 b(endor)25 b(branc)n(h)11 b Fe(.)i(.)g(.)g(.)g(.)g(.)g(.)g +(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.) +f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)38 b +Ff(65)2031 1916 y(v)n(erifymsg)25 b(\(admin)g(\014le\))e Fe(.)13 b(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f -(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)50 b Ff(140)2031 -2110 y(v)n(ersions,)26 b(of)h(CVS)14 b Fe(.)f(.)g(.)g(.)g(.)g(.)h(.)f +(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)50 b Ff(142)2031 +2032 y(v)n(ersions,)26 b(of)h(CVS)14 b Fe(.)f(.)g(.)g(.)g(.)g(.)h(.)f (.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.) -g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)41 b Ff(83)2031 -2226 y(V)-6 b(ersions,)26 b(revisions)h(and)e(releases)10 +g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)41 b Ff(85)2031 +2149 y(V)-6 b(ersions,)26 b(revisions)h(and)e(releases)10 b Fe(.)15 b(.)e(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g -(.)g(.)g(.)g(.)h(.)36 b Ff(10)2031 2342 y(Viewing)27 +(.)g(.)g(.)g(.)h(.)36 b Ff(10)2031 2265 y(Viewing)27 b(di\013erences)21 b Fe(.)13 b(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g (.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.) -g(.)h(.)f(.)47 b Ff(13)2031 2558 y Fm(W)2031 2691 y Ff(w)n(atc)n(h)26 +g(.)h(.)f(.)47 b Ff(13)2031 2520 y Fm(W)2031 2652 y Ff(w)n(atc)n(h)26 b(add)f(\(sub)r(command\))9 b Fe(.)i(.)i(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.) g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)36 -b Ff(40)2031 2807 y(w)n(atc)n(h)26 b(o\013)g(\(sub)r(command\))12 +b Ff(42)2031 2769 y(w)n(atc)n(h)26 b(o\013)g(\(sub)r(command\))12 b Fe(.)f(.)i(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.) -g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)39 b Ff(40)2031 -2924 y(w)n(atc)n(h)26 b(on)g(\(sub)r(command\))13 b Fe(.)e(.)i(.)g(.)g +g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)39 b Ff(42)2031 +2885 y(w)n(atc)n(h)26 b(on)g(\(sub)r(command\))13 b Fe(.)e(.)i(.)g(.)g (.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.) -h(.)f(.)g(.)g(.)g(.)40 b Ff(40)2031 3040 y(w)n(atc)n(h)26 +h(.)f(.)g(.)g(.)g(.)40 b Ff(42)2031 3001 y(w)n(atc)n(h)26 b(remo)n(v)n(e)e(\(sub)r(command\))19 b Fe(.)13 b(.)g(.)g(.)g(.)h(.)f (.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)47 -b Ff(41)2031 3156 y(w)n(atc)n(hers)26 b(\(sub)r(command\))18 +b Ff(43)2031 3117 y(w)n(atc)n(hers)26 b(\(sub)r(command\))18 b Fe(.)13 b(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f -(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)46 b Ff(43)2031 -3272 y(W)-6 b(atc)n(hes)16 b Fe(.)d(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f +(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)46 b Ff(45)2031 +3234 y(W)-6 b(atc)n(hes)16 b Fe(.)d(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f (.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.) g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)42 -b Ff(39)2031 3388 y(Wdi\013)25 b(\(imp)r(ort)g(example\))10 +b Ff(41)2031 3350 y(Wdi\013)25 b(\(imp)r(ort)g(example\))10 b Fe(.)j(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.) -g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)37 b Ff(63)2031 -3505 y(What)25 b(\(shell)i(command\))7 b Fe(.)k(.)i(.)g(.)g(.)g(.)h(.)f -(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.) -g(.)g(.)g(.)g(.)34 b Ff(76)2031 3621 y(What)25 b(branc)n(hes)h(are)g -(go)r(o)r(d)h(for)9 b Fe(.)14 b(.)f(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g -(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)35 -b Ff(47)2031 3737 y(What)25 b(is)i(CVS?)18 b Fe(.)12 -b(.)i(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f -(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.) -g(.)g(.)45 b Ff(5)2031 3853 y(When)25 b(to)h(commit)7 -b Fe(.)12 b(.)h(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g +g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)37 b Ff(65)2031 +3466 y(w)n(eb)26 b(pages,)h(main)n(taining)e(with)h(CVS)9 +b Fe(.)k(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.) +36 b Ff(147)2031 3582 y(What)25 b(\(shell)i(command\))7 +b Fe(.)k(.)i(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.) +g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)34 b +Ff(78)2031 3698 y(What)25 b(branc)n(hes)h(are)g(go)r(o)r(d)h(for)9 +b Fe(.)14 b(.)f(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f +(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)35 b Ff(49)2031 3815 y(What)25 +b(is)i(CVS?)18 b Fe(.)12 b(.)i(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g (.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.) -g(.)34 b Ff(85)2031 3970 y(W)-6 b(ork-session,)26 b(example)f(of)6 -b Fe(.)15 b(.)e(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f -(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)33 b Ff(11)2031 -4086 y(W)-6 b(orking)25 b(cop)n(y)9 b Fe(.)k(.)h(.)f(.)g(.)g(.)g(.)g(.) -g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h -(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)36 -b Ff(33)2031 4202 y(W)-6 b(orking)25 b(cop)n(y)-6 b(,)26 +g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)45 b Ff(5)2031 3931 y(When)25 +b(to)h(commit)7 b Fe(.)12 b(.)h(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g +(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.) +f(.)g(.)g(.)g(.)g(.)34 b Ff(87)2031 4047 y(W)-6 b(ork-session,)26 +b(example)f(of)6 b Fe(.)15 b(.)e(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.) +g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)33 +b Ff(11)2031 4163 y(W)-6 b(orking)25 b(cop)n(y)9 b Fe(.)k(.)h(.)f(.)g +(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.) +g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)36 +b Ff(35)2031 4280 y(W)-6 b(orking)25 b(cop)n(y)-6 b(,)26 b(remo)n(ving)c Fe(.)13 b(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h (.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)50 -b Ff(12)2031 4318 y(W)-6 b(rapp)r(ers)9 b Fe(.)k(.)g(.)g(.)g(.)h(.)f(.) +b Ff(12)2031 4396 y(W)-6 b(rapp)r(ers)9 b Fe(.)k(.)g(.)g(.)g(.)h(.)f(.) g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g (.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)36 -b Ff(137)2031 4435 y(writers)27 b(\(admin)d(\014le\))19 +b Ff(139)2031 4512 y(writers)27 b(\(admin)d(\014le\))19 b Fe(.)13 b(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g (.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)45 -b Ff(27)2031 4650 y Fm(Z)2031 4783 y Ff(zone,)26 b(time,)g(in)f(input) +b Ff(28)2031 4767 y Fm(Z)2031 4899 y Ff(zone,)26 b(time,)g(in)f(input) 13 b Fe(.)f(.)h(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g (.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)39 -b Ff(91)2031 4899 y(zone,)26 b(time,)g(in)f(output)20 +b Ff(93)2031 5016 y(zone,)26 b(time,)g(in)f(output)20 b Fe(.)13 b(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g (.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)48 -b Ff(111)p eop -%%Page: -1 171 --1 170 bop 3875 -116 a Fs(i)0 366 y Fp(Short)29 b(Con)l(ten)l(ts)0 +b Ff(113)p eop +%%Page: -1 173 +-1 172 bop 3875 -116 a Fs(i)0 366 y Fp(Short)29 b(Con)l(ten)l(ts)0 599 y Fc(Ab)s(out)j(this)h(man)m(ual)17 b Fb(.)h(.)i(.)g(.)g(.)f(.)h(.) g(.)g(.)g(.)f(.)h(.)g(.)g(.)g(.)f(.)h(.)g(.)g(.)g(.)f(.)h(.)g(.)g(.)f (.)h(.)g(.)g(.)g(.)f(.)h(.)g(.)g(.)g(.)f(.)h(.)g(.)g(.)g(.)f(.)h(.)g(.) @@ -11325,83 +11406,83 @@ g(.)f(.)h(.)g(.)g(.)g(.)f(.)h(.)g(.)g(.)g(.)f(.)h(.)g(.)g(.)g(.)f(.)h b(Starting)31 b(a)i(pro)5 b(ject)33 b(with)f(CVS)21 b Fb(.)f(.)g(.)g(.)g(.)g(.)f(.)h(.)g(.)g(.)g(.)f(.)h(.)g(.)g(.)f(.)h(.)g (.)g(.)g(.)f(.)h(.)g(.)g(.)g(.)f(.)h(.)g(.)g(.)g(.)f(.)53 -b Fc(29)0 1396 y(6)156 b(Multiple)31 b(dev)m(elop)s(ers)15 +b Fc(31)0 1396 y(6)156 b(Multiple)31 b(dev)m(elop)s(ers)15 b Fb(.)21 b(.)f(.)f(.)h(.)g(.)g(.)f(.)h(.)g(.)g(.)g(.)f(.)h(.)g(.)g(.)g (.)f(.)h(.)g(.)g(.)g(.)f(.)h(.)g(.)g(.)f(.)h(.)g(.)g(.)g(.)f(.)h(.)g(.) -g(.)g(.)f(.)h(.)47 b Fc(33)0 1529 y(7)156 b(Branc)m(hes)16 +g(.)g(.)f(.)h(.)47 b Fc(35)0 1529 y(7)156 b(Branc)m(hes)16 b Fb(.)21 b(.)f(.)g(.)g(.)f(.)h(.)g(.)g(.)g(.)f(.)h(.)g(.)g(.)g(.)f(.)h (.)g(.)g(.)g(.)f(.)h(.)g(.)g(.)g(.)f(.)h(.)g(.)g(.)f(.)h(.)g(.)g(.)g(.) f(.)h(.)g(.)g(.)g(.)f(.)h(.)g(.)g(.)g(.)f(.)h(.)48 b -Fc(45)0 1662 y(8)156 b(Merging)34 b Fb(.)20 b(.)g(.)f(.)h(.)g(.)g(.)g +Fc(47)0 1662 y(8)156 b(Merging)34 b Fb(.)20 b(.)g(.)f(.)h(.)g(.)g(.)g (.)f(.)h(.)g(.)g(.)f(.)h(.)g(.)g(.)g(.)f(.)h(.)g(.)g(.)g(.)f(.)h(.)g(.) g(.)g(.)f(.)h(.)g(.)g(.)f(.)h(.)g(.)g(.)g(.)f(.)h(.)g(.)g(.)g(.)f(.)h -(.)g(.)g(.)g(.)66 b Fc(51)0 1794 y(9)156 b(Recursiv)m(e)34 +(.)g(.)g(.)g(.)66 b Fc(53)0 1794 y(9)156 b(Recursiv)m(e)34 b(b)s(eha)m(vior)29 b Fb(.)19 b(.)h(.)g(.)g(.)g(.)f(.)h(.)g(.)g(.)g(.)f (.)h(.)g(.)g(.)g(.)f(.)h(.)g(.)g(.)g(.)f(.)h(.)g(.)g(.)f(.)h(.)g(.)g(.) -g(.)f(.)h(.)g(.)g(.)g(.)f(.)h(.)g(.)61 b Fc(55)0 1927 +g(.)f(.)h(.)g(.)g(.)g(.)f(.)h(.)g(.)61 b Fc(57)0 1927 y(10)107 b(Adding)32 b(\014les)h(to)f(a)g(directory)11 b Fb(.)20 b(.)g(.)f(.)h(.)g(.)g(.)g(.)f(.)h(.)g(.)g(.)g(.)f(.)h(.)g(.)g (.)f(.)h(.)g(.)g(.)g(.)f(.)h(.)g(.)g(.)g(.)f(.)h(.)g(.)g(.)g(.)f(.)43 -b Fc(57)0 2060 y(11)107 b(Remo)m(ving)31 b(\014les)11 +b Fc(59)0 2060 y(11)107 b(Remo)m(ving)31 b(\014les)11 b Fb(.)20 b(.)g(.)g(.)g(.)g(.)f(.)h(.)g(.)g(.)g(.)f(.)h(.)g(.)g(.)f(.)h (.)g(.)g(.)g(.)f(.)h(.)g(.)g(.)g(.)f(.)h(.)g(.)g(.)g(.)f(.)h(.)g(.)g(.) -g(.)f(.)h(.)g(.)g(.)f(.)h(.)g(.)43 b Fc(59)0 2193 y(12)107 +g(.)f(.)h(.)g(.)g(.)f(.)h(.)g(.)43 b Fc(61)0 2193 y(12)107 b(Remo)m(ving)31 b(directories)12 b Fb(.)20 b(.)g(.)g(.)f(.)h(.)g(.)g (.)g(.)f(.)h(.)g(.)g(.)g(.)f(.)h(.)g(.)g(.)g(.)f(.)h(.)g(.)g(.)f(.)h(.) g(.)g(.)g(.)f(.)h(.)g(.)g(.)g(.)f(.)h(.)g(.)g(.)44 b -Fc(61)0 2326 y(13)107 b(T)-8 b(rac)m(king)33 b(third-part)m(y)f +Fc(63)0 2326 y(13)107 b(T)-8 b(rac)m(king)33 b(third-part)m(y)f (sources)22 b Fb(.)f(.)e(.)h(.)g(.)g(.)g(.)f(.)h(.)g(.)g(.)g(.)f(.)h(.) g(.)g(.)f(.)h(.)g(.)g(.)g(.)f(.)h(.)g(.)g(.)g(.)f(.)h(.)g(.)g(.)g(.)53 -b Fc(63)0 2459 y(14)107 b(Mo)m(ving)32 b(and)h(renaming)e(\014les)k +b Fc(65)0 2459 y(14)107 b(Mo)m(ving)32 b(and)h(renaming)e(\014les)k Fb(.)20 b(.)g(.)f(.)h(.)g(.)g(.)g(.)f(.)h(.)g(.)g(.)f(.)h(.)g(.)g(.)g (.)f(.)h(.)g(.)g(.)g(.)f(.)h(.)g(.)g(.)g(.)f(.)h(.)g(.)g(.)f(.)67 -b Fc(67)0 2591 y(15)107 b(Mo)m(ving)32 b(and)h(renaming)e(directories) +b Fc(69)0 2591 y(15)107 b(Mo)m(ving)32 b(and)h(renaming)e(directories) 36 b Fb(.)19 b(.)h(.)g(.)g(.)g(.)f(.)h(.)g(.)g(.)g(.)f(.)h(.)g(.)g(.)g -(.)f(.)h(.)g(.)g(.)f(.)h(.)g(.)g(.)g(.)f(.)h(.)68 b Fc(71)0 +(.)f(.)h(.)g(.)g(.)f(.)h(.)g(.)g(.)g(.)f(.)h(.)68 b Fc(73)0 2724 y(16)107 b(History)32 b(bro)m(wsing)14 b Fb(.)21 b(.)e(.)h(.)g(.)g(.)g(.)f(.)h(.)g(.)g(.)g(.)f(.)h(.)g(.)g(.)g(.)f(.)h (.)g(.)g(.)f(.)h(.)g(.)g(.)g(.)f(.)h(.)g(.)g(.)g(.)f(.)h(.)g(.)g(.)g(.) -f(.)h(.)g(.)g(.)46 b Fc(73)0 2857 y(17)107 b(Keyw)m(ord)34 +f(.)h(.)g(.)g(.)46 b Fc(75)0 2857 y(17)107 b(Keyw)m(ord)34 b(substitution)26 b Fb(.)20 b(.)g(.)g(.)g(.)f(.)h(.)g(.)g(.)f(.)h(.)g (.)g(.)g(.)f(.)h(.)g(.)g(.)g(.)f(.)h(.)g(.)g(.)g(.)f(.)h(.)g(.)g(.)f(.) -h(.)g(.)g(.)g(.)f(.)h(.)g(.)59 b Fc(75)0 2990 y(18)107 +h(.)g(.)g(.)g(.)f(.)h(.)g(.)59 b Fc(77)0 2990 y(18)107 b(Handling)31 b(binary)h(\014les)16 b Fb(.)k(.)f(.)h(.)g(.)g(.)g(.)f(.) h(.)g(.)g(.)g(.)f(.)h(.)g(.)g(.)g(.)f(.)h(.)g(.)g(.)g(.)f(.)h(.)g(.)g -(.)f(.)h(.)g(.)g(.)g(.)f(.)h(.)g(.)g(.)g(.)f(.)48 b Fc(79)0 +(.)f(.)h(.)g(.)g(.)g(.)f(.)h(.)g(.)g(.)g(.)f(.)48 b Fc(81)0 3123 y(19)107 b(Ho)m(w)33 b(y)m(our)g(build)f(system)h(in)m(teracts)g (with)f(CVS)17 b Fb(.)j(.)g(.)g(.)g(.)f(.)h(.)g(.)g(.)g(.)f(.)h(.)g(.)g -(.)g(.)f(.)h(.)g(.)g(.)g(.)48 b Fc(81)0 3256 y(20)107 +(.)g(.)f(.)h(.)g(.)g(.)g(.)48 b Fc(83)0 3256 y(20)107 b(Compatibilit)m(y)29 b(b)s(et)m(w)m(een)35 b(CVS)e(V)-8 b(ersions)32 b Fb(.)19 b(.)h(.)g(.)g(.)g(.)f(.)h(.)g(.)g(.)g(.)f(.)h(.) -g(.)g(.)g(.)f(.)h(.)g(.)g(.)f(.)h(.)g(.)g(.)63 b Fc(83)0 +g(.)g(.)g(.)f(.)h(.)g(.)g(.)f(.)h(.)g(.)g(.)63 b Fc(85)0 3388 y(21)107 b(Revision)32 b(managemen)m(t)21 b Fb(.)e(.)h(.)g(.)f(.)h (.)g(.)g(.)f(.)h(.)g(.)g(.)g(.)f(.)h(.)g(.)g(.)g(.)f(.)h(.)g(.)g(.)g(.) f(.)h(.)g(.)g(.)g(.)f(.)h(.)g(.)g(.)f(.)h(.)g(.)g(.)53 -b Fc(85)0 3521 y(App)s(endix)33 b(A)99 b(Guide)32 b(to)h(CVS)g +b Fc(87)0 3521 y(App)s(endix)33 b(A)99 b(Guide)32 b(to)h(CVS)g (commands)16 b Fb(.)j(.)h(.)g(.)f(.)h(.)g(.)g(.)g(.)f(.)h(.)g(.)g(.)g (.)f(.)h(.)g(.)g(.)g(.)f(.)h(.)g(.)g(.)f(.)h(.)g(.)48 -b Fc(87)0 3654 y(App)s(endix)33 b(B)103 b(Quic)m(k)33 +b Fc(89)0 3654 y(App)s(endix)33 b(B)103 b(Quic)m(k)33 b(reference)h(to)f(CVS)g(commands)13 b Fb(.)19 b(.)h(.)g(.)g(.)g(.)f(.) -h(.)g(.)g(.)g(.)f(.)h(.)g(.)g(.)f(.)h(.)g(.)46 b Fc(125)0 +h(.)g(.)g(.)g(.)f(.)h(.)g(.)g(.)f(.)h(.)g(.)46 b Fc(127)0 3787 y(App)s(endix)33 b(C)102 b(Reference)34 b(man)m(ual)e(for)g(the)h (Administrativ)m(e)d(\014les)13 b Fb(.)21 b(.)e(.)h(.)g(.)g(.)g(.)f(.)h -(.)g(.)46 b Fc(135)0 3920 y(App)s(endix)33 b(D)97 b(All)31 +(.)g(.)46 b Fc(137)0 3920 y(App)s(endix)33 b(D)97 b(All)31 b(en)m(vironmen)m(t)i(v)-5 b(ariables)31 b(whic)m(h)j(a\013ect)e(CVS)22 -b Fb(.)f(.)e(.)h(.)g(.)g(.)g(.)f(.)h(.)g(.)g(.)54 b Fc(149)0 +b Fb(.)f(.)e(.)h(.)g(.)g(.)g(.)f(.)h(.)g(.)g(.)54 b Fc(151)0 4053 y(App)s(endix)33 b(E)106 b(T)-8 b(roublesho)s(oting)24 b Fb(.)19 b(.)h(.)f(.)h(.)g(.)g(.)g(.)f(.)h(.)g(.)g(.)g(.)f(.)h(.)g(.)g (.)f(.)h(.)g(.)g(.)g(.)f(.)h(.)g(.)g(.)g(.)f(.)h(.)g(.)g(.)g(.)56 -b Fc(153)0 4185 y(App)s(endix)33 b(F)108 b(GNU)33 b(GENERAL)g(PUBLIC)g +b Fc(155)0 4185 y(App)s(endix)33 b(F)108 b(GNU)33 b(GENERAL)g(PUBLIC)g (LICENSE)39 b Fb(.)20 b(.)g(.)f(.)h(.)g(.)g(.)g(.)f(.)h(.)g(.)g(.)g(.)f -(.)h(.)70 b Fc(155)0 4318 y(Index)30 b Fb(.)20 b(.)g(.)f(.)h(.)g(.)g(.) +(.)h(.)70 b Fc(157)0 4318 y(Index)30 b Fb(.)20 b(.)g(.)f(.)h(.)g(.)g(.) g(.)f(.)h(.)g(.)g(.)g(.)f(.)h(.)g(.)g(.)g(.)f(.)h(.)g(.)g(.)g(.)f(.)h (.)g(.)g(.)f(.)h(.)g(.)g(.)g(.)f(.)h(.)g(.)g(.)g(.)f(.)h(.)g(.)g(.)g(.) -f(.)h(.)g(.)g(.)g(.)f(.)h(.)g(.)g(.)61 b Fc(163)p eop -%%Page: -2 172 --2 171 bop 0 -116 a Fs(ii)2449 b(CVS|Concurren)m(t)29 +f(.)h(.)g(.)g(.)g(.)f(.)h(.)g(.)g(.)61 b Fc(165)p eop +%%Page: -2 174 +-2 173 bop 0 -116 a Fs(ii)2449 b(CVS|Concurren)m(t)29 b(V)-8 b(ersions)30 b(System)p eop -%%Page: -3 173 --3 172 bop 3824 -116 a Fs(iii)0 366 y Fp(T)-13 b(able)31 +%%Page: -3 175 +-3 174 bop 3824 -116 a Fs(iii)0 366 y Fp(T)-13 b(able)31 b(of)f(Con)l(ten)l(ts)0 701 y Fm(Ab)t(out)44 b(this)h(man)l(ual)18 b Fb(.)j(.)f(.)g(.)g(.)f(.)h(.)g(.)g(.)g(.)f(.)h(.)g(.)g(.)g(.)f(.)h(.) g(.)g(.)g(.)f(.)h(.)g(.)g(.)f(.)h(.)g(.)g(.)g(.)f(.)h(.)g(.)g(.)g(.)f @@ -11474,7 +11555,7 @@ Fa(.)h(.)h(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g g(.)g(.)g(.)g(.)g(.)43 b Fs(19)598 3846 y(4.3.1)93 b(Editing)28 b(administrativ)m(e)h(\014les)18 b Fa(.)c(.)h(.)g(.)g(.)g(.)g(.)g(.)g (.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.) -g(.)g(.)47 b Fs(19)299 3970 y(4.4)92 b(Multiple)28 b(rep)s(ositories)9 +g(.)g(.)47 b Fs(20)299 3970 y(4.4)92 b(Multiple)28 b(rep)s(ositories)9 b Fa(.)14 b(.)h(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f (.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.) g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)39 b Fs(20)299 4095 @@ -11485,472 +11566,474 @@ g(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g b Fa(.)15 b(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g (.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.) g(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)54 b Fs(21)598 4344 -y(4.6.1)93 b(Connecting)29 b(with)g(rsh)23 b Fa(.)15 -b(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g -(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)53 -b Fs(21)598 4468 y(4.6.2)93 b(Direct)30 b(connection)h(with)e(passw)m -(ord)h(authen)m(tication)14 b Fa(.)h(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)43 -b Fs(23)897 4593 y(4.6.2.1)93 b(Setting)30 b(up)g(the)g(serv)m(er)h -(for)f(passw)m(ord)g(authen)m(tication)1104 4717 y Fa(.)15 +y(4.6.1)93 b(Serv)m(er)30 b(requiremen)m(ts)12 b Fa(.)i(.)h(.)g(.)g(.)g +(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.) +h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)41 b +Fs(22)598 4468 y(4.6.2)93 b(Connecting)29 b(with)g(rsh)23 +b Fa(.)15 b(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f +(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.) +53 b Fs(22)598 4593 y(4.6.3)93 b(Direct)30 b(connection)h(with)e(passw) +m(ord)h(authen)m(tication)14 b Fa(.)h(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)43 +b Fs(23)897 4717 y(4.6.3.1)93 b(Setting)30 b(up)g(the)g(serv)m(er)h +(for)f(passw)m(ord)g(authen)m(tication)1104 4842 y Fa(.)15 b(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g (.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.) g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)55 b -Fs(23)897 4842 y(4.6.2.2)93 b(Using)30 b(the)g(clien)m(t)g(with)f +Fs(23)897 4966 y(4.6.3.2)93 b(Using)30 b(the)g(clien)m(t)g(with)f (passw)m(ord)h(authen)m(tication)17 b Fa(.)e(.)46 b Fs(25)897 -4966 y(4.6.2.3)93 b(Securit)m(y)30 b(considerations)f(with)g(passw)m -(ord)1078 5091 y(authen)m(tication)19 b Fa(.)c(.)g(.)g(.)g(.)g(.)g(.)g +5091 y(4.6.3.3)93 b(Securit)m(y)30 b(considerations)f(with)g(passw)m +(ord)1078 5215 y(authen)m(tication)19 b Fa(.)c(.)g(.)g(.)g(.)g(.)g(.)g (.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.) g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)48 b Fs(26)598 -5215 y(4.6.3)93 b(Direct)30 b(connection)h(with)e(k)m(erb)s(eros)8 +5340 y(4.6.4)93 b(Direct)30 b(connection)h(with)e(k)m(erb)s(eros)8 b Fa(.)15 b(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g -(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)37 b Fs(26)299 5340 y(4.7)92 -b(Read-only)30 b(rep)s(ository)f(access)19 b Fa(.)e(.)e(.)g(.)g(.)g(.)g -(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.) -g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)48 b -Fs(27)p eop -%%Page: -4 174 --4 173 bop 0 -116 a Fs(iv)2427 b(CVS|Concurren)m(t)29 -b(V)-8 b(ersions)30 b(System)0 83 y Fm(5)135 b(Starting)46 -b(a)f(pro)7 b(ject)46 b(with)f(CVS)17 b Fb(.)i(.)h(.)g(.)f(.)h(.)g(.)g -(.)g(.)f(.)h(.)g(.)g(.)g(.)f(.)h(.)g(.)g(.)g(.)f(.)h(.)g(.)62 -b Fm(29)299 239 y Fs(5.1)92 b(Setting)30 b(up)f(the)i(\014les)21 -b Fa(.)14 b(.)h(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g -(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.) -g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)50 b Fs(29)598 -363 y(5.1.1)93 b(Creating)30 b(a)g(directory)g(tree)h(from)f(a)h(n)m -(um)m(b)s(er)e(of)h(\014les)18 b Fa(.)d(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.) -47 b Fs(29)598 488 y(5.1.2)93 b(Creating)30 b(Files)f(F)-8 +(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)37 b Fs(27)p eop +%%Page: -4 176 +-4 175 bop 0 -116 a Fs(iv)2427 b(CVS|Concurren)m(t)29 +b(V)-8 b(ersions)30 b(System)299 83 y(4.7)92 b(Read-only)30 +b(rep)s(ository)f(access)19 b Fa(.)e(.)e(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.) +g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)h +(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)48 b Fs(28)0 332 y +Fm(5)135 b(Starting)46 b(a)f(pro)7 b(ject)46 b(with)f(CVS)17 +b Fb(.)i(.)h(.)g(.)f(.)h(.)g(.)g(.)g(.)f(.)h(.)g(.)g(.)g(.)f(.)h(.)g(.) +g(.)g(.)f(.)h(.)g(.)62 b Fm(31)299 488 y Fs(5.1)92 b(Setting)30 +b(up)f(the)i(\014les)21 b Fa(.)14 b(.)h(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)h +(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.) +g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)50 +b Fs(31)598 612 y(5.1.1)93 b(Creating)30 b(a)g(directory)g(tree)h(from) +f(a)h(n)m(um)m(b)s(er)e(of)h(\014les)18 b Fa(.)d(.)g(.)g(.)g(.)g(.)g(.) +g(.)g(.)47 b Fs(31)598 737 y(5.1.2)93 b(Creating)30 b(Files)f(F)-8 b(rom)31 b(Other)f(V)-8 b(ersion)30 b(Con)m(trol)g(Systems)18 -b Fa(.)c(.)h(.)g(.)g(.)47 b Fs(30)598 612 y(5.1.3)93 +b Fa(.)c(.)h(.)g(.)g(.)47 b Fs(32)598 861 y(5.1.3)93 b(Creating)30 b(a)g(directory)g(tree)h(from)f(scratc)m(h)15 b Fa(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.) -g(.)44 b Fs(31)299 737 y(5.2)92 b(De\014ning)29 b(the)i(mo)s(dule)15 +g(.)44 b Fs(33)299 986 y(5.2)92 b(De\014ning)29 b(the)i(mo)s(dule)15 b Fa(.)e(.)i(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.) g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g -(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)44 b Fs(31)0 986 y -Fm(6)135 b(Multiple)45 b(dev)l(elop)t(ers)22 b Fb(.)g(.)d(.)h(.)g(.)g +(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)44 b Fs(33)0 1235 +y Fm(6)135 b(Multiple)45 b(dev)l(elop)t(ers)22 b Fb(.)g(.)d(.)h(.)g(.)g (.)g(.)f(.)h(.)g(.)g(.)g(.)f(.)h(.)g(.)g(.)f(.)h(.)g(.)g(.)g(.)f(.)h(.) -g(.)g(.)g(.)f(.)h(.)g(.)g(.)g(.)67 b Fm(33)299 1142 y +g(.)g(.)g(.)f(.)h(.)g(.)g(.)g(.)67 b Fm(35)299 1391 y Fs(6.1)92 b(File)30 b(status)16 b Fa(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.) g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g (.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.) -g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)45 b Fs(33)299 1266 y(6.2)92 +g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)45 b Fs(35)299 1515 y(6.2)92 b(Bringing)29 b(a)h(\014le)g(up)f(to)i(date)22 b Fa(.)16 b(.)f(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g (.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.) -g(.)g(.)52 b Fs(34)299 1391 y(6.3)92 b(Con\015icts)29 +g(.)g(.)52 b Fs(36)299 1640 y(6.3)92 b(Con\015icts)29 b(example)24 b Fa(.)15 b(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.) g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g (.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)53 -b Fs(35)299 1515 y(6.4)92 b(Informing)28 b(others)j(ab)s(out)f(commits) +b Fs(37)299 1764 y(6.4)92 b(Informing)28 b(others)j(ab)s(out)f(commits) 13 b Fa(.)h(.)h(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g (.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)42 -b Fs(38)299 1640 y(6.5)92 b(Sev)m(eral)30 b(dev)m(elop)s(ers)g(sim)m +b Fs(40)299 1889 y(6.5)92 b(Sev)m(eral)30 b(dev)m(elop)s(ers)g(sim)m (ultaneously)e(attempting)j(to)g(run)e(CVS)20 b Fa(.)14 -b(.)h(.)g(.)g(.)g(.)g(.)g(.)49 b Fs(38)299 1764 y(6.6)92 +b(.)h(.)g(.)g(.)g(.)g(.)g(.)49 b Fs(40)299 2013 y(6.6)92 b(Mec)m(hanisms)30 b(to)h(trac)m(k)h(who)e(is)f(editing)g(\014les)10 b Fa(.)k(.)h(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.) -g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)39 b Fs(39)598 1889 y(6.6.1)93 +g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)39 b Fs(41)598 2138 y(6.6.1)93 b(T)-8 b(elling)28 b(CVS)i(to)h(w)m(atc)m(h)g(certain)g(\014les)14 b Fa(.)g(.)h(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.) -g(.)g(.)g(.)h(.)f(.)43 b Fs(40)598 2013 y(6.6.2)93 b(T)-8 +g(.)g(.)g(.)h(.)f(.)43 b Fs(42)598 2262 y(6.6.2)93 b(T)-8 b(elling)28 b(CVS)i(to)h(notify)e(y)m(ou)21 b Fa(.)15 b(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g -(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)50 b Fs(40)598 -2138 y(6.6.3)93 b(Ho)m(w)31 b(to)g(edit)f(a)g(\014le)g(whic)m(h)f(is)g +(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)50 b Fs(42)598 +2387 y(6.6.3)93 b(Ho)m(w)31 b(to)g(edit)f(a)g(\014le)g(whic)m(h)f(is)g (b)s(eing)g(w)m(atc)m(hed)16 b Fa(.)g(.)f(.)g(.)h(.)f(.)g(.)g(.)g(.)g -(.)g(.)g(.)g(.)g(.)g(.)45 b Fs(42)598 2262 y(6.6.4)93 +(.)g(.)g(.)g(.)g(.)g(.)45 b Fs(44)598 2511 y(6.6.4)93 b(Information)29 b(ab)s(out)h(who)g(is)f(w)m(atc)m(hing)i(and)f (editing)c Fa(.)15 b(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)57 -b Fs(43)598 2387 y(6.6.5)93 b(Using)29 b(w)m(atc)m(hes)j(with)d(old)h +b Fs(45)598 2636 y(6.6.5)93 b(Using)29 b(w)m(atc)m(hes)j(with)d(old)h (v)m(ersions)f(of)i(CVS)23 b Fa(.)14 b(.)h(.)g(.)g(.)g(.)g(.)g(.)g(.)g -(.)g(.)g(.)g(.)g(.)g(.)g(.)52 b Fs(43)299 2511 y(6.7)92 +(.)g(.)g(.)g(.)g(.)g(.)g(.)52 b Fs(45)299 2760 y(6.7)92 b(Cho)s(osing)29 b(b)s(et)m(w)m(een)i(reserv)m(ed)f(or)h(unreserv)m(ed) e(c)m(hec)m(k)m(outs)19 b Fa(.)f(.)d(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.) -g(.)g(.)g(.)48 b Fs(44)0 2760 y Fm(7)135 b(Branc)l(hes)30 +g(.)g(.)g(.)48 b Fs(46)0 3010 y Fm(7)135 b(Branc)l(hes)30 b Fb(.)19 b(.)h(.)g(.)g(.)f(.)h(.)g(.)g(.)g(.)f(.)h(.)g(.)g(.)g(.)f(.)h (.)g(.)g(.)g(.)f(.)h(.)g(.)g(.)f(.)h(.)g(.)g(.)g(.)f(.)h(.)g(.)g(.)g(.) -f(.)h(.)g(.)g(.)g(.)f(.)h(.)g(.)75 b Fm(45)299 2916 y +f(.)h(.)g(.)g(.)g(.)f(.)h(.)g(.)75 b Fm(47)299 3165 y Fs(7.1)92 b(T)-8 b(ags{Sym)m(b)s(olic)30 b(revisions)21 b Fa(.)15 b(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g (.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.) -g(.)g(.)g(.)g(.)g(.)53 b Fs(45)299 3041 y(7.2)92 b(What)31 +g(.)g(.)g(.)g(.)g(.)53 b Fs(47)299 3290 y(7.2)92 b(What)31 b(branc)m(hes)f(are)h(go)s(o)s(d)f(for)12 b Fa(.)j(.)g(.)g(.)g(.)g(.)g (.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.) g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)42 b -Fs(47)299 3165 y(7.3)92 b(Creating)30 b(a)h(branc)m(h)16 +Fs(49)299 3414 y(7.3)92 b(Creating)30 b(a)h(branc)m(h)16 b Fa(.)e(.)h(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.) g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g -(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)45 b Fs(48)299 -3290 y(7.4)92 b(Stic)m(ky)30 b(tags)g Fa(.)15 b(.)g(.)g(.)g(.)g(.)g(.)g +(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)45 b Fs(50)299 +3539 y(7.4)92 b(Stic)m(ky)30 b(tags)g Fa(.)15 b(.)g(.)g(.)g(.)g(.)g(.)g (.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.) f(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g -(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)58 b Fs(49)0 3539 +(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)58 b Fs(51)0 3788 y Fm(8)135 b(Merging)25 b Fb(.)20 b(.)g(.)f(.)h(.)g(.)g(.)f(.)h(.)g(.)g (.)g(.)f(.)h(.)g(.)g(.)g(.)f(.)h(.)g(.)g(.)g(.)f(.)h(.)g(.)g(.)f(.)h(.) g(.)g(.)g(.)f(.)h(.)g(.)g(.)g(.)f(.)h(.)g(.)g(.)g(.)f(.)h(.)70 -b Fm(51)299 3694 y Fs(8.1)92 b(Merging)30 b(an)h(en)m(tire)f(branc)m(h) +b Fm(53)299 3944 y Fs(8.1)92 b(Merging)30 b(an)h(en)m(tire)f(branc)m(h) 23 b Fa(.)14 b(.)h(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g (.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.) -g(.)g(.)g(.)g(.)g(.)52 b Fs(51)299 3819 y(8.2)92 b(Merging)30 +g(.)g(.)g(.)g(.)g(.)52 b Fs(53)299 4068 y(8.2)92 b(Merging)30 b(from)g(a)h(branc)m(h)f(sev)m(eral)g(times)12 b Fa(.)k(.)f(.)g(.)g(.)g (.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.) -g(.)g(.)g(.)g(.)g(.)42 b Fs(52)299 3944 y(8.3)92 b(Merging)30 +g(.)g(.)g(.)g(.)g(.)42 b Fs(54)299 4193 y(8.3)92 b(Merging)30 b(di\013erences)g(b)s(et)m(w)m(een)h(an)m(y)g(t)m(w)m(o)g(revisions)18 b Fa(.)13 b(.)i(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g -(.)g(.)g(.)47 b Fs(53)299 4068 y(8.4)92 b(Merging)30 +(.)g(.)g(.)47 b Fs(55)299 4317 y(8.4)92 b(Merging)30 b(can)h(add)f(or)g(remo)m(v)m(e)i(\014les)19 b Fa(.)14 b(.)h(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g (.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)48 -b Fs(53)0 4317 y Fm(9)135 b(Recursiv)l(e)46 b(b)t(eha)l(vior)16 +b Fs(55)0 4566 y Fm(9)135 b(Recursiv)l(e)46 b(b)t(eha)l(vior)16 b Fb(.)k(.)g(.)g(.)g(.)f(.)h(.)g(.)g(.)g(.)f(.)h(.)g(.)g(.)f(.)h(.)g(.) g(.)g(.)f(.)h(.)g(.)g(.)g(.)f(.)h(.)g(.)g(.)g(.)f(.)h(.)g(.)61 -b Fm(55)0 4597 y(10)135 b(Adding)44 b(\014les)h(to)h(a)f(directory)17 +b Fm(57)0 4846 y(10)135 b(Adding)44 b(\014les)h(to)h(a)f(directory)17 b Fb(.)j(.)g(.)g(.)g(.)g(.)f(.)h(.)g(.)g(.)g(.)f(.)h(.)g(.)g(.)f(.)h(.) -g(.)g(.)g(.)f(.)h(.)g(.)62 b Fm(57)0 4878 y(11)135 b(Remo)l(ving)46 +g(.)g(.)g(.)f(.)h(.)g(.)62 b Fm(59)0 5127 y(11)135 b(Remo)l(ving)46 b(\014les)31 b Fb(.)20 b(.)g(.)f(.)h(.)g(.)g(.)f(.)h(.)g(.)g(.)g(.)f(.) h(.)g(.)g(.)g(.)f(.)h(.)g(.)g(.)g(.)f(.)h(.)g(.)g(.)g(.)f(.)h(.)g(.)g -(.)f(.)h(.)g(.)g(.)75 b Fm(59)0 5158 y(12)135 b(Remo)l(ving)46 +(.)f(.)h(.)g(.)g(.)75 b Fm(61)p eop +%%Page: -5 177 +-5 176 bop 3852 -116 a Fs(v)0 83 y Fm(12)135 b(Remo)l(ving)46 b(directories)33 b Fb(.)20 b(.)g(.)g(.)f(.)h(.)g(.)g(.)g(.)f(.)h(.)g(.) g(.)f(.)h(.)g(.)g(.)g(.)f(.)h(.)g(.)g(.)g(.)f(.)h(.)g(.)g(.)g(.)76 -b Fm(61)p eop -%%Page: -5 175 --5 174 bop 3852 -116 a Fs(v)0 83 y Fm(13)135 b(T)-11 -b(rac)l(king)45 b(third-part)l(y)g(sources)12 b Fb(.)20 -b(.)g(.)g(.)f(.)h(.)g(.)g(.)f(.)h(.)g(.)g(.)g(.)f(.)h(.)g(.)g(.)g(.)f -(.)h(.)g(.)57 b Fm(63)299 239 y Fs(13.1)92 b(Imp)s(orting)29 -b(a)i(mo)s(dule)d(for)j(the)f(\014rst)g(time)19 b Fa(.)c(.)g(.)g(.)g(.) -g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g -(.)g(.)g(.)h(.)48 b Fs(63)299 363 y(13.2)92 b(Up)s(dating)29 -b(a)i(mo)s(dule)e(with)g(the)i(imp)s(ort)d(command)10 -b Fa(.)15 b(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g -(.)g(.)39 b Fs(64)299 488 y(13.3)92 b(Rev)m(erting)31 +b Fm(63)0 363 y(13)135 b(T)-11 b(rac)l(king)45 b(third-part)l(y)g +(sources)12 b Fb(.)20 b(.)g(.)g(.)f(.)h(.)g(.)g(.)f(.)h(.)g(.)g(.)g(.)f +(.)h(.)g(.)g(.)g(.)f(.)h(.)g(.)57 b Fm(65)299 519 y Fs(13.1)92 +b(Imp)s(orting)29 b(a)i(mo)s(dule)d(for)j(the)f(\014rst)g(time)19 +b Fa(.)c(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.) +g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)48 b Fs(65)299 643 +y(13.2)92 b(Up)s(dating)29 b(a)i(mo)s(dule)e(with)g(the)i(imp)s(ort)d +(command)10 b Fa(.)15 b(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g +(.)g(.)g(.)g(.)g(.)39 b Fs(66)299 768 y(13.3)92 b(Rev)m(erting)31 b(to)g(the)g(latest)g(v)m(endor)f(release)16 b Fa(.)f(.)g(.)g(.)g(.)g (.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.) -g(.)g(.)g(.)45 b Fs(64)299 612 y(13.4)92 b(Ho)m(w)31 +g(.)g(.)g(.)45 b Fs(66)299 892 y(13.4)92 b(Ho)m(w)31 b(to)h(handle)d(binary)f(\014les)h(with)h(cvs)g(imp)s(ort)14 b Fa(.)g(.)h(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.) -g(.)g(.)g(.)g(.)44 b Fs(65)0 861 y Fm(14)135 b(Mo)l(ving)45 +g(.)g(.)g(.)g(.)44 b Fs(67)0 1142 y Fm(14)135 b(Mo)l(ving)45 b(and)g(renaming)h(\014les)12 b Fb(.)20 b(.)f(.)h(.)g(.)g(.)f(.)h(.)g (.)g(.)g(.)f(.)h(.)g(.)g(.)g(.)f(.)h(.)g(.)g(.)g(.)f(.)h(.)57 -b Fm(67)299 1017 y Fs(14.1)92 b(The)30 b(Normal)g(w)m(a)m(y)i(to)f +b Fm(69)299 1297 y Fs(14.1)92 b(The)30 b(Normal)g(w)m(a)m(y)i(to)f (Rename)26 b Fa(.)16 b(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g (.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.) -g(.)g(.)g(.)56 b Fs(67)299 1142 y(14.2)92 b(Mo)m(ving)31 +g(.)g(.)g(.)56 b Fs(69)299 1422 y(14.2)92 b(Mo)m(ving)31 b(the)g(history)e(\014le)9 b Fa(.)14 b(.)h(.)g(.)g(.)g(.)g(.)g(.)g(.)g (.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.) g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)38 -b Fs(67)299 1266 y(14.3)92 b(Cop)m(ying)30 b(the)h(history)e(\014le)14 +b Fs(69)299 1546 y(14.3)92 b(Cop)m(ying)30 b(the)h(history)e(\014le)14 b Fa(.)g(.)h(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.) g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g -(.)g(.)g(.)g(.)g(.)43 b Fs(68)0 1515 y Fm(15)135 b(Mo)l(ving)45 +(.)g(.)g(.)g(.)g(.)43 b Fs(70)0 1795 y Fm(15)135 b(Mo)l(ving)45 b(and)g(renaming)h(directories)13 b Fb(.)21 b(.)f(.)f(.)h(.)g(.)g(.)g -(.)f(.)h(.)g(.)g(.)f(.)h(.)g(.)g(.)58 b Fm(71)0 1795 +(.)f(.)h(.)g(.)g(.)f(.)h(.)g(.)g(.)58 b Fm(73)0 2076 y(16)135 b(History)46 b(bro)l(wsing)11 b Fb(.)20 b(.)g(.)g(.)g(.)g(.)f (.)h(.)g(.)g(.)f(.)h(.)g(.)g(.)g(.)f(.)h(.)g(.)g(.)g(.)f(.)h(.)g(.)g(.) -g(.)f(.)h(.)g(.)g(.)f(.)h(.)g(.)g(.)56 b Fm(73)299 1951 +g(.)f(.)h(.)g(.)g(.)f(.)h(.)g(.)g(.)56 b Fm(75)299 2231 y Fs(16.1)92 b(Log)31 b(messages)22 b Fa(.)17 b(.)e(.)g(.)g(.)g(.)g(.)g (.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.) g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g -(.)g(.)g(.)g(.)g(.)g(.)52 b Fs(73)299 2076 y(16.2)92 +(.)g(.)g(.)g(.)g(.)g(.)52 b Fs(75)299 2356 y(16.2)92 b(The)30 b(history)g(database)18 b Fa(.)e(.)f(.)g(.)g(.)g(.)g(.)g(.)g (.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.) g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)48 -b Fs(73)299 2200 y(16.3)92 b(User-de\014ned)30 b(logging)15 +b Fs(75)299 2480 y(16.3)92 b(User-de\014ned)30 b(logging)15 b Fa(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.) g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g -(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)44 b Fs(73)299 2325 y(16.4)92 +(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)44 b Fs(75)299 2605 y(16.4)92 b(Annotate)32 b(command)25 b Fa(.)15 b(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g (.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.) g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)55 -b Fs(74)0 2574 y Fm(17)135 b(Keyw)l(ord)46 b(substitution)16 +b Fs(76)0 2854 y Fm(17)135 b(Keyw)l(ord)46 b(substitution)16 b Fb(.)21 b(.)f(.)f(.)h(.)g(.)g(.)g(.)f(.)h(.)g(.)g(.)g(.)f(.)h(.)g(.)g -(.)g(.)f(.)h(.)g(.)g(.)f(.)h(.)g(.)g(.)g(.)f(.)62 b Fm(75)299 -2729 y Fs(17.1)92 b(R)m(CS)30 b(Keyw)m(ords)10 b Fa(.)15 +(.)g(.)f(.)h(.)g(.)g(.)f(.)h(.)g(.)g(.)g(.)f(.)62 b Fm(77)299 +3010 y Fs(17.1)92 b(R)m(CS)30 b(Keyw)m(ords)10 b Fa(.)15 b(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g (.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.) -g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)39 b Fs(75)299 -2854 y(17.2)92 b(Using)30 b(k)m(eyw)m(ords)22 b Fa(.)15 +g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)39 b Fs(77)299 +3134 y(17.2)92 b(Using)30 b(k)m(eyw)m(ords)22 b Fa(.)15 b(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g (.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.) -g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)51 b Fs(76)299 -2978 y(17.3)92 b(Av)m(oiding)30 b(substitution)9 b Fa(.)j(.)j(.)g(.)g +g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)51 b Fs(78)299 +3259 y(17.3)92 b(Av)m(oiding)30 b(substitution)9 b Fa(.)j(.)j(.)g(.)g (.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.) g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g -(.)g(.)38 b Fs(77)299 3103 y(17.4)92 b(Substitution)28 +(.)g(.)38 b Fs(79)299 3383 y(17.4)92 b(Substitution)28 b(mo)s(des)11 b Fa(.)k(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g (.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.) g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)40 b -Fs(77)299 3227 y(17.5)92 b(Problems)29 b(with)g(the)i($Log: cvs.ps,v $ -Fs(77)299 3227 y(17.5)92 b(Problems)29 b(with)g(the)i(Revision 1.1.1.6 1997/02/21 06:47:01 tholo -Fs(77)299 3227 y(17.5)92 b(Problems)29 b(with)g(the)i(Missed files from new release from Cyclic Software -Fs(77)299 3227 y(17.5)92 b(Problems)29 b(with)g(the)i()h(k)m(eyw)m +Fs(79)299 3508 y(17.5)92 b(Problems)29 b(with)g(the)i($Log: cvs.ps,v $ +Fs(79)299 3508 y(17.5)92 b(Problems)29 b(with)g(the)i(Revision 1.1.1.7 1997/03/18 02:05:33 tholo +Fs(79)299 3508 y(17.5)92 b(Problems)29 b(with)g(the)i(Files missed from previous import +Fs(79)299 3508 y(17.5)92 b(Problems)29 b(with)g(the)i()h(k)m(eyw)m (ord.)26 b Fa(.)15 b(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.) g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)55 -b Fs(78)0 3477 y Fm(18)135 b(Handling)45 b(binary)g(\014les)11 +b Fs(80)0 3757 y Fm(18)135 b(Handling)45 b(binary)g(\014les)11 b Fb(.)21 b(.)f(.)g(.)f(.)h(.)g(.)g(.)g(.)f(.)h(.)g(.)g(.)g(.)f(.)h(.)g (.)g(.)g(.)f(.)h(.)g(.)g(.)g(.)f(.)h(.)g(.)g(.)f(.)57 -b Fm(79)0 3757 y(19)135 b(Ho)l(w)46 b(y)l(our)f(build)f(system)i(in)l +b Fm(81)0 4037 y(19)135 b(Ho)l(w)46 b(y)l(our)f(build)f(system)i(in)l (teracts)g(with)g(CVS)25 b Fb(.)19 b(.)g(.)h(.)g(.)70 -b Fm(81)0 4037 y(20)135 b(Compatibilit)l(y)47 b(b)t(et)l(w)l(een)f(CVS) +b Fm(83)0 4317 y(20)135 b(Compatibilit)l(y)47 b(b)t(et)l(w)l(een)f(CVS) f(V)-11 b(ersions)33 b Fb(.)20 b(.)f(.)h(.)g(.)g(.)g(.)f(.)h(.)g(.)g(.) -78 b Fm(83)0 4317 y(21)135 b(Revision)46 b(managemen)l(t)40 +78 b Fm(85)0 4597 y(21)135 b(Revision)46 b(managemen)l(t)40 b Fb(.)20 b(.)f(.)h(.)g(.)g(.)f(.)h(.)g(.)g(.)g(.)f(.)h(.)g(.)g(.)g(.)f -(.)h(.)g(.)g(.)g(.)f(.)h(.)g(.)g(.)f(.)h(.)83 b Fm(85)299 -4473 y Fs(21.1)92 b(When)31 b(to)g(commit?)16 b Fa(.)f(.)g(.)g(.)g(.)g +(.)h(.)g(.)g(.)g(.)f(.)h(.)g(.)g(.)f(.)h(.)83 b Fm(87)299 +4753 y Fs(21.1)92 b(When)31 b(to)g(commit?)16 b Fa(.)f(.)g(.)g(.)g(.)g (.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.) g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g -(.)g(.)g(.)g(.)46 b Fs(85)0 4722 y Fm(App)t(endix)e(A)134 -b(Guide)44 b(to)i(CVS)e(commands)30 b Fb(.)20 b(.)g(.)g(.)f(.)h(.)g(.)g -(.)g(.)f(.)h(.)g(.)g(.)75 b Fm(87)299 4878 y Fs(A.1)92 -b(Ov)m(erall)29 b(structure)h(of)h(CVS)e(commands)g Fa(.)15 -b(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g -(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)58 b Fs(87)299 5002 -y(A.2)92 b(Default)30 b(options)g(and)g(the)g Fn(~)p -Fs(/.cvsrc)h(\014le)10 b Fa(.)k(.)h(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g -(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)39 -b Fs(87)299 5127 y(A.3)92 b(Global)29 b(options)9 b Fa(.)15 -b(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)h -(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.) -g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)39 b -Fs(89)299 5251 y(A.4)92 b(Common)30 b(command)g(options)13 +(.)g(.)g(.)g(.)46 b Fs(87)p eop +%%Page: -6 178 +-6 177 bop 0 -116 a Fs(vi)2427 b(CVS|Concurren)m(t)29 +b(V)-8 b(ersions)30 b(System)0 83 y Fm(App)t(endix)44 +b(A)134 b(Guide)44 b(to)i(CVS)e(commands)30 b Fb(.)20 +b(.)g(.)g(.)f(.)h(.)g(.)g(.)g(.)f(.)h(.)g(.)g(.)75 b +Fm(89)299 239 y Fs(A.1)92 b(Ov)m(erall)29 b(structure)h(of)h(CVS)e +(commands)g Fa(.)15 b(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g +(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)58 +b Fs(89)299 363 y(A.2)92 b(Default)30 b(options)g(and)g(the)g +Fn(~)p Fs(/.cvsrc)h(\014le)10 b Fa(.)k(.)h(.)g(.)g(.)g(.)g(.)g(.)g(.)g +(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.) +g(.)39 b Fs(89)299 488 y(A.3)92 b(Global)29 b(options)9 +b Fa(.)15 b(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g +(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.) +g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)39 +b Fs(91)299 612 y(A.4)92 b(Common)30 b(command)g(options)13 b Fa(.)h(.)h(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.) g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g -(.)g(.)42 b Fs(90)p eop -%%Page: -6 176 --6 175 bop 0 -116 a Fs(vi)2427 b(CVS|Concurren)m(t)29 -b(V)-8 b(ersions)30 b(System)299 83 y(A.5)92 b(admin|Administration)26 +(.)g(.)42 b Fs(92)299 737 y(A.5)92 b(admin|Administration)26 b(fron)m(t)k(end)g(for)g(rcs)f Fa(.)15 b(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.) g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)58 -b Fs(93)598 208 y(A.5.1)92 b(admin)29 b(options)d Fa(.)15 +b Fs(95)598 861 y(A.5.1)92 b(admin)29 b(options)d Fa(.)15 b(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g (.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.) -g(.)g(.)g(.)55 b Fs(93)598 332 y(A.5.2)92 b(admin)29 +g(.)g(.)g(.)55 b Fs(95)598 986 y(A.5.2)92 b(admin)29 b(examples)11 b Fa(.)k(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g (.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.) -g(.)g(.)g(.)g(.)g(.)g(.)g(.)40 b Fs(96)897 457 y(A.5.2.1)93 +g(.)g(.)g(.)g(.)g(.)g(.)g(.)40 b Fs(98)897 1110 y(A.5.2.1)93 b(Outdating)29 b(is)h(dangerous)24 b Fa(.)15 b(.)g(.)g(.)g(.)g(.)g(.)g (.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)54 -b Fs(96)897 581 y(A.5.2.2)93 b(Commen)m(t)31 b(leaders)16 +b Fs(98)897 1235 y(A.5.2.2)93 b(Commen)m(t)31 b(leaders)16 b Fa(.)e(.)h(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.) -g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)45 b Fs(96)299 -706 y(A.6)92 b(c)m(hec)m(k)m(out|Chec)m(k)33 b(out)d(sources)h(for)f +g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)45 b Fs(98)299 +1359 y(A.6)92 b(c)m(hec)m(k)m(out|Chec)m(k)33 b(out)d(sources)h(for)f (editing)19 b Fa(.)14 b(.)h(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g -(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)48 b Fs(97)598 -830 y(A.6.1)92 b(c)m(hec)m(k)m(out)33 b(options)21 b -Fa(.)15 b(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g -(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.) -f(.)g(.)g(.)50 b Fs(98)598 955 y(A.6.2)92 b(c)m(hec)m(k)m(out)33 -b(examples)27 b Fa(.)15 b(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f -(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.) -g(.)g(.)g(.)g(.)g(.)57 b Fs(99)299 1079 y(A.7)92 b(commit|Chec)m(k)30 -b(\014les)g(in)m(to)g(the)h(rep)s(ository)23 b Fa(.)15 -b(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g -(.)g(.)g(.)g(.)g(.)g(.)54 b Fs(99)598 1204 y(A.7.1)92 -b(commit)31 b(options)21 b Fa(.)14 b(.)h(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.) -g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g -(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)51 b Fs(100)598 -1328 y(A.7.2)92 b(commit)31 b(examples)c Fa(.)15 b(.)g(.)g(.)g(.)g(.)g +(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)48 b Fs(99)598 +1484 y(A.6.1)92 b(c)m(hec)m(k)m(out)33 b(options)20 b +Fa(.)14 b(.)h(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g (.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.) -g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)57 b Fs(101)897 -1453 y(A.7.2.1)93 b(New)30 b(ma)5 b(jor)31 b(release)f(n)m(um)m(b)s(er) -21 b Fa(.)15 b(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g -(.)g(.)g(.)51 b Fs(101)897 1577 y(A.7.2.2)93 b(Committing)29 +g(.)g(.)50 b Fs(100)598 1609 y(A.6.2)92 b(c)m(hec)m(k)m(out)33 +b(examples)26 b Fa(.)15 b(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g +(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.) +g(.)g(.)g(.)g(.)56 b Fs(101)299 1733 y(A.7)92 b(commit|Chec)m(k)30 +b(\014les)g(in)m(to)g(the)h(rep)s(ository)23 b Fa(.)14 +b(.)h(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g +(.)g(.)g(.)g(.)g(.)53 b Fs(101)598 1858 y(A.7.1)92 b(commit)31 +b(options)21 b Fa(.)14 b(.)h(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.) +g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g +(.)g(.)g(.)g(.)g(.)g(.)g(.)51 b Fs(102)598 1982 y(A.7.2)92 +b(commit)31 b(examples)c Fa(.)15 b(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g +(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.) +g(.)g(.)g(.)g(.)g(.)g(.)g(.)57 b Fs(103)897 2107 y(A.7.2.1)93 +b(New)30 b(ma)5 b(jor)31 b(release)f(n)m(um)m(b)s(er)21 +b Fa(.)15 b(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g +(.)g(.)51 b Fs(103)897 2231 y(A.7.2.2)93 b(Committing)29 b(to)i(a)g(branc)m(h)26 b Fa(.)15 b(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g -(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)56 b Fs(102)897 -1702 y(A.7.2.3)93 b(Creating)30 b(the)g(branc)m(h)g(after)h(editing)23 +(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)56 b Fs(104)897 +2356 y(A.7.2.3)93 b(Creating)30 b(the)g(branc)m(h)g(after)h(editing)23 b Fa(.)14 b(.)h(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)53 -b Fs(102)299 1826 y(A.8)92 b(di\013|Run)28 b(di\013s)h(b)s(et)m(w)m +b Fs(104)299 2480 y(A.8)92 b(di\013|Run)28 b(di\013s)h(b)s(et)m(w)m (een)i(revisions)12 b Fa(.)h(.)i(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.) g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g -(.)42 b Fs(103)598 1951 y(A.8.1)92 b(di\013)29 b(options)20 +(.)42 b Fs(105)598 2605 y(A.8.1)92 b(di\013)29 b(options)20 b Fa(.)14 b(.)h(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g (.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.) -g(.)g(.)g(.)h(.)f(.)g(.)g(.)49 b Fs(103)598 2076 y(A.8.2)92 +g(.)g(.)g(.)h(.)f(.)g(.)g(.)49 b Fs(105)598 2729 y(A.8.2)92 b(di\013)29 b(examples)d Fa(.)15 b(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g (.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.) -g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)56 b Fs(104)299 -2200 y(A.9)92 b(exp)s(ort|Exp)s(ort)29 b(sources)h(from)g(CVS,)g +g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)56 b Fs(106)299 +2854 y(A.9)92 b(exp)s(ort|Exp)s(ort)29 b(sources)h(from)g(CVS,)g (similar)e(to)j(c)m(hec)m(k)m(out)e Fa(.)15 b(.)g(.)g(.)g(.)g(.)g(.)g -(.)g(.)56 b Fs(105)598 2325 y(A.9.1)92 b(exp)s(ort)30 +(.)g(.)56 b Fs(107)598 2978 y(A.9.1)92 b(exp)s(ort)30 b(options)20 b Fa(.)15 b(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.) g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g -(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)49 b Fs(105)299 2449 y(A.10)92 +(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)49 b Fs(107)299 3103 y(A.10)92 b(history|Sho)m(w)29 b(status)i(of)f(\014les)f(and)h(users)24 b Fa(.)15 b(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f -(.)g(.)g(.)g(.)g(.)g(.)g(.)54 b Fs(106)598 2574 y(A.10.1)93 +(.)g(.)g(.)g(.)g(.)g(.)g(.)54 b Fs(108)598 3227 y(A.10.1)93 b(history)29 b(options)9 b Fa(.)15 b(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.) g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g -(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)39 b Fs(106)299 -2698 y(A.11)92 b(imp)s(ort|Imp)s(ort)28 b(sources)i(in)m(to)h(CVS,)e +(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)39 b Fs(108)299 +3352 y(A.11)92 b(imp)s(ort|Imp)s(ort)28 b(sources)i(in)m(to)h(CVS,)e (using)g(v)m(endor)i(branc)m(hes)13 b Fa(.)h(.)h(.)g(.)g(.)g(.)43 -b Fs(108)598 2823 y(A.11.1)93 b(imp)s(ort)28 b(options)12 +b Fs(110)598 3477 y(A.11.1)93 b(imp)s(ort)28 b(options)12 b Fa(.)j(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.) f(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g -(.)g(.)g(.)42 b Fs(109)598 2947 y(A.11.2)93 b(imp)s(ort)28 +(.)g(.)g(.)42 b Fs(111)598 3601 y(A.11.2)93 b(imp)s(ort)28 b(output)23 b Fa(.)15 b(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g (.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.) -g(.)g(.)g(.)g(.)g(.)g(.)52 b Fs(110)598 3072 y(A.11.3)93 +g(.)g(.)g(.)g(.)g(.)g(.)52 b Fs(112)598 3726 y(A.11.3)93 b(imp)s(ort)28 b(examples)19 b Fa(.)c(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g (.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.) -g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)48 b Fs(110)299 3196 +g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)48 b Fs(112)299 3850 y(A.12)92 b(log|Prin)m(t)30 b(out)g(log)h(information)d(for)i(\014les) 25 b Fa(.)15 b(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g -(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)55 b Fs(110)598 3321 y(A.12.1)93 +(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)55 b Fs(113)598 3975 y(A.12.1)93 b(log)30 b(options)24 b Fa(.)15 b(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g (.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.) g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)54 b -Fs(111)598 3445 y(A.12.2)93 b(log)30 b(examples)10 b +Fs(113)598 4099 y(A.12.2)93 b(log)30 b(examples)10 b Fa(.)15 b(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g (.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.) -g(.)h(.)f(.)g(.)g(.)39 b Fs(112)299 3570 y(A.13)92 b(rdi\013|'patc)m +g(.)h(.)f(.)g(.)g(.)39 b Fs(114)299 4224 y(A.13)92 b(rdi\013|'patc)m (h')30 b(format)h(di\013s)e(b)s(et)m(w)m(een)i(releases)9 b Fa(.)15 b(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g -(.)g(.)g(.)g(.)39 b Fs(112)598 3694 y(A.13.1)93 b(rdi\013)28 +(.)g(.)g(.)g(.)39 b Fs(115)598 4348 y(A.13.1)93 b(rdi\013)28 b(options)22 b Fa(.)15 b(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.) g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g -(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)52 b Fs(113)598 3819 +(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)52 b Fs(115)598 4473 y(A.13.2)93 b(rdi\013)28 b(examples)h Fa(.)15 b(.)g(.)g(.)g(.)g(.)g(.)g (.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.) g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)58 b -Fs(114)299 3944 y(A.14)92 b(release|Indicate)30 b(that)h(a)g(Mo)s(dule) +Fs(116)299 4597 y(A.14)92 b(release|Indicate)30 b(that)h(a)g(Mo)s(dule) e(is)h(no)g(longer)g(in)f(use)15 b Fa(.)f(.)i(.)f(.)g(.)g(.)g(.)g(.)g -(.)g(.)g(.)g(.)44 b Fs(114)598 4068 y(A.14.1)93 b(release)30 +(.)g(.)g(.)g(.)44 b Fs(116)598 4722 y(A.14.1)93 b(release)30 b(options)16 b Fa(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g (.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.) -g(.)g(.)g(.)h(.)f(.)g(.)45 b Fs(115)598 4193 y(A.14.2)93 +g(.)g(.)g(.)h(.)f(.)g(.)45 b Fs(117)598 4846 y(A.14.2)93 b(release)30 b(output)c Fa(.)15 b(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g (.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.) -g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)56 b Fs(115)598 4317 +g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)56 b Fs(117)598 4971 y(A.14.3)93 b(release)30 b(examples)22 b Fa(.)15 b(.)g(.)g(.)g(.)g(.)g (.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.) -g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)52 b Fs(116)299 -4442 y(A.15)92 b(rtag|Add)30 b(a)h(sym)m(b)s(olic)e(tag)i(to)h(a)e(mo)s +g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)52 b Fs(118)299 +5095 y(A.15)92 b(rtag|Add)30 b(a)h(sym)m(b)s(olic)e(tag)i(to)h(a)e(mo)s (dule)22 b Fa(.)15 b(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.) -g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)53 b Fs(116)598 4566 +g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)53 b Fs(118)598 5220 y(A.15.1)93 b(rtag)31 b(options)23 b Fa(.)15 b(.)g(.)g(.)g(.)g(.)g(.)g (.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.) g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)53 -b Fs(117)299 4691 y(A.16)92 b(status|Displa)m(y)30 b(status)h -(information)d(on)j(c)m(hec)m(k)m(ed)h(out)f(\014les)20 -b Fa(.)13 b(.)i(.)g(.)g(.)g(.)h(.)f(.)49 b Fs(117)598 -4815 y(A.16.1)93 b(status)30 b(options)e Fa(.)15 b(.)g(.)g(.)g(.)g(.)g +b Fs(119)p eop +%%Page: -7 179 +-7 178 bop 3802 -116 a Fs(vii)299 203 y(A.16)92 b(status|Displa)m(y)30 +b(status)h(information)d(on)j(c)m(hec)m(k)m(ed)h(out)f(\014les)20 +b Fa(.)13 b(.)i(.)g(.)g(.)g(.)h(.)f(.)49 b Fs(119)598 +328 y(A.16.1)93 b(status)30 b(options)e Fa(.)15 b(.)g(.)g(.)g(.)g(.)g (.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.) g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)58 -b Fs(118)299 4940 y(A.17)92 b(tag|Add)31 b(a)g(sym)m(b)s(olic)d(tag)k +b Fs(120)299 452 y(A.17)92 b(tag|Add)31 b(a)g(sym)m(b)s(olic)d(tag)k (to)f(c)m(hec)m(k)m(ed)h(out)f(v)m(ersions)f(of)g(\014les)21 -b Fa(.)14 b(.)h(.)g(.)g(.)g(.)g(.)51 b Fs(118)598 5064 +b Fa(.)14 b(.)h(.)g(.)g(.)g(.)g(.)51 b Fs(120)598 577 y(A.17.1)93 b(tag)31 b(options)20 b Fa(.)14 b(.)h(.)g(.)h(.)f(.)g(.)g (.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.) g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)49 -b Fs(119)299 5189 y(A.18)92 b(up)s(date|Bring)29 b(w)m(ork)h(tree)h(in) -e(sync)h(with)g(rep)s(ository)16 b Fa(.)e(.)h(.)g(.)g(.)g(.)g(.)g(.)g -(.)g(.)g(.)g(.)g(.)g(.)46 b Fs(120)598 5313 y(A.18.1)93 -b(up)s(date)29 b(options)10 b Fa(.)k(.)i(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.) -g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g -(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)39 b Fs(120)p -eop -%%Page: -7 177 --7 176 bop 3802 -116 a Fs(vii)598 83 y(A.18.2)93 b(up)s(date)29 -b(output)20 b Fa(.)15 b(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g -(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.) -g(.)g(.)g(.)g(.)g(.)g(.)50 b Fs(122)598 208 y(A.18.3)93 -b(up)s(date)29 b(examples)16 b Fa(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g +b Fs(121)299 701 y(A.18)92 b(up)s(date|Bring)29 b(w)m(ork)h(tree)h(in)e +(sync)h(with)g(rep)s(ository)16 b Fa(.)e(.)h(.)g(.)g(.)g(.)g(.)g(.)g(.) +g(.)g(.)g(.)g(.)g(.)46 b Fs(122)598 826 y(A.18.1)93 b(up)s(date)29 +b(options)10 b Fa(.)k(.)i(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g +(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.) +g(.)g(.)g(.)g(.)g(.)h(.)39 b Fs(122)598 950 y(A.18.2)93 +b(up)s(date)29 b(output)20 b Fa(.)15 b(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g (.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.) -g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)46 b Fs(123)0 457 y Fm(App)t(endix)e(B) -134 b(Quic)l(k)45 b(reference)h(to)f(CVS)f(commands)25 -b Fb(.)20 b(.)70 b Fm(125)0 737 y(App)t(endix)44 b(C)134 -b(Reference)46 b(man)l(ual)g(for)f(the)h(Administrativ)l(e)269 -861 y(\014les)34 b Fb(.)20 b(.)g(.)g(.)f(.)h(.)g(.)g(.)f(.)h(.)g(.)g(.) -g(.)f(.)h(.)g(.)g(.)g(.)f(.)h(.)g(.)g(.)g(.)f(.)h(.)g(.)g(.)g(.)f(.)h -(.)g(.)g(.)f(.)h(.)g(.)g(.)g(.)f(.)h(.)g(.)g(.)g(.)f(.)h(.)g(.)78 -b Fm(135)299 1017 y Fs(C.1)91 b(The)30 b(mo)s(dules)f(\014le)14 +g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)50 b Fs(124)598 +1075 y(A.18.3)93 b(up)s(date)29 b(examples)16 b Fa(.)f(.)g(.)g(.)g(.)g +(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.) +g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)46 b +Fs(125)0 1324 y Fm(App)t(endix)e(B)134 b(Quic)l(k)45 +b(reference)h(to)f(CVS)f(commands)25 b Fb(.)20 b(.)70 +b Fm(127)0 1604 y(App)t(endix)44 b(C)134 b(Reference)46 +b(man)l(ual)g(for)f(the)h(Administrativ)l(e)269 1729 +y(\014les)34 b Fb(.)20 b(.)g(.)g(.)f(.)h(.)g(.)g(.)f(.)h(.)g(.)g(.)g(.) +f(.)h(.)g(.)g(.)g(.)f(.)h(.)g(.)g(.)g(.)f(.)h(.)g(.)g(.)g(.)f(.)h(.)g +(.)g(.)f(.)h(.)g(.)g(.)g(.)f(.)h(.)g(.)g(.)g(.)f(.)h(.)g(.)78 +b Fm(137)299 1884 y Fs(C.1)91 b(The)30 b(mo)s(dules)f(\014le)14 b Fa(.)f(.)i(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.) g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g -(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)43 b Fs(135)299 -1142 y(C.2)91 b(The)30 b(cvswrapp)s(ers)f(\014le)20 b +(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)43 b Fs(137)299 +2009 y(C.2)91 b(The)30 b(cvswrapp)s(ers)f(\014le)20 b Fa(.)14 b(.)h(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g (.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.) -g(.)h(.)f(.)g(.)g(.)g(.)g(.)49 b Fs(137)299 1266 y(C.3)91 +g(.)h(.)f(.)g(.)g(.)g(.)g(.)49 b Fs(139)299 2133 y(C.3)91 b(The)30 b(commit)g(supp)s(ort)f(\014les)14 b Fa(.)g(.)h(.)g(.)g(.)g(.) g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g (.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)43 -b Fs(138)598 1391 y(C.3.1)92 b(The)30 b(common)g(syn)m(tax)11 +b Fs(140)598 2258 y(C.3.1)92 b(The)30 b(common)g(syn)m(tax)11 b Fa(.)16 b(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g (.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)41 -b Fs(139)299 1515 y(C.4)91 b(Commitinfo)21 b Fa(.)14 +b Fs(141)299 2382 y(C.4)91 b(Commitinfo)21 b Fa(.)14 b(.)h(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g (.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.) g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)51 -b Fs(139)299 1640 y(C.5)91 b(V)-8 b(erifying)29 b(log)i(messages)d +b Fs(141)299 2507 y(C.5)91 b(V)-8 b(erifying)29 b(log)i(messages)d Fa(.)15 b(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g (.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.) -g(.)g(.)g(.)g(.)g(.)57 b Fs(140)299 1764 y(C.6)91 b(Editinfo)10 +g(.)g(.)g(.)g(.)g(.)57 b Fs(142)299 2631 y(C.6)91 b(Editinfo)10 b Fa(.)j(.)j(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.) g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g (.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.) -g(.)40 b Fs(141)598 1889 y(C.6.1)92 b(Editinfo)28 b(example)13 +g(.)40 b Fs(143)598 2756 y(C.6.1)92 b(Editinfo)28 b(example)13 b Fa(.)i(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.) h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g -(.)g(.)43 b Fs(142)299 2013 y(C.7)91 b(Loginfo)23 b Fa(.)15 +(.)g(.)43 b Fs(144)299 2880 y(C.7)91 b(Loginfo)23 b Fa(.)15 b(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g (.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.) g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)53 -b Fs(143)598 2138 y(C.7.1)92 b(Loginfo)30 b(example)25 +b Fs(145)598 3005 y(C.7.1)92 b(Loginfo)30 b(example)25 b Fa(.)15 b(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g (.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.) -g(.)g(.)56 b Fs(144)598 2262 y(C.7.2)92 b(Keeping)29 +g(.)g(.)56 b Fs(147)598 3130 y(C.7.2)92 b(Keeping)29 b(a)i(c)m(hec)m(k)m(ed)h(out)f(cop)m(y)14 b Fa(.)i(.)f(.)g(.)g(.)g(.)g (.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.) -g(.)g(.)44 b Fs(145)299 2387 y(C.8)91 b(Rcsinfo)25 b +g(.)g(.)44 b Fs(147)299 3254 y(C.8)91 b(Rcsinfo)25 b Fa(.)15 b(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g (.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.) f(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g -(.)g(.)55 b Fs(145)299 2511 y(C.9)91 b(Ignoring)30 b(\014les)f(via)h +(.)g(.)55 b Fs(148)299 3379 y(C.9)91 b(Ignoring)30 b(\014les)f(via)h (cvsignore)f Fa(.)15 b(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g (.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.) -g(.)g(.)h(.)f(.)58 b Fs(146)299 2636 y(C.10)92 b(The)29 +g(.)g(.)h(.)f(.)58 b Fs(148)299 3503 y(C.10)92 b(The)29 b(history)h(\014le)16 b Fa(.)e(.)h(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g (.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.) g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)46 -b Fs(147)299 2760 y(C.11)92 b(Expansions)28 b(in)h(administrativ)m(e)g +b Fs(149)299 3628 y(C.11)92 b(Expansions)28 b(in)h(administrativ)m(e)g (\014les)17 b Fa(.)d(.)h(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.) g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)46 -b Fs(147)0 3010 y Fm(App)t(endix)e(D)134 b(All)45 b(en)l(vironmen)l(t)i -(v)-7 b(ariables)45 b(whic)l(h)g(a\013ect)269 3134 y(CVS)10 +b Fs(150)0 3877 y Fm(App)t(endix)e(D)134 b(All)45 b(en)l(vironmen)l(t)i +(v)-7 b(ariables)45 b(whic)l(h)g(a\013ect)269 4001 y(CVS)10 b Fb(.)19 b(.)h(.)g(.)g(.)g(.)f(.)h(.)g(.)g(.)g(.)f(.)h(.)g(.)g(.)f(.)h (.)g(.)g(.)g(.)f(.)h(.)g(.)g(.)g(.)f(.)h(.)g(.)g(.)g(.)f(.)h(.)g(.)g(.) -g(.)f(.)h(.)g(.)g(.)f(.)h(.)g(.)g(.)g(.)f(.)55 b Fm(149)0 -3414 y(App)t(endix)44 b(E)134 b(T)-11 b(roublesho)t(oting)27 +g(.)f(.)h(.)g(.)g(.)f(.)h(.)g(.)g(.)g(.)f(.)55 b Fm(151)0 +4281 y(App)t(endix)44 b(E)134 b(T)-11 b(roublesho)t(oting)27 b Fb(.)21 b(.)e(.)h(.)g(.)g(.)g(.)f(.)h(.)g(.)g(.)g(.)f(.)h(.)g(.)g(.)g -(.)f(.)h(.)g(.)g(.)g(.)71 b Fm(153)299 3570 y Fs(E.1)91 +(.)f(.)h(.)g(.)g(.)g(.)71 b Fm(155)299 4437 y Fs(E.1)91 b(Magic)32 b(branc)m(h)d(n)m(um)m(b)s(ers)21 b Fa(.)14 b(.)h(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g (.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.) -g(.)g(.)g(.)50 b Fs(153)0 3819 y Fm(App)t(endix)44 b(F)134 -b(GNU)45 b(GENERAL)g(PUBLIC)g(LICENSE)304 3944 y Fb(.)20 +g(.)g(.)g(.)50 b Fs(155)0 4686 y Fm(App)t(endix)44 b(F)134 +b(GNU)45 b(GENERAL)g(PUBLIC)g(LICENSE)304 4811 y Fb(.)20 b(.)g(.)g(.)f(.)h(.)g(.)g(.)g(.)f(.)h(.)g(.)g(.)g(.)f(.)h(.)g(.)g(.)g (.)f(.)h(.)g(.)g(.)g(.)f(.)h(.)g(.)g(.)f(.)h(.)g(.)g(.)g(.)f(.)h(.)g(.) g(.)g(.)f(.)h(.)g(.)g(.)g(.)f(.)h(.)g(.)g(.)g(.)f(.)80 -b Fm(155)299 4099 y Fs(Pream)m(ble)13 b Fa(.)h(.)h(.)g(.)g(.)g(.)g(.)g +b Fm(157)299 4966 y Fs(Pream)m(ble)13 b Fa(.)h(.)h(.)g(.)g(.)g(.)g(.)g (.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.) g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g (.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)42 -b Fs(155)299 4224 y(TERMS)29 b(AND)j(CONDITIONS)d(F)m(OR)h(COPYING,)h -(DISTRIBUTION)e(AND)481 4348 y(MODIFICA)-8 b(TION)10 +b Fs(157)299 5091 y(TERMS)29 b(AND)j(CONDITIONS)d(F)m(OR)h(COPYING,)h +(DISTRIBUTION)e(AND)481 5215 y(MODIFICA)-8 b(TION)10 b Fa(.)15 b(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g (.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.) -g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)40 b Fs(156)299 -4473 y(Ho)m(w)31 b(to)g(Apply)e(These)h(T)-8 b(erms)30 +g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)40 b Fs(158)299 +5340 y(Ho)m(w)31 b(to)g(Apply)e(These)h(T)-8 b(erms)30 b(to)h(Y)-8 b(our)31 b(New)f(Programs)13 b Fa(.)i(.)h(.)f(.)g(.)g(.)g -(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)43 b Fs(161)0 -4722 y Fm(Index)32 b Fb(.)19 b(.)h(.)g(.)g(.)g(.)f(.)h(.)g(.)g(.)g(.)f -(.)h(.)g(.)g(.)g(.)f(.)h(.)g(.)g(.)f(.)h(.)g(.)g(.)g(.)f(.)h(.)g(.)g(.) -g(.)f(.)h(.)g(.)g(.)g(.)f(.)h(.)g(.)g(.)g(.)f(.)h(.)g(.)g(.)f(.)h(.)g -(.)g(.)76 b Fm(163)p eop -%%Page: -8 178 --8 177 bop 0 -116 a Fs(viii)2375 b(CVS|Concurren)m(t)29 -b(V)-8 b(ersions)30 b(System)p eop +(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)43 b Fs(163)p +eop +%%Page: -8 180 +-8 179 bop 0 -116 a Fs(viii)2375 b(CVS|Concurren)m(t)29 +b(V)-8 b(ersions)30 b(System)0 366 y Fm(Index)i Fb(.)19 +b(.)h(.)g(.)g(.)g(.)f(.)h(.)g(.)g(.)g(.)f(.)h(.)g(.)g(.)g(.)f(.)h(.)g +(.)g(.)f(.)h(.)g(.)g(.)g(.)f(.)h(.)g(.)g(.)g(.)f(.)h(.)g(.)g(.)g(.)f(.) +h(.)g(.)g(.)g(.)f(.)h(.)g(.)g(.)f(.)h(.)g(.)g(.)76 b +Fm(165)p eop %%Trailer end userdict /end-hook known{end-hook}if diff --git a/gnu/usr.bin/cvs/doc/cvsclient.info b/gnu/usr.bin/cvs/doc/cvsclient.info index b8cc1d70b50..db2065dda9e 100644 --- a/gnu/usr.bin/cvs/doc/cvsclient.info +++ b/gnu/usr.bin/cvs/doc/cvsclient.info @@ -9,7 +9,7 @@ CVS Client/Server This document describes the client/server protocol used by CVS. It does not describe how to use or administer client/server CVS; see the -regular CVS manual for that. This is version 1.9.2 of the protocol +regular CVS manual for that. This is version 1.9.4 of the protocol specification--*Note Introduction::, for more on what this version number means. @@ -57,7 +57,7 @@ you are reading now) of this document, `cvsclient.texi', can be found at the usual GNU FTP sites, with a filename such as `cvs-VERSION.tar.gz'. - This is version 1.9.2 of the protocol specification. This version + This is version 1.9.4 of the protocol specification. This version number is intended only to aid in distinguishing different versions of this specification. Although the specification is currently maintained in conjunction with the CVS implementation, and carries the same @@ -178,18 +178,17 @@ pserver cvs root, a linefeed, the username, a linefeed, the password trivially encoded (see scramble.c in the cvs sources), a linefeed, the string `END AUTH REQUEST', and a linefeed. The client must - sent the identical string for cvs root here, as it sends later, in - the `Root' request of the cvs protocol itself. Servers are - encouraged to enforce this restriction. The server responds with - `I LOVE YOU' and a linefeed if the authentication is successful or - `I HATE YOU' and a linefeed if the authentication fails. After - receiving `I LOVE YOU', the client proceeds with the cvs protocol. - If the client wishes to merely authenticate without starting the - cvs protocol, the procedure is the same, except `BEGIN AUTH - REQUEST' is replaced with `BEGIN VERIFICATION REQUEST', `END AUTH - REQUEST' is replaced with `END VERIFICATION REQUEST', and upon - receipt of `I LOVE YOU' the connection is closed rather than - continuing. + send the identical string for cvs root both here and later in the + `Root' request of the cvs protocol itself. Servers are encouraged + to enforce this restriction. The server responds with `I LOVE + YOU' and a linefeed if the authentication is successful or `I HATE + YOU' and a linefeed if the authentication fails. After receiving + `I LOVE YOU', the client proceeds with the cvs protocol. If the + client wishes to merely authenticate without starting the cvs + protocol, the procedure is the same, except `BEGIN AUTH REQUEST' is + replaced with `BEGIN VERIFICATION REQUEST', `END AUTH REQUEST' is + replaced with `END VERIFICATION REQUEST', and upon receipt of `I + LOVE YOU' the connection is closed rather than continuing. File: cvsclient.info, Node: Protocol, Prev: Connection and Authentication, Up: Top @@ -936,14 +935,14 @@ Node: Introduction885 Node: Goals3419 Node: Protocol Notes5226 Node: Connection and Authentication6904 -Node: Protocol9708 -Node: Entries Lines10168 -Node: Modes10876 -Node: Filenames12399 -Node: Requests13150 -Node: Responses27275 -Node: Example36266 -Node: Requirements40193 -Node: Obsolete41101 +Node: Protocol9699 +Node: Entries Lines10159 +Node: Modes10867 +Node: Filenames12390 +Node: Requests13141 +Node: Responses27266 +Node: Example36257 +Node: Requirements40184 +Node: Obsolete41092 End Tag Table diff --git a/gnu/usr.bin/cvs/doc/cvsclient.ps b/gnu/usr.bin/cvs/doc/cvsclient.ps index 3b4aef97aa0..5af6cc92cc3 100644 --- a/gnu/usr.bin/cvs/doc/cvsclient.ps +++ b/gnu/usr.bin/cvs/doc/cvsclient.ps @@ -8,7 +8,7 @@ %%EndComments %DVIPSCommandLine: dvips cvsclient.dvi -o cvsclient.ps %DVIPSParameters: dpi=600, compressed, comments removed -%DVIPSSource: TeX output 1997.01.16:0009 +%DVIPSSource: TeX output 1997.03.16:1621 %%BeginProcSet: texc.pro /TeXDict 250 dict def TeXDict begin /N{def}def /B{bind def}N /S{exch}N /X{S N}B /TR{translate}N /isls false N /vsize 11 72 mul N /hsize 8.5 72 @@ -952,7 +952,7 @@ y Ff(This)k(do)s(cumen)m(t)h(describ)s(es)g(the)h(clien)m(t/serv)m(er)g (proto)s(col)g(used)f(b)m(y)h(CVS.)f(It)h(do)s(es)g(not)g(describ)s(e)e (ho)m(w)i(to)0 865 y(use)h(or)h(administer)d(clien)m(t/serv)m(er)j (CVS;)f(see)h(the)g(regular)e(CVS)h(man)m(ual)g(for)g(that.)60 -b(This)35 b(is)g(v)m(ersion)h(1.9.2)0 989 y(of)c(the)g(proto)s(col)g +b(This)35 b(is)g(v)m(ersion)h(1.9.4)0 989 y(of)c(the)g(proto)s(col)g (sp)s(eci\014cation|See)f(Chapter)g(1)h([In)m(tro)s(duction],)g(page)g (2,)h(for)e(more)h(on)g(what)g(this)e(v)m(ersion)0 1114 y(n)m(um)m(b)s(er)f(means.)p eop @@ -1003,7 +1003,7 @@ b(as)h(CVS,)g(is)e(a)m(v)-5 b(ailable)30 b(under)e(the)i(GNU)g(Public)e (cumen)m(t,)h(`)p Fd(cvsclient.texi)p Ff(',)d(can)i(b)s(e)g(found)f(at) i(the)f(usual)f(GNU)i(FTP)f(sites,)h(with)0 3405 y(a)k(\014lename)e (suc)m(h)h(as)h(`)p Fd(cvs-)p Fe(v)m(ersion)p Fd(.tar.gz)p -Ff('.)125 3679 y(This)f(is)i(v)m(ersion)g(1.9.2)j(of)d(the)h(proto)s +Ff('.)125 3679 y(This)f(is)i(v)m(ersion)g(1.9.4)j(of)d(the)h(proto)s (col)g(sp)s(eci\014cation.)46 b(This)31 b(v)m(ersion)h(n)m(um)m(b)s(er) f(is)h(in)m(tended)g(only)f(to)j(aid)0 3804 y(in)40 b(distinguishing)e (di\013eren)m(t)j(v)m(ersions)g(of)h(this)e(sp)s(eci\014cation.)74 @@ -1156,10 +1156,10 @@ b(a)h(linefeed,)g(the)g(cvs)f(ro)s(ot,)480 3380 y(a)d(linefeed,)e(the)i (ded)j(\(see)i(scram)m(ble.c)e(in)480 3505 y(the)h(cvs)f(sources\),)i (a)f(linefeed,)f(the)h(string)e(`)p Fd(END)f(AUTH)f(REQUEST)p Ff(',)j(and)g(a)h(linefeed.)45 b(The)32 b(clien)m(t)480 -3629 y(m)m(ust)c(sen)m(t)g(the)g(iden)m(tical)e(string)h(for)g(cvs)h -(ro)s(ot)g(here,)h(as)f(it)f(sends)g(later,)h(in)f(the)g -Fd(Root)g Ff(request)h(of)480 3754 y(the)35 b(cvs)f(proto)s(col)h -(itself.)52 b(Serv)m(ers)34 b(are)h(encouraged)g(to)g(enforce)g(this)f +3629 y(m)m(ust)h(send)f(the)i(iden)m(tical)d(string)h(for)h(cvs)g(ro)s +(ot)h(b)s(oth)e(here)h(and)g(later)g(in)e(the)j Fd(Root)e +Ff(request)h(of)480 3754 y(the)i(cvs)f(proto)s(col)h(itself.)52 +b(Serv)m(ers)34 b(are)h(encouraged)g(to)g(enforce)g(this)f (restriction.)52 b(The)34 b(serv)m(er)480 3878 y(resp)s(onds)26 b(with)h(`)p Fd(I)k(LOVE)e(YOU)p Ff(')f(and)f(a)i(linefeed)e(if)g(the)i (authen)m(tication)f(is)f(successful)h(or)g(`)p Fd(I)i(HATE)480 |