From 2e7fa898a7c91d80766eb1c7e410ac642291bf90 Mon Sep 17 00:00:00 2001 From: tholo Date: Mon, 21 Apr 1997 04:33:40 +0000 Subject: [PATCH] Missing files from import --- gnu/usr.bin/cvs/doc/CVSvn.texi | 2 +- gnu/usr.bin/cvs/doc/cvs.aux | 323 +- gnu/usr.bin/cvs/doc/cvs.info | 321 +- gnu/usr.bin/cvs/doc/cvs.info-1 | 402 +- gnu/usr.bin/cvs/doc/cvs.info-2 | 368 +- gnu/usr.bin/cvs/doc/cvs.info-3 | 473 +-- gnu/usr.bin/cvs/doc/cvs.info-4 | 442 +- gnu/usr.bin/cvs/doc/cvs.info-5 | 228 +- gnu/usr.bin/cvs/doc/cvs.info-6 | 4 +- gnu/usr.bin/cvs/doc/cvs.info-7 | 138 +- gnu/usr.bin/cvs/doc/cvs.info-8 | 32 +- gnu/usr.bin/cvs/doc/cvs.ps | 6182 +++++++++++++++------------- gnu/usr.bin/cvs/doc/cvsclient.aux | 26 +- gnu/usr.bin/cvs/doc/cvsclient.info | 326 +- gnu/usr.bin/cvs/doc/cvsclient.ps | 2071 ++++++---- 15 files changed, 6383 insertions(+), 4955 deletions(-) diff --git a/gnu/usr.bin/cvs/doc/CVSvn.texi b/gnu/usr.bin/cvs/doc/CVSvn.texi index 274e2627f8e..17ae3bf588c 100644 --- a/gnu/usr.bin/cvs/doc/CVSvn.texi +++ b/gnu/usr.bin/cvs/doc/CVSvn.texi @@ -1 +1 @@ -@set CVSVN 1.9.6 +@set CVSVN 1.9.8 diff --git a/gnu/usr.bin/cvs/doc/cvs.aux b/gnu/usr.bin/cvs/doc/cvs.aux index 072b36bc41b..de5e44a6676 100644 --- a/gnu/usr.bin/cvs/doc/cvs.aux +++ b/gnu/usr.bin/cvs/doc/cvs.aux @@ -43,429 +43,438 @@ 'xrdef {File permissions-title}{File permissions} 'xrdef {File permissions-pg}{16} 'xrdef {File permissions-snt}{Section'tie3.2.2} +'xrdef {Attic-title}{The attic} +'xrdef {Attic-pg}{17} +'xrdef {Attic-snt}{Section'tie3.2.3} +'xrdef {Working directory storage-title}{How data is stored in the working directory} +'xrdef {Working directory storage-pg}{17} +'xrdef {Working directory storage-snt}{Section'tie3.3} 'xrdef {Intro administrative files-title}{The administrative files} -'xrdef {Intro administrative files-pg}{17} -'xrdef {Intro administrative files-snt}{Section'tie3.3} +'xrdef {Intro administrative files-pg}{20} +'xrdef {Intro administrative files-snt}{Section'tie3.4} 'xrdef {Multiple repositories-title}{Multiple repositories} -'xrdef {Multiple repositories-pg}{18} -'xrdef {Multiple repositories-snt}{Section'tie3.4} +'xrdef {Multiple repositories-pg}{21} +'xrdef {Multiple repositories-snt}{Section'tie3.5} 'xrdef {Creating a repository-title}{Creating a repository} -'xrdef {Creating a repository-pg}{18} -'xrdef {Creating a repository-snt}{Section'tie3.5} +'xrdef {Creating a repository-pg}{21} +'xrdef {Creating a repository-snt}{Section'tie3.6} 'xrdef {Remote repositories-title}{Remote repositories} -'xrdef {Remote repositories-pg}{19} -'xrdef {Remote repositories-snt}{Section'tie3.6} +'xrdef {Remote repositories-pg}{22} +'xrdef {Remote repositories-snt}{Section'tie3.7} 'xrdef {Server requirements-title}{Server requirements} -'xrdef {Server requirements-pg}{20} -'xrdef {Server requirements-snt}{Section'tie3.6.1} +'xrdef {Server requirements-pg}{23} +'xrdef {Server requirements-snt}{Section'tie3.7.1} 'xrdef {Connecting via rsh-title}{Connecting with rsh} -'xrdef {Connecting via rsh-pg}{20} -'xrdef {Connecting via rsh-snt}{Section'tie3.6.2} +'xrdef {Connecting via rsh-pg}{23} +'xrdef {Connecting via rsh-snt}{Section'tie3.7.2} 'xrdef {Password authenticated-title}{Direct connection with password authentication} -'xrdef {Password authenticated-pg}{21} -'xrdef {Password authenticated-snt}{Section'tie3.6.3} +'xrdef {Password authenticated-pg}{24} +'xrdef {Password authenticated-snt}{Section'tie3.7.3} 'xrdef {Password authentication server-title}{Setting up the server for password authentication} -'xrdef {Password authentication server-pg}{21} -'xrdef {Password authentication server-snt}{Section'tie3.6.3.1} +'xrdef {Password authentication server-pg}{24} +'xrdef {Password authentication server-snt}{Section'tie3.7.3.1} 'xrdef {Password authentication client-title}{Using the client with password authentication} -'xrdef {Password authentication client-pg}{23} -'xrdef {Password authentication client-snt}{Section'tie3.6.3.2} +'xrdef {Password authentication client-pg}{26} +'xrdef {Password authentication client-snt}{Section'tie3.7.3.2} 'xrdef {Password authentication security-title}{Security considerations with password authentication} -'xrdef {Password authentication security-pg}{24} -'xrdef {Password authentication security-snt}{Section'tie3.6.3.3} +'xrdef {Password authentication security-pg}{27} +'xrdef {Password authentication security-snt}{Section'tie3.7.3.3} 'xrdef {Kerberos authenticated-title}{Direct connection with kerberos} -'xrdef {Kerberos authenticated-pg}{25} -'xrdef {Kerberos authenticated-snt}{Section'tie3.6.4} +'xrdef {Kerberos authenticated-pg}{28} +'xrdef {Kerberos authenticated-snt}{Section'tie3.7.4} 'xrdef {Read-only access-title}{Read-only repository access} -'xrdef {Read-only access-pg}{26} -'xrdef {Read-only access-snt}{Section'tie3.7} +'xrdef {Read-only access-pg}{29} +'xrdef {Read-only access-snt}{Section'tie3.8} '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'tie4} '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'tie4.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'tie4.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'tie4.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'tie4.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'tie4.2} 'xrdef {Multiple developers-title}{Multiple developers} -'xrdef {Multiple developers-pg}{33} +'xrdef {Multiple developers-pg}{35} 'xrdef {Multiple developers-snt}{Chapter'tie5} 'xrdef {File status-title}{File status} -'xrdef {File status-pg}{33} +'xrdef {File status-pg}{35} 'xrdef {File status-snt}{Section'tie5.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'tie5.2} 'xrdef {Conflicts example-title}{Conflicts example} -'xrdef {Conflicts example-pg}{35} +'xrdef {Conflicts example-pg}{37} 'xrdef {Conflicts example-snt}{Section'tie5.3} 'xrdef {Informing others-title}{Informing others about commits} -'xrdef {Informing others-pg}{38} +'xrdef {Informing others-pg}{40} 'xrdef {Informing others-snt}{Section'tie5.4} 'xrdef {Concurrency-title}{Several developers simultaneously attempting to run CVS} -'xrdef {Concurrency-pg}{38} +'xrdef {Concurrency-pg}{40} 'xrdef {Concurrency-snt}{Section'tie5.5} 'xrdef {Watches-title}{Mechanisms to track who is editing files} -'xrdef {Watches-pg}{39} +'xrdef {Watches-pg}{41} 'xrdef {Watches-snt}{Section'tie5.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'tie5.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'tie5.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'tie5.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'tie5.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'tie5.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'tie5.7} 'xrdef {Revisions and branches-title}{Revisions and branches} -'xrdef {Revisions and branches-pg}{45} +'xrdef {Revisions and branches-pg}{47} 'xrdef {Revisions and branches-snt}{Chapter'tie6} 'xrdef {Revision numbers-title}{Revision numbers} -'xrdef {Revision numbers-pg}{45} +'xrdef {Revision numbers-pg}{47} 'xrdef {Revision numbers-snt}{Section'tie6.1} 'xrdef {Versions revisions releases-title}{Versions, revisions and releases} -'xrdef {Versions revisions releases-pg}{46} +'xrdef {Versions revisions releases-pg}{48} 'xrdef {Versions revisions releases-snt}{Section'tie6.2} 'xrdef {Assigning revisions-title}{Assigning revisions} -'xrdef {Assigning revisions-pg}{47} +'xrdef {Assigning revisions-pg}{49} 'xrdef {Assigning revisions-snt}{Section'tie6.3} 'xrdef {Tags-title}{Tags--Symbolic revisions} -'xrdef {Tags-pg}{47} +'xrdef {Tags-pg}{49} 'xrdef {Tags-snt}{Section'tie6.4} 'xrdef {Branches motivation-title}{What branches are good for} -'xrdef {Branches motivation-pg}{50} +'xrdef {Branches motivation-pg}{52} 'xrdef {Branches motivation-snt}{Section'tie6.5} 'xrdef {Creating a branch-title}{Creating a branch} -'xrdef {Creating a branch-pg}{50} +'xrdef {Creating a branch-pg}{52} 'xrdef {Creating a branch-snt}{Section'tie6.6} 'xrdef {Sticky tags-title}{Sticky tags} -'xrdef {Sticky tags-pg}{52} +'xrdef {Sticky tags-pg}{54} 'xrdef {Sticky tags-snt}{Section'tie6.7} +'xrdef {Magic branch numbers-title}{Magic branch numbers} +'xrdef {Magic branch numbers-pg}{55} +'xrdef {Magic branch numbers-snt}{Section'tie6.8} 'xrdef {Merging-title}{Merging} -'xrdef {Merging-pg}{55} +'xrdef {Merging-pg}{57} 'xrdef {Merging-snt}{Chapter'tie7} 'xrdef {Merging a branch-title}{Merging an entire branch} -'xrdef {Merging a branch-pg}{55} +'xrdef {Merging a branch-pg}{57} 'xrdef {Merging a branch-snt}{Section'tie7.1} 'xrdef {Merging more than once-title}{Merging from a branch several times} -'xrdef {Merging more than once-pg}{56} +'xrdef {Merging more than once-pg}{58} 'xrdef {Merging more than once-snt}{Section'tie7.2} 'xrdef {Merging two revisions-title}{Merging differences between any two revisions} -'xrdef {Merging two revisions-pg}{57} +'xrdef {Merging two revisions-pg}{59} 'xrdef {Merging two revisions-snt}{Section'tie7.3} 'xrdef {Merging adds and removals-title}{Merging can add or remove files} -'xrdef {Merging adds and removals-pg}{57} +'xrdef {Merging adds and removals-pg}{59} 'xrdef {Merging adds and removals-snt}{Section'tie7.4} 'xrdef {Recursive behavior-title}{Recursive behavior} -'xrdef {Recursive behavior-pg}{59} +'xrdef {Recursive behavior-pg}{61} 'xrdef {Recursive behavior-snt}{Chapter'tie8} 'xrdef {Adding files-title}{Adding files to a directory} -'xrdef {Adding files-pg}{61} +'xrdef {Adding files-pg}{63} 'xrdef {Adding files-snt}{Chapter'tie9} 'xrdef {Removing files-title}{Removing files} -'xrdef {Removing files-pg}{63} +'xrdef {Removing files-pg}{65} 'xrdef {Removing files-snt}{Chapter'tie10} 'xrdef {Removing directories-title}{Removing directories} -'xrdef {Removing directories-pg}{65} +'xrdef {Removing directories-pg}{67} 'xrdef {Removing directories-snt}{Chapter'tie11} 'xrdef {Tracking sources-title}{Tracking third-party sources} -'xrdef {Tracking sources-pg}{67} +'xrdef {Tracking sources-pg}{69} 'xrdef {Tracking sources-snt}{Chapter'tie12} 'xrdef {First import-title}{Importing a module for the first time} -'xrdef {First import-pg}{67} +'xrdef {First import-pg}{69} 'xrdef {First import-snt}{Section'tie12.1} 'xrdef {Update imports-title}{Updating a module with the import command} -'xrdef {Update imports-pg}{68} +'xrdef {Update imports-pg}{70} 'xrdef {Update imports-snt}{Section'tie12.2} 'xrdef {Reverting local changes-title}{Reverting to the latest vendor release} -'xrdef {Reverting local changes-pg}{68} +'xrdef {Reverting local changes-pg}{70} 'xrdef {Reverting local changes-snt}{Section'tie12.3} 'xrdef {Binary files in imports-title}{How to handle binary files with cvs import} -'xrdef {Binary files in imports-pg}{69} +'xrdef {Binary files in imports-pg}{71} 'xrdef {Binary files in imports-snt}{Section'tie12.4} 'xrdef {Moving files-title}{Moving and renaming files} -'xrdef {Moving files-pg}{71} +'xrdef {Moving files-pg}{73} 'xrdef {Moving files-snt}{Chapter'tie13} 'xrdef {Outside-title}{The Normal way to Rename} -'xrdef {Outside-pg}{71} +'xrdef {Outside-pg}{73} 'xrdef {Outside-snt}{Section'tie13.1} 'xrdef {Inside-title}{Moving the history file} -'xrdef {Inside-pg}{71} +'xrdef {Inside-pg}{73} 'xrdef {Inside-snt}{Section'tie13.2} 'xrdef {Rename by copying-title}{Copying the history file} -'xrdef {Rename by copying-pg}{72} +'xrdef {Rename by copying-pg}{74} 'xrdef {Rename by copying-snt}{Section'tie13.3} 'xrdef {Moving directories-title}{Moving and renaming directories} -'xrdef {Moving directories-pg}{75} +'xrdef {Moving directories-pg}{77} 'xrdef {Moving directories-snt}{Chapter'tie14} 'xrdef {History browsing-title}{History browsing} -'xrdef {History browsing-pg}{77} +'xrdef {History browsing-pg}{79} 'xrdef {History browsing-snt}{Chapter'tie15} 'xrdef {log messages-title}{Log messages} -'xrdef {log messages-pg}{77} +'xrdef {log messages-pg}{79} 'xrdef {log messages-snt}{Section'tie15.1} 'xrdef {history database-title}{The history database} -'xrdef {history database-pg}{77} +'xrdef {history database-pg}{79} 'xrdef {history database-snt}{Section'tie15.2} 'xrdef {user-defined logging-title}{User-defined logging} -'xrdef {user-defined logging-pg}{77} +'xrdef {user-defined logging-pg}{79} 'xrdef {user-defined logging-snt}{Section'tie15.3} 'xrdef {annotate-title}{Annotate command} -'xrdef {annotate-pg}{78} +'xrdef {annotate-pg}{80} 'xrdef {annotate-snt}{Section'tie15.4} 'xrdef {Keyword substitution-title}{Keyword substitution} -'xrdef {Keyword substitution-pg}{79} +'xrdef {Keyword substitution-pg}{81} 'xrdef {Keyword substitution-snt}{Chapter'tie16} 'xrdef {Keyword list-title}{RCS Keywords} -'xrdef {Keyword list-pg}{79} +'xrdef {Keyword list-pg}{81} 'xrdef {Keyword list-snt}{Section'tie16.1} 'xrdef {Using keywords-title}{Using keywords} -'xrdef {Using keywords-pg}{80} +'xrdef {Using keywords-pg}{82} 'xrdef {Using keywords-snt}{Section'tie16.2} 'xrdef {Avoiding substitution-title}{Avoiding substitution} -'xrdef {Avoiding substitution-pg}{81} +'xrdef {Avoiding substitution-pg}{83} 'xrdef {Avoiding substitution-snt}{Section'tie16.3} 'xrdef {Substitution modes-title}{Substitution modes} -'xrdef {Substitution modes-pg}{81} +'xrdef {Substitution modes-pg}{83} 'xrdef {Substitution modes-snt}{Section'tie16.4} 'xrdef {Log keyword-title}{Problems with the $Log: cvs.aux,v $ -'xrdef {Log keyword-title}{Problems with the Revision 1.1.1.8 1997/03/29 04:45:45 tholo -'xrdef {Log keyword-title}{Problems with the Latest release from Cyclic Software +'xrdef {Log keyword-title}{Problems with the Revision 1.1.1.9 1997/04/21 04:33:57 tholo +'xrdef {Log keyword-title}{Problems with the Missing files from import 'xrdef {Log keyword-title}{Problems with the keyword.} -'xrdef {Log keyword-pg}{82} +'xrdef {Log keyword-pg}{84} 'xrdef {Log keyword-snt}{Section'tie16.5} 'xrdef {Binary files-title}{Handling binary files} -'xrdef {Binary files-pg}{83} +'xrdef {Binary files-pg}{85} 'xrdef {Binary files-snt}{Chapter'tie17} 'xrdef {Builds-title}{How your build system interacts with CVS} -'xrdef {Builds-pg}{85} +'xrdef {Builds-pg}{87} 'xrdef {Builds-snt}{Chapter'tie18} 'xrdef {Compatibility-title}{Compatibility between CVS Versions} -'xrdef {Compatibility-pg}{87} +'xrdef {Compatibility-pg}{89} 'xrdef {Compatibility-snt}{Chapter'tie19} 'xrdef {Revision management-title}{Revision management} -'xrdef {Revision management-pg}{89} +'xrdef {Revision management-pg}{91} 'xrdef {Revision management-snt}{Chapter'tie20} 'xrdef {When to commit-title}{When to commit?} -'xrdef {When to commit-pg}{89} +'xrdef {When to commit-pg}{91} 'xrdef {When to commit-snt}{Section'tie20.1} 'xrdef {CVS commands-title}{Guide to CVS commands} -'xrdef {CVS commands-pg}{91} +'xrdef {CVS commands-pg}{93} 'xrdef {CVS commands-snt}{Appendix'tie'char65{}} 'xrdef {Structure-title}{Overall structure of CVS commands} -'xrdef {Structure-pg}{91} +'xrdef {Structure-pg}{93} 'xrdef {Structure-snt}{Section'tie'char65.1} 'xrdef {~/.cvsrc-title}{Default options and the ~/.cvsrc file} -'xrdef {~/.cvsrc-pg}{91} +'xrdef {~/.cvsrc-pg}{93} 'xrdef {~/.cvsrc-snt}{Section'tie'char65.2} 'xrdef {Global options-title}{Global options} -'xrdef {Global options-pg}{93} +'xrdef {Global options-pg}{95} 'xrdef {Global options-snt}{Section'tie'char65.3} 'xrdef {Common options-title}{Common command options} -'xrdef {Common options-pg}{94} +'xrdef {Common options-pg}{96} 'xrdef {Common options-snt}{Section'tie'char65.4} 'xrdef {admin-title}{admin---Administration front end for rcs} -'xrdef {admin-pg}{97} +'xrdef {admin-pg}{99} 'xrdef {admin-snt}{Section'tie'char65.5} 'xrdef {admin options-title}{admin options} -'xrdef {admin options-pg}{97} +'xrdef {admin options-pg}{99} 'xrdef {admin options-snt}{Section'tie'char65.5.1} 'xrdef {admin examples-title}{admin examples} -'xrdef {admin examples-pg}{100} +'xrdef {admin examples-pg}{102} 'xrdef {admin examples-snt}{Section'tie'char65.5.2} 'xrdef {checkout-title}{checkout---Check out sources for editing} -'xrdef {checkout-pg}{101} +'xrdef {checkout-pg}{103} 'xrdef {checkout-snt}{Section'tie'char65.6} 'xrdef {checkout options-title}{checkout options} -'xrdef {checkout options-pg}{102} +'xrdef {checkout options-pg}{104} 'xrdef {checkout options-snt}{Section'tie'char65.6.1} 'xrdef {checkout examples-title}{checkout examples} -'xrdef {checkout examples-pg}{103} +'xrdef {checkout examples-pg}{105} 'xrdef {checkout examples-snt}{Section'tie'char65.6.2} 'xrdef {commit-title}{commit---Check files into the repository} -'xrdef {commit-pg}{103} +'xrdef {commit-pg}{105} 'xrdef {commit-snt}{Section'tie'char65.7} 'xrdef {commit options-title}{commit options} -'xrdef {commit options-pg}{104} +'xrdef {commit options-pg}{106} 'xrdef {commit options-snt}{Section'tie'char65.7.1} 'xrdef {commit examples-title}{commit examples} -'xrdef {commit examples-pg}{105} +'xrdef {commit examples-pg}{107} 'xrdef {commit examples-snt}{Section'tie'char65.7.2} 'xrdef {diff-title}{diff---Run diffs between revisions} -'xrdef {diff-pg}{106} +'xrdef {diff-pg}{108} 'xrdef {diff-snt}{Section'tie'char65.8} 'xrdef {diff options-title}{diff options} -'xrdef {diff options-pg}{107} +'xrdef {diff options-pg}{109} 'xrdef {diff options-snt}{Section'tie'char65.8.1} 'xrdef {diff examples-title}{diff examples} -'xrdef {diff examples-pg}{108} +'xrdef {diff examples-pg}{110} 'xrdef {diff examples-snt}{Section'tie'char65.8.2} 'xrdef {export-title}{export---Export sources from CVS, similar to checkout} -'xrdef {export-pg}{108} +'xrdef {export-pg}{110} 'xrdef {export-snt}{Section'tie'char65.9} 'xrdef {export options-title}{export options} -'xrdef {export options-pg}{109} +'xrdef {export options-pg}{111} 'xrdef {export options-snt}{Section'tie'char65.9.1} 'xrdef {history-title}{history---Show status of files and users} -'xrdef {history-pg}{110} +'xrdef {history-pg}{112} 'xrdef {history-snt}{Section'tie'char65.10} 'xrdef {history options-title}{history options} -'xrdef {history options-pg}{110} +'xrdef {history options-pg}{112} 'xrdef {history options-snt}{Section'tie'char65.10.1} 'xrdef {import-title}{import---Import sources into CVS, using vendor branches} -'xrdef {import-pg}{112} +'xrdef {import-pg}{114} 'xrdef {import-snt}{Section'tie'char65.11} 'xrdef {import options-title}{import options} -'xrdef {import options-pg}{113} +'xrdef {import options-pg}{115} 'xrdef {import options-snt}{Section'tie'char65.11.1} 'xrdef {import output-title}{import output} -'xrdef {import output-pg}{113} +'xrdef {import output-pg}{115} 'xrdef {import output-snt}{Section'tie'char65.11.2} 'xrdef {import examples-title}{import examples} -'xrdef {import examples-pg}{114} +'xrdef {import examples-pg}{116} 'xrdef {import examples-snt}{Section'tie'char65.11.3} 'xrdef {log-title}{log---Print out log information for files} -'xrdef {log-pg}{114} +'xrdef {log-pg}{116} 'xrdef {log-snt}{Section'tie'char65.12} 'xrdef {log options-title}{log options} -'xrdef {log options-pg}{114} +'xrdef {log options-pg}{116} 'xrdef {log options-snt}{Section'tie'char65.12.1} 'xrdef {log examples-title}{log examples} -'xrdef {log examples-pg}{116} +'xrdef {log examples-pg}{118} 'xrdef {log examples-snt}{Section'tie'char65.12.2} 'xrdef {rdiff-title}{rdiff---'patch' format diffs between releases} -'xrdef {rdiff-pg}{116} +'xrdef {rdiff-pg}{118} 'xrdef {rdiff-snt}{Section'tie'char65.13} 'xrdef {rdiff options-title}{rdiff options} -'xrdef {rdiff options-pg}{117} +'xrdef {rdiff options-pg}{119} 'xrdef {rdiff options-snt}{Section'tie'char65.13.1} 'xrdef {rdiff examples-title}{rdiff examples} -'xrdef {rdiff examples-pg}{117} +'xrdef {rdiff examples-pg}{119} '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}{118} +'xrdef {release-pg}{120} 'xrdef {release-snt}{Section'tie'char65.14} 'xrdef {release options-title}{release options} -'xrdef {release options-pg}{118} +'xrdef {release options-pg}{120} 'xrdef {release options-snt}{Section'tie'char65.14.1} 'xrdef {release output-title}{release output} -'xrdef {release output-pg}{119} +'xrdef {release output-pg}{121} 'xrdef {release output-snt}{Section'tie'char65.14.2} 'xrdef {release examples-title}{release examples} -'xrdef {release examples-pg}{119} +'xrdef {release examples-pg}{121} 'xrdef {release examples-snt}{Section'tie'char65.14.3} 'xrdef {rtag-title}{rtag---Add a symbolic tag to a module} -'xrdef {rtag-pg}{120} +'xrdef {rtag-pg}{122} 'xrdef {rtag-snt}{Section'tie'char65.15} 'xrdef {rtag options-title}{rtag options} -'xrdef {rtag options-pg}{120} +'xrdef {rtag options-pg}{122} 'xrdef {rtag options-snt}{Section'tie'char65.15.1} 'xrdef {status-title}{status---Display status information on checked out files} -'xrdef {status-pg}{121} +'xrdef {status-pg}{123} 'xrdef {status-snt}{Section'tie'char65.16} 'xrdef {status options-title}{status options} -'xrdef {status options-pg}{121} +'xrdef {status options-pg}{123} '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}{122} +'xrdef {tag-pg}{124} 'xrdef {tag-snt}{Section'tie'char65.17} 'xrdef {tag options-title}{tag options} -'xrdef {tag options-pg}{122} +'xrdef {tag options-pg}{124} 'xrdef {tag options-snt}{Section'tie'char65.17.1} 'xrdef {update-title}{update---Bring work tree in sync with repository} -'xrdef {update-pg}{123} +'xrdef {update-pg}{125} 'xrdef {update-snt}{Section'tie'char65.18} 'xrdef {update options-title}{update options} -'xrdef {update options-pg}{123} +'xrdef {update options-pg}{125} 'xrdef {update options-snt}{Section'tie'char65.18.1} 'xrdef {update output-title}{update output} -'xrdef {update output-pg}{125} +'xrdef {update output-pg}{127} 'xrdef {update output-snt}{Section'tie'char65.18.2} 'xrdef {update examples-title}{update examples} -'xrdef {update examples-pg}{126} +'xrdef {update examples-pg}{128} 'xrdef {update examples-snt}{Section'tie'char65.18.3} 'xrdef {Invoking CVS-title}{Quick reference to CVS commands} -'xrdef {Invoking CVS-pg}{127} +'xrdef {Invoking CVS-pg}{129} 'xrdef {Invoking CVS-snt}{Appendix'tie'char66{}} 'xrdef {Administrative files-title}{Reference manual for the Administrative files} -'xrdef {Administrative files-pg}{137} +'xrdef {Administrative files-pg}{139} 'xrdef {Administrative files-snt}{Appendix'tie'char67{}} 'xrdef {modules-title}{The modules file} -'xrdef {modules-pg}{137} +'xrdef {modules-pg}{139} 'xrdef {modules-snt}{Section'tie'char67.1} 'xrdef {Wrappers-title}{The cvswrappers file} -'xrdef {Wrappers-pg}{139} +'xrdef {Wrappers-pg}{141} 'xrdef {Wrappers-snt}{Section'tie'char67.2} 'xrdef {commit files-title}{The commit support files} -'xrdef {commit files-pg}{140} +'xrdef {commit files-pg}{142} 'xrdef {commit files-snt}{Section'tie'char67.3} 'xrdef {syntax-title}{The common syntax} -'xrdef {syntax-pg}{141} +'xrdef {syntax-pg}{143} 'xrdef {syntax-snt}{Section'tie'char67.3.1} 'xrdef {commitinfo-title}{Commitinfo} -'xrdef {commitinfo-pg}{141} +'xrdef {commitinfo-pg}{143} 'xrdef {commitinfo-snt}{Section'tie'char67.4} 'xrdef {verifymsg-title}{Verifying log messages} -'xrdef {verifymsg-pg}{142} +'xrdef {verifymsg-pg}{144} 'xrdef {verifymsg-snt}{Section'tie'char67.5} 'xrdef {editinfo-title}{Editinfo} -'xrdef {editinfo-pg}{143} +'xrdef {editinfo-pg}{145} 'xrdef {editinfo-snt}{Section'tie'char67.6} 'xrdef {editinfo example-title}{Editinfo example} -'xrdef {editinfo example-pg}{144} +'xrdef {editinfo example-pg}{146} 'xrdef {editinfo example-snt}{Section'tie'char67.6.1} 'xrdef {loginfo-title}{Loginfo} -'xrdef {loginfo-pg}{145} +'xrdef {loginfo-pg}{147} 'xrdef {loginfo-snt}{Section'tie'char67.7} 'xrdef {loginfo example-title}{Loginfo example} -'xrdef {loginfo example-pg}{147} +'xrdef {loginfo example-pg}{149} '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}{147} +'xrdef {Keeping a checked out copy-pg}{149} 'xrdef {Keeping a checked out copy-snt}{Section'tie'char67.7.2} 'xrdef {rcsinfo-title}{Rcsinfo} -'xrdef {rcsinfo-pg}{148} +'xrdef {rcsinfo-pg}{150} 'xrdef {rcsinfo-snt}{Section'tie'char67.8} 'xrdef {cvsignore-title}{Ignoring files via cvsignore} -'xrdef {cvsignore-pg}{148} +'xrdef {cvsignore-pg}{150} 'xrdef {cvsignore-snt}{Section'tie'char67.9} 'xrdef {history file-title}{The history file} -'xrdef {history file-pg}{149} +'xrdef {history file-pg}{151} 'xrdef {history file-snt}{Section'tie'char67.10} 'xrdef {Variables-title}{Expansions in administrative files} -'xrdef {Variables-pg}{150} +'xrdef {Variables-pg}{152} 'xrdef {Variables-snt}{Section'tie'char67.11} 'xrdef {Environment variables-title}{All environment variables which affect CVS} -'xrdef {Environment variables-pg}{151} +'xrdef {Environment variables-pg}{153} 'xrdef {Environment variables-snt}{Appendix'tie'char68{}} 'xrdef {Troubleshooting-title}{Troubleshooting} -'xrdef {Troubleshooting-pg}{155} +'xrdef {Troubleshooting-pg}{157} 'xrdef {Troubleshooting-snt}{Appendix'tie'char69{}} -'xrdef {Magic branch numbers-title}{Magic branch numbers} -'xrdef {Magic branch numbers-pg}{155} -'xrdef {Magic branch numbers-snt}{Section'tie'char69.1} +'xrdef {Error messages-title}{Partial list of error messages} +'xrdef {Error messages-pg}{157} +'xrdef {Error messages-snt}{Section'tie'char69.1} 'xrdef {Copying-title}{GNU GENERAL PUBLIC LICENSE} -'xrdef {Copying-pg}{157} +'xrdef {Copying-pg}{159} 'xrdef {Copying-snt}{Appendix'tie'char70{}} 'xrdef {Index-title}{Index} -'xrdef {Index-pg}{165} +'xrdef {Index-pg}{167} 'xrdef {Index-snt}{} diff --git a/gnu/usr.bin/cvs/doc/cvs.info b/gnu/usr.bin/cvs/doc/cvs.info index 5861b9f4ed8..6e9b07148b3 100644 --- a/gnu/usr.bin/cvs/doc/cvs.info +++ b/gnu/usr.bin/cvs/doc/cvs.info @@ -24,13 +24,13 @@ the Free Software Foundation instead of in the original English.  Indirect: cvs.info-1: 1088 -cvs.info-2: 50291 -cvs.info-3: 98736 -cvs.info-4: 148123 -cvs.info-5: 195360 -cvs.info-6: 230440 -cvs.info-7: 277602 -cvs.info-8: 303306 +cvs.info-2: 50973 +cvs.info-3: 100370 +cvs.info-4: 149661 +cvs.info-5: 198776 +cvs.info-6: 241204 +cvs.info-7: 288376 +cvs.info-8: 318124  Tag Table: (Indirect) @@ -39,157 +39,160 @@ Node: Preface2952 Node: Checklist4898 Node: Credits5960 Node: BUGS7148 -Node: What is CVS?8164 -Node: A sample session16721 -Node: Getting the source17554 -Node: Committing your changes18431 -Node: Cleaning up19358 -Node: Viewing differences21058 -Node: Repository21951 -Node: Specifying a repository24265 -Node: Repository storage25676 -Node: Repository files26553 -Node: File permissions29330 -Node: Intro administrative files31641 -Node: Multiple repositories33342 -Node: Creating a repository34514 -Node: Remote repositories36654 -Node: Server requirements37883 -Node: Connecting via rsh39154 -Node: Password authenticated41748 -Node: Password authentication server42503 -Node: Password authentication client46509 -Node: Password authentication security48825 -Node: Kerberos authenticated50291 -Node: Read-only access51708 -Node: Starting a new project54400 -Node: Setting up the files55154 -Node: From files55778 -Node: From other version control systems57784 -Node: From scratch59673 -Node: Defining the module60409 -Node: Multiple developers61390 -Node: File status63560 -Node: Updating a file65734 -Node: Conflicts example67041 -Node: Informing others71093 -Node: Concurrency71633 -Node: Watches73391 -Node: Setting a watch74781 -Node: Getting Notified75948 -Node: Editing files79324 -Node: Watch information81844 -Node: Watches Compatibility82694 -Node: Choosing a model83529 -Node: Revisions and branches86204 -Node: Revision numbers87439 -Node: Versions revisions releases90497 -Node: Assigning revisions91092 -Node: Tags92535 -Node: Branches motivation97710 -Node: Creating a branch98736 -Node: Sticky tags101318 -Node: Merging104603 -Node: Merging a branch105195 -Node: Merging more than once106971 -Node: Merging two revisions109444 -Node: Merging adds and removals110236 -Node: Recursive behavior110812 -Node: Adding files112496 -Node: Removing files115181 -Node: Removing directories118154 -Node: Tracking sources119200 -Node: First import120601 -Node: Update imports121950 -Node: Reverting local changes123443 -Node: Binary files in imports124135 -Node: Moving files124416 -Node: Outside125043 -Node: Inside125994 -Node: Rename by copying126859 -Node: Moving directories128019 -Node: History browsing129450 -Node: log messages130009 -Node: history database130331 -Node: user-defined logging130677 -Node: annotate132197 -Node: Keyword substitution133337 -Node: Keyword list134325 -Node: Using keywords136105 -Node: Avoiding substitution138052 -Node: Substitution modes138952 -Node: Log keyword141454 -Node: Binary files142594 -Node: Builds145445 -Node: Compatibility148123 -Node: Revision management149115 -Node: When to commit149704 -Node: CVS commands150812 -Node: Structure152393 -Node: ~/.cvsrc153661 -Node: Global options155660 -Node: Common options159235 -Node: admin166096 -Node: admin options166972 -Node: admin examples174710 -Node: checkout176227 -Node: checkout options178675 -Node: checkout examples181844 -Node: commit182121 -Node: commit options184247 -Node: commit examples185647 -Node: diff188003 -Node: diff options188892 -Node: diff examples191168 -Node: export192128 -Node: export options193387 -Node: history194579 -Node: history options195360 -Node: import198192 -Node: import options200803 -Node: import output202353 -Node: import examples203430 -Node: log203594 -Node: log options204629 -Node: log examples207855 -Node: rdiff208001 -Node: rdiff options209303 -Node: rdiff examples210852 -Node: release211810 -Node: release options213105 -Node: release output213784 -Node: release examples215299 -Node: rtag215759 -Node: rtag options216594 -Node: status218498 -Node: status options219395 -Node: tag219983 -Node: tag options221537 -Node: update222788 -Node: update options223642 -Node: update output227245 -Node: update examples230108 -Node: Invoking CVS230440 -Node: Administrative files246449 -Node: modules247782 -Node: Wrappers252410 -Node: commit files256008 -Node: syntax257716 -Node: commitinfo258596 -Node: verifymsg260109 -Node: editinfo262549 -Node: editinfo example264825 -Node: loginfo266119 -Node: loginfo example268453 -Node: Keeping a checked out copy269223 -Node: rcsinfo270231 -Node: cvsignore271537 -Node: history file274419 -Node: Variables275071 -Node: Environment variables277602 -Node: Troubleshooting282763 -Node: Magic branch numbers282957 -Node: Copying284119 -Node: Index303306 +Node: What is CVS?8222 +Node: A sample session16779 +Node: Getting the source17612 +Node: Committing your changes18489 +Node: Cleaning up20345 +Node: Viewing differences22045 +Node: Repository22938 +Node: Specifying a repository25321 +Node: Repository storage26732 +Node: Repository files27675 +Node: File permissions30451 +Node: Attic32776 +Node: Working directory storage33799 +Node: Intro administrative files40859 +Node: Multiple repositories42567 +Node: Creating a repository43739 +Node: Remote repositories45879 +Node: Server requirements47108 +Node: Connecting via rsh48379 +Node: Password authenticated50973 +Node: Password authentication server51728 +Node: Password authentication client55734 +Node: Password authentication security58050 +Node: Kerberos authenticated59516 +Node: Read-only access60933 +Node: Starting a new project63625 +Node: Setting up the files64379 +Node: From files65003 +Node: From other version control systems67009 +Node: From scratch68898 +Node: Defining the module69634 +Node: Multiple developers70615 +Node: File status72785 +Node: Updating a file74959 +Node: Conflicts example76266 +Node: Informing others80318 +Node: Concurrency80858 +Node: Watches82616 +Node: Setting a watch84006 +Node: Getting Notified85173 +Node: Editing files88549 +Node: Watch information91069 +Node: Watches Compatibility91919 +Node: Choosing a model92754 +Node: Revisions and branches95429 +Node: Revision numbers96717 +Node: Versions revisions releases99775 +Node: Assigning revisions100370 +Node: Tags101932 +Node: Branches motivation107107 +Node: Creating a branch108133 +Node: Sticky tags110715 +Node: Magic branch numbers114029 +Node: Merging115486 +Node: Merging a branch116078 +Node: Merging more than once117854 +Node: Merging two revisions120327 +Node: Merging adds and removals121119 +Node: Recursive behavior121695 +Node: Adding files123379 +Node: Removing files126064 +Node: Removing directories129037 +Node: Tracking sources130083 +Node: First import131484 +Node: Update imports132833 +Node: Reverting local changes134326 +Node: Binary files in imports135018 +Node: Moving files135299 +Node: Outside135926 +Node: Inside136841 +Node: Rename by copying137706 +Node: Moving directories138728 +Node: History browsing140159 +Node: log messages140718 +Node: history database141040 +Node: user-defined logging141386 +Node: annotate142906 +Node: Keyword substitution144046 +Node: Keyword list145034 +Node: Using keywords146814 +Node: Avoiding substitution148761 +Node: Substitution modes149661 +Node: Log keyword152163 +Node: Binary files153303 +Node: Builds156154 +Node: Compatibility158832 +Node: Revision management159824 +Node: When to commit160413 +Node: CVS commands161521 +Node: Structure163102 +Node: ~/.cvsrc164370 +Node: Global options166369 +Node: Common options170008 +Node: admin176869 +Node: admin options177745 +Node: admin examples185483 +Node: checkout187000 +Node: checkout options189448 +Node: checkout examples192617 +Node: commit192894 +Node: commit options195020 +Node: commit examples196420 +Node: diff198776 +Node: diff options199665 +Node: diff examples201941 +Node: export202901 +Node: export options204160 +Node: history205352 +Node: history options206133 +Node: import208965 +Node: import options211576 +Node: import output213126 +Node: import examples214203 +Node: log214367 +Node: log options215402 +Node: log examples218628 +Node: rdiff218774 +Node: rdiff options220076 +Node: rdiff examples221625 +Node: release222583 +Node: release options223878 +Node: release output224557 +Node: release examples226072 +Node: rtag226532 +Node: rtag options227367 +Node: status229262 +Node: status options230159 +Node: tag230747 +Node: tag options232301 +Node: update233552 +Node: update options234406 +Node: update output238009 +Node: update examples240872 +Node: Invoking CVS241204 +Node: Administrative files257213 +Node: modules258546 +Node: Wrappers263174 +Node: commit files266772 +Node: syntax268480 +Node: commitinfo269360 +Node: verifymsg270873 +Node: editinfo273313 +Node: editinfo example275599 +Node: loginfo276893 +Node: loginfo example279227 +Node: Keeping a checked out copy279997 +Node: rcsinfo281005 +Node: cvsignore282311 +Node: history file285193 +Node: Variables285845 +Node: Environment variables288376 +Node: Troubleshooting293532 +Node: Error messages293732 +Node: Copying298937 +Node: Index318124  End Tag Table diff --git a/gnu/usr.bin/cvs/doc/cvs.info-1 b/gnu/usr.bin/cvs/doc/cvs.info-1 index e7a92fd2d3e..a8780839872 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.6. +1.9.8. * Menu: @@ -193,7 +193,8 @@ of known deficiencies: * This list is not complete. If you notice any error, omission, or something that is unclear, please send mail to - bug-cvs@prep.ai.mit.edu. + bug-cvs@prep.ai.mit.edu. This is also the address for reporting + bugs in CVS. I hope that you will find this manual useful, despite the above-mentioned shortcomings. @@ -435,7 +436,9 @@ Committing your changes ======================= When you have checked that the compiler is still compilable you -decide to make a new version of `backend.c'. +decide to make a new version of `backend.c'. This will store your new +`backend.c' in the repository and make it available to anyone else who +is using that same repository. $ cvs commit backend.c @@ -446,9 +449,23 @@ editor. The environment variable `$CVSEDITOR' determines which editor is started. If `$CVSEDITOR' is not set, then if the environment variable `$EDITOR' is set, it will be used. If both `$CVSEDITOR' and `$EDITOR' -are not set then the editor defaults to `vi'. If you want to avoid the -overhead of starting an editor you can specify the log message on the -command line using the `-m' flag instead, like this: +are not set then there is a default which will vary with your operating +system, for example `vi' for unix or `notepad' for Windows NT/95. + + When CVS starts the editor, it includes a list of files which are +modified. For the CVS client, this list is based on comparing the +modification time of the file against the modification time that the +file had when it was last gotten or updated. Therefore, if a file's +modification time has changed but its contents have not, it will show +up as modified. The simplest way to handle this is simply not to worry +about it--if you proceed with the commit CVS will detect that the +contents are not modified and treat it as an unmodified file. The next +`update' will clue CVS in to the fact that the file is unmodified, and +it will reset its stored timestamp so that the file will not show up in +future editor sessions. + + If you want to avoid starting an editor you can specify the log +message on the command line using the `-m' flag instead, like this: $ cvs commit -m "Added an optimization pass" backend.c @@ -570,6 +587,7 @@ user-defined modules. * Specifying a repository:: Telling CVS where your repository is * Repository storage:: The structure of the repository +* Working directory storage:: The structure of working directories * Intro administrative files:: Defining modules * Multiple repositories:: Multiple repositories * Creating a repository:: Creating a repository @@ -613,7 +631,7 @@ updated). Of course, for proper operation they should be two ways of referring to the same repository.  -File: cvs.info, Node: Repository storage, Next: Intro administrative files, Prev: Specifying a repository, Up: Repository +File: cvs.info, Node: Repository storage, Next: Working directory storage, Prev: Specifying a repository, Up: Repository How data is stored in the repository ==================================== @@ -632,6 +650,7 @@ file permissions appropriate for the repository. * Repository files:: What files are stored in the repository * File permissions:: File permissions +* Attic:: Some files are stored in the Attic  File: cvs.info, Node: Repository files, Next: File permissions, Up: Repository storage @@ -678,7 +697,6 @@ possible directory tree (showing only the directories): control. The name of the history file is the name of the corresponding file with `,v' appended to the end. Here is what the repository for the `yoyodyne/tc' directory might look like: - `$CVSROOT' | +--yoyodyne @@ -715,7 +733,7 @@ see *Note Magic branch numbers::. Also in CVS the valid tag names are a subset of what RCS accepts; for CVS's rules see *Note Tags::.  -File: cvs.info, Node: File permissions, Prev: Repository files, Up: Repository storage +File: cvs.info, Node: File permissions, Next: Attic, Prev: Repository files, Up: Repository storage File permissions ---------------- @@ -764,7 +782,184 @@ run it setuid. You cannot use the setuid features of RCS together with CVS.  -File: cvs.info, Node: Intro administrative files, Next: Multiple repositories, Prev: Repository storage, Up: Repository +File: cvs.info, Node: Attic, Prev: File permissions, Up: Repository storage + +The attic +--------- + + You will notice that sometimes CVS stores an RCS file in the +`Attic'. For example, if the CVSROOT is `/usr/local/cvsroot' and we are +talking about the file `backend.c' in the directory `yoyodyne/tc', then +the file normally would be in + + /usr/local/cvsroot/yoyodyne/tc/backend.c,v + + but if it goes in the attic, it would be in + + /usr/local/cvsroot/yoyodyne/tc/Attic/backend.c,v + + instead. It should not matter from a user point of view whether a +file is in the attic; CVS keeps track of this and looks in the attic +when it needs to. But in case you want to know, the rule is that the +RCS file is stored in the attic if and only if the head revision on the +trunk has state `dead'. A `dead' state means that file has been +removed, or never added, for that revision. For example, if you add a +file on a branch, it will have a trunk revision in `dead' state, and a +branch revision in a non-`dead' state. + + +File: cvs.info, Node: Working directory storage, Next: Intro administrative files, Prev: Repository storage, Up: Repository + +How data is stored in the working directory +=========================================== + + While we are discussing CVS internals which may become visible from +time to time, we might as well talk about what CVS puts in the `CVS' +directories in the working directories. As with the repository, CVS +handles this information and one can usually access it via CVS +commands. But in some cases it may be useful to look at it, and other +programs, such as the `jCVS' graphical user interface or the `VC' +package for emacs, may need to look at it. Such programs should follow +the recommendations in this section if they hope to be able to work +with other programs which use those files, including future versions of +the programs just mentioned and the command-line CVS client. + + The `CVS' directory contains several files. Programs which are +reading this directory should silently ignore files which are in the +directory but which are not documented here, to allow for future +expansion. + +`Root' + This file contains the current CVS root, as described in *Note + Specifying a repository::. + +`Repository' + This file contains the directory within the repository which the + current directory corresponds with. For historical reasons it is + an absolute pathname, although it would make more sense for it to + be relative to the root. For example, after the command + + cvs -d :local:/usr/local/cvsroot checkout yoyodyne/tc + + `Root' will contain + + :local:/usr/local/cvsroot + + and `Repository' will contain + + /usr/local/cvsroot/yoydyne/tc + +`Entries' + This file lists the files and directories in the working + directory. It is a text file according to the conventions + appropriate for the operating system in question. The first + character of each line indicates what sort of line it is. If the + character is unrecognized, programs reading the file should + silently skip that line, to allow for future expansion. + + If the first character is `/', then the format is: + + /NAME/REVISION/TIMESTAMP[+CONFLICT]/OPTIONS/TAGDATE + + where `[' and `]' are not part of the entry, but instead indicate + that the `+' and conflict marker are optional. NAME is the name + of the file within the directory. REVISION is the revision that + the file in the working derives from, or `0' for an added file, or + `-' followed by a revision for a removed file. TIMESTAMP is the + timestamp of the file at the time that CVS created it; if the + timestamp differs with the actual modification time of the file it + means the file has been modified. CONFLICT indicates that there + was a conflict; if it is the same as the actual modification time + of the file it means that the user has obviously not resolved the + conflict. OPTIONS contains sticky options (for example `-kb' for a + binary file). TAGDATE contains `T' followed by a tag name, or `D' + for a date, followed by a sticky tag or date. Note that if + TIMESTAMP contains a pair of timestamps separated by a space, + rather than a single timestamp, you are dealing with a version of + CVS earlier than CVS 1.5 (not documented here). + + If the first character of a line in `Entries' is `D', then it + indicates a subdirectory. `D' on a line all by itself indicates + that the program which wrote the `Entries' file does record + subdirectories (therefore, if there is such a line and no other + lines beginning with `D', one knows there are no subdirectories). + Otherwise, the line looks like: + + D/NAME/FILLER1/FILLER2/FILLER3/FILLER4 + + where NAME is the name of the subdirectory, and all the FILLER + fields should be silently ignored, for future expansion. Programs + which modify `Entries' files should preserve these fields. + +`Entries.Log' + This file does not record any information beyond that in + `Entries', but it does provide a way to update the information + without having to rewrite the entire `Entries' file, including the + ability to preserve the information even if the program writing + `Entries' and `Entries.Log' abruptly aborts. The format of a line + in `Entries.Log' is a single character command followed by a space + followed by a line in the format specified for a line in + `Entries'. The single character command is `A' to indicate that + the entry is being added, `R' to indicate that the entry is being + removed, or any other character to indicate that the entire line + in `Entries.Log' should be silently ignored (for future + expansion). If the second character of the line in `Entries.Log' + is not a space, then it was written by an older version of CVS + (not documented here). + +`Entries.Backup' + This is a temporary file. Recommended usage is to write a new + entries file to `Entries.Backup', and then to rename it + (atomically, where possible) to `Entries'. + +`Entries.Static' + The only relevant thing about this file is whether it exists or + not. If it exists, then it means that only part of a directory + was gotten and CVS will not create additional files in that + directory. To clear it, use the `update' command with the `-d' + option, which will get the additional files and remove + `Entries.Static'. + +`Tag' + This file contains per-directory sticky tags or dates. The first + character is `T' for a branch tag, `N' for a non-branch tag, or + `D' for a date, or another character to mean the file should be + silently ignored, for future expansion. This character is + followed by the tag or date. Note that per-directory sticky tags + or dates are used for things like applying to files which are + newly added; they might not be the same as the sticky tags or + dates on individual files. For general information on sticky tags + and dates, see *Note Sticky tags::. + +`Checkin.prog' +`Update.prog' + These files store the programs specified by the `-i' and `-u' + options in the modules file, respectively. + +`Notify' + This file stores notifications (for example, for `edit' or + `unedit') which have not yet been sent to the server. Its format + is not yet documented here. + +`Notify.tmp' + This file is to `Notify' as `Entries.Backup' is to `Entries'. + That is, to write `Notify', first write the new contents to + `Notify.tmp' and then (atomically where possible), rename it to + `Notify'. + +`Base' + If watches are in use, then an `edit' command stores the original + copy of the file in the `Base' directory. This allows the + `unedit' command to operate even if it is unable to communicate + with the server. + +`Template' + This file contains the template specified by the `rcsinfo' file + (*note rcsinfo::.). It is only used by the client; the + non-client/server CVS consults `rcsinfo' directly. + + +File: cvs.info, Node: Intro administrative files, Next: Multiple repositories, Prev: Working directory storage, Up: Repository The administrative files ======================== @@ -986,190 +1181,3 @@ the documentation for your rsh replacement. (The `bach@' can be omitted if the username is the same on both the local and remote hosts.) - -File: cvs.info, Node: Password authenticated, Next: Kerberos authenticated, Prev: Connecting via rsh, Up: Remote repositories - -Direct connection with password authentication ----------------------------------------------- - - The CVS client can also connect to the server using a password -protocol. This is particularly useful if using `rsh' is not feasible -(for example, the server is behind a firewall), and Kerberos also is -not available. - - To use this method, it is necessary to make some adjustments on both -the server and client sides. - -* Menu: - -* Password authentication server:: Setting up the server -* Password authentication client:: Using the client -* Password authentication security:: What this method does and does not do - - -File: cvs.info, Node: Password authentication server, Next: Password authentication client, Up: Password authenticated - -Setting up the server for password authentication -................................................. - - On the server side, the file `/etc/inetd.conf' needs to be edited so -`inetd' knows to run the command `cvs pserver' when it receives a -connection on the right port. By default, the port number is 2401; it -would be different if your client were compiled with `CVS_AUTH_PORT' -defined to something else, though. - - If your `inetd' allows raw port numbers in `/etc/inetd.conf', then -the following (all on a single line in `inetd.conf') should be -sufficient: - - 2401 stream tcp nowait root /usr/local/bin/cvs - cvs -b /usr/local/bin pserver - - The `-b' option specifies the directory which contains the RCS -binaries on the server. You could also use the `-T' option to specify -a temporary directory. - - If your `inetd' wants a symbolic service name instead of a raw port -number, then put this in `/etc/services': - - cvspserver 2401/tcp - - and put `cvspserver' instead of `2401' in `inetd.conf'. - - Once the above is taken care of, restart your `inetd', or do -whatever is necessary to force it to reread its initialization files. - - Because the client stores and transmits passwords in cleartext -(almost--see *Note Password authentication security::, for details), a -separate CVS password file may be used, so people don't compromise their -regular passwords when they access the repository. This file is -`$CVSROOT/CVSROOT/passwd' (*note Intro administrative files::.). Its -format is similar to `/etc/passwd', except that it only has two fields, -username and password. For example: - - bach:ULtgRLXo7NRxs - cwang:1sOp854gDF3DY - - The password is encrypted according to the standard Unix `crypt()' -function, so it is possible to paste in passwords directly from regular -Unix `passwd' files. - - When authenticating a password, the server first checks for the user -in the CVS `passwd' file. If it finds the user, it compares against -that password. If it does not find the user, or if the CVS `passwd' -file does not exist, then the server tries to match the password using -the system's user-lookup routine. When using the CVS `passwd' file, -the server runs under as the username specified in the the third -argument in the entry, or as the first argument if there is no third -argument (in this way CVS allows imaginary usernames provided the CVS -`passwd' file indicates corresponding valid system usernames). In any -case, CVS will have no privileges which the (valid) user would not have. - - It is possible to "map" cvs-specific usernames onto system usernames -(i.e., onto system login names) in the `$CVSROOT/CVSROOT/passwd' file -by appending a colon and the system username after the password. For -example: - - cvs:ULtgRLXo7NRxs:kfogel - generic:1sOp854gDF3DY:spwang - anyone:1sOp854gDF3DY:spwang - - Thus, someone remotely accessing the repository on -`chainsaw.brickyard.com' with the following command: - - cvs -d :pserver:cvs@chainsaw.brickyard.com:/usr/local/cvsroot checkout foo - - would end up running the server under the system identity kfogel, -assuming successful authentication. However, the remote user would not -necessarily need to know kfogel's system password, as the -`$CVSROOT/CVSROOT/passwd' file might contain a different password, used -only for CVS. And as the example above indicates, it is permissible to -map multiple cvs usernames onto a single system username. - - This feature is designed to allow people repository access without -full system access (in particular, see *Note Read-only access::); -however, also *Note Password authentication security::. Any sort of -repository access very likely implies a degree of general system access -as well. - - Right now, the only way to put a password in the CVS `passwd' file -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 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 -.................................................... - - The passwords are stored on the client side in a trivial encoding of -the cleartext, and transmitted in the same encoding. The encoding is -done only to prevent inadvertent password compromises (i.e., a system -administrator accidentally looking at the file), and will not prevent -even a naive attacker from gaining the password. - - The separate CVS password file (*note Password authentication -server::.) allows people to use a different password for repository -access than for login access. On the other hand, once a user has -access to the repository, she can execute programs on the server system -through a variety of means. Thus, repository access implies fairly -broad system access as well. It might be possible to modify CVS to -prevent that, but no one has done so as of this writing. Furthermore, -there may be other ways in which having access to CVS allows people to -gain more general access to the system; noone has done a careful audit. - - In summary, anyone who gets the password gets repository access, and -some measure of general system access as well. The password is -available to anyone who can sniff network packets or read a protected -(i.e., user read-only) file. If you want real security, get Kerberos. - diff --git a/gnu/usr.bin/cvs/doc/cvs.info-2 b/gnu/usr.bin/cvs/doc/cvs.info-2 index fd25deaa429..bdab78104cc 100644 --- a/gnu/usr.bin/cvs/doc/cvs.info-2 +++ b/gnu/usr.bin/cvs/doc/cvs.info-2 @@ -21,6 +21,193 @@ versions, except that the section entitled "GNU General Public License" 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 authenticated, Next: Kerberos authenticated, Prev: Connecting via rsh, Up: Remote repositories + +Direct connection with password authentication +---------------------------------------------- + + The CVS client can also connect to the server using a password +protocol. This is particularly useful if using `rsh' is not feasible +(for example, the server is behind a firewall), and Kerberos also is +not available. + + To use this method, it is necessary to make some adjustments on both +the server and client sides. + +* Menu: + +* Password authentication server:: Setting up the server +* Password authentication client:: Using the client +* Password authentication security:: What this method does and does not do + + +File: cvs.info, Node: Password authentication server, Next: Password authentication client, Up: Password authenticated + +Setting up the server for password authentication +................................................. + + On the server side, the file `/etc/inetd.conf' needs to be edited so +`inetd' knows to run the command `cvs pserver' when it receives a +connection on the right port. By default, the port number is 2401; it +would be different if your client were compiled with `CVS_AUTH_PORT' +defined to something else, though. + + If your `inetd' allows raw port numbers in `/etc/inetd.conf', then +the following (all on a single line in `inetd.conf') should be +sufficient: + + 2401 stream tcp nowait root /usr/local/bin/cvs + cvs -b /usr/local/bin pserver + + The `-b' option specifies the directory which contains the RCS +binaries on the server. You could also use the `-T' option to specify +a temporary directory. + + If your `inetd' wants a symbolic service name instead of a raw port +number, then put this in `/etc/services': + + cvspserver 2401/tcp + + and put `cvspserver' instead of `2401' in `inetd.conf'. + + Once the above is taken care of, restart your `inetd', or do +whatever is necessary to force it to reread its initialization files. + + Because the client stores and transmits passwords in cleartext +(almost--see *Note Password authentication security::, for details), a +separate CVS password file may be used, so people don't compromise their +regular passwords when they access the repository. This file is +`$CVSROOT/CVSROOT/passwd' (*note Intro administrative files::.). Its +format is similar to `/etc/passwd', except that it only has two fields, +username and password. For example: + + bach:ULtgRLXo7NRxs + cwang:1sOp854gDF3DY + + The password is encrypted according to the standard Unix `crypt()' +function, so it is possible to paste in passwords directly from regular +Unix `passwd' files. + + When authenticating a password, the server first checks for the user +in the CVS `passwd' file. If it finds the user, it compares against +that password. If it does not find the user, or if the CVS `passwd' +file does not exist, then the server tries to match the password using +the system's user-lookup routine. When using the CVS `passwd' file, +the server runs under as the username specified in the the third +argument in the entry, or as the first argument if there is no third +argument (in this way CVS allows imaginary usernames provided the CVS +`passwd' file indicates corresponding valid system usernames). In any +case, CVS will have no privileges which the (valid) user would not have. + + It is possible to "map" cvs-specific usernames onto system usernames +(i.e., onto system login names) in the `$CVSROOT/CVSROOT/passwd' file +by appending a colon and the system username after the password. For +example: + + cvs:ULtgRLXo7NRxs:kfogel + generic:1sOp854gDF3DY:spwang + anyone:1sOp854gDF3DY:spwang + + Thus, someone remotely accessing the repository on +`chainsaw.brickyard.com' with the following command: + + cvs -d :pserver:cvs@chainsaw.brickyard.com:/usr/local/cvsroot checkout foo + + would end up running the server under the system identity kfogel, +assuming successful authentication. However, the remote user would not +necessarily need to know kfogel's system password, as the +`$CVSROOT/CVSROOT/passwd' file might contain a different password, used +only for CVS. And as the example above indicates, it is permissible to +map multiple cvs usernames onto a single system username. + + This feature is designed to allow people repository access without +full system access (in particular, see *Note Read-only access::); +however, also *Note Password authentication security::. Any sort of +repository access very likely implies a degree of general system access +as well. + + Right now, the only way to put a password in the CVS `passwd' file +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 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 +.................................................... + + The passwords are stored on the client side in a trivial encoding of +the cleartext, and transmitted in the same encoding. The encoding is +done only to prevent inadvertent password compromises (i.e., a system +administrator accidentally looking at the file), and will not prevent +even a naive attacker from gaining the password. + + The separate CVS password file (*note Password authentication +server::.) allows people to use a different password for repository +access than for login access. On the other hand, once a user has +access to the repository, she can execute programs on the server system +through a variety of means. Thus, repository access implies fairly +broad system access as well. It might be possible to modify CVS to +prevent that, but no one has done so as of this writing. Furthermore, +there may be other ways in which having access to CVS allows people to +gain more general access to the system; noone has done a careful audit. + + In summary, anyone who gets the password gets repository access, and +some measure of general system access as well. The password is +available to anyone who can sniff network packets or read a protected +(i.e., user read-only) file. If you want real security, get Kerberos. +  File: cvs.info, Node: Kerberos authenticated, Prev: Password authenticated, Up: Remote repositories @@ -956,6 +1143,7 @@ revision tree. * Branches motivation:: What branches are good for * Creating a branch:: Creating a branch * Sticky tags:: Sticky tags +* Magic branch numbers:: Magic branch numbers  File: cvs.info, Node: Revision numbers, Next: Versions revisions releases, Up: Revisions and branches @@ -1032,183 +1220,3 @@ often given a version number such as `4.1.1'. and versions in the second sense are called "releases". To avoid confusion, the word "version" is almost never used in this document. - -File: cvs.info, Node: Assigning revisions, Next: Tags, Prev: Versions revisions releases, Up: Revisions and branches - -Assigning revisions -=================== - - By default, CVS will assign numeric revisions by leaving the first -number the same and incrementing the second number. For example, -`1.1', `1.2', `1.3', etc. - - When adding a new file, the second number will always be one and the -first number will equal the highest first number of any file in that -directory. For example, the current directory contains files whose -highest numbered revisions are `1.7', `3.1', and `4.12', then an added -file will be given the numeric revision `4.1'. - - Normally there is no reason to care about the revision numbers--it -is easier to treat them as internal numbers that CVS maintains, and tags -provide a better way to distinguish between things like release 1 -versus release 2 of your product (*note Tags::.). However, if you want -to set the numeric revisions, the `-r' option to `cvs commit' can do -that. - - For example, to bring all your files up to the RCS revision 3.0 -(including those that haven't changed), you might invoke: - - $ cvs commit -r 3.0 - - Note that the number you specify with `-r' must be larger than any -existing revision number. That is, if revision 3.0 exists, you cannot -`cvs commit -r 1.3'. If you want to maintain several releases in -parallel, you need to use a branch (*note Revisions and branches::.). - - -File: cvs.info, Node: Tags, Next: Branches motivation, Prev: Assigning revisions, Up: Revisions and branches - -Tags-Symbolic revisions -======================= - - The revision numbers live a life of their own. They need not have -anything at all to do with the release numbers of your software -product. Depending on how you use CVS the revision numbers might -change several times between two releases. As an example, some of the -source files that make up RCS 5.6 have the following revision numbers: - - ci.c 5.21 - co.c 5.9 - ident.c 5.3 - rcs.c 5.12 - rcsbase.h 5.11 - rcsdiff.c 5.10 - rcsedit.c 5.11 - rcsfcmp.c 5.9 - rcsgen.c 5.10 - rcslex.c 5.11 - rcsmap.c 5.2 - rcsutil.c 5.10 - - You can use the `tag' command to give a symbolic name to a certain -revision of a file. You can use the `-v' flag to the `status' command -to see all tags that a file has, and which revision numbers they -represent. Tag names must start with an uppercase or lowercase letter -and can contain uppercase and lowercase letters, digits, `-', and `_'. -The two tag names `BASE' and `HEAD' are reserved for use by CVS. It is -expected that future names which are special to CVS will be specially -named, for example by starting with `.', rather than being named -analogously to `BASE' and `HEAD', to avoid conflicts with actual tag -names. - - You'll want to choose some convention for naming tags, based on -information such as the name of the program and the version number of -the release. For example, one might take the name of the program, -immediately followed by the version number with `.' changed to `-', so -that CVS 1.9 would be tagged with the name `cvs1-9'. If you choose a -consistent convention, then you won't constantly be guessing whether a -tag is `cvs-1-9' or `cvs1_9' or what. You might even want to consider -enforcing your convention in the taginfo file (*note user-defined -logging::.). - - The following example shows how you can add a tag to a file. The -commands must be issued inside your working copy of the module. That -is, you should issue the command in the directory where `backend.c' -resides. - - $ cvs tag release-0-4 backend.c - T backend.c - $ cvs status -v backend.c - =================================================================== - File: backend.c Status: Up-to-date - - Version: 1.4 Tue Dec 1 14:39:01 1992 - RCS Version: 1.4 /usr/local/cvsroot/yoyodyne/tc/backend.c,v - Sticky Tag: (none) - Sticky Date: (none) - Sticky Options: (none) - - Existing Tags: - release-0-4 (revision: 1.4) - - There is seldom reason to tag a file in isolation. A more common -use is to tag all the files that constitute a module with the same tag -at strategic points in the development life-cycle, such as when a -release is made. - - $ cvs tag release-1-0 . - cvs tag: Tagging . - T Makefile - T backend.c - T driver.c - T frontend.c - T parser.c - - (When you give CVS a directory as argument, it generally applies the -operation to all the files in that directory, and (recursively), to any -subdirectories that it may contain. *Note Recursive behavior::.) - - The `checkout' command has a flag, `-r', that lets you check out a -certain revision of a module. This flag makes it easy to retrieve the -sources that make up release 1.0 of the module `tc' at any time in the -future: - - $ cvs checkout -r release-1-0 tc - -This is useful, for instance, if someone claims that there is a bug in -that release, but you cannot find the bug in the current working copy. - - You can also check out a module as it was at any given date. *Note -checkout options::. - - When you tag more than one file with the same tag you can think -about the tag as "a curve drawn through a matrix of filename vs. -revision number." Say we have 5 files with the following revisions: - - file1 file2 file3 file4 file5 - - 1.1 1.1 1.1 1.1 /--1.1* <-*- TAG - 1.2*- 1.2 1.2 -1.2*- - 1.3 \- 1.3*- 1.3 / 1.3 - 1.4 \ 1.4 / 1.4 - \-1.5*- 1.5 - 1.6 - - At some time in the past, the `*' versions were tagged. You can -think of the tag as a handle attached to the curve drawn through the -tagged revisions. When you pull on the handle, you get all the tagged -revisions. Another way to look at it is that you "sight" through a set -of revisions that is "flat" along the tagged revisions, like this: - - file1 file2 file3 file4 file5 - - 1.1 - 1.2 - 1.1 1.3 _ - 1.1 1.2 1.4 1.1 / - 1.2*----1.3*----1.5*----1.2*----1.1 (--- <--- Look here - 1.3 1.6 1.3 \_ - 1.4 1.4 - 1.5 - - -File: cvs.info, Node: Branches motivation, Next: Creating a branch, Prev: Tags, Up: Revisions and branches - -What branches are good for -========================== - - Suppose that release 1.0 of tc has been made. You are continuing to -develop tc, planning to create release 1.1 in a couple of months. -After a while your customers start to complain about a fatal bug. You -check out release 1.0 (*note Tags::.) and find the bug (which turns out -to have a trivial fix). However, the current revision of the sources -are in a state of flux and are not expected to be stable for at least -another month. There is no way to make a bugfix release based on the -newest sources. - - The thing to do in a situation like this is to create a "branch" on -the revision trees for all the files that make up release 1.0 of tc. -You can then make modifications to the branch without disturbing the -main trunk. When the modifications are finished you can select to -either incorporate them on the main trunk, or leave them on the branch. - diff --git a/gnu/usr.bin/cvs/doc/cvs.info-3 b/gnu/usr.bin/cvs/doc/cvs.info-3 index f167bc2c41b..a83a813eeb2 100644 --- a/gnu/usr.bin/cvs/doc/cvs.info-3 +++ b/gnu/usr.bin/cvs/doc/cvs.info-3 @@ -21,6 +21,187 @@ versions, except that the section entitled "GNU General Public License" 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: Assigning revisions, Next: Tags, Prev: Versions revisions releases, Up: Revisions and branches + +Assigning revisions +=================== + + By default, CVS will assign numeric revisions by leaving the first +number the same and incrementing the second number. For example, +`1.1', `1.2', `1.3', etc. + + When adding a new file, the second number will always be one and the +first number will equal the highest first number of any file in that +directory. For example, the current directory contains files whose +highest numbered revisions are `1.7', `3.1', and `4.12', then an added +file will be given the numeric revision `4.1'. + + Normally there is no reason to care about the revision numbers--it +is easier to treat them as internal numbers that CVS maintains, and tags +provide a better way to distinguish between things like release 1 +versus release 2 of your product (*note Tags::.). However, if you want +to set the numeric revisions, the `-r' option to `cvs commit' can do +that. The `-r' option implies the `-f' option, in the sense that it +causes the files to be committed even if they are not modified. + + For example, to bring all your files up to revision 3.0 (including +those that haven't changed), you might invoke: + + $ cvs commit -r 3.0 + + Note that the number you specify with `-r' must be larger than any +existing revision number. That is, if revision 3.0 exists, you cannot +`cvs commit -r 1.3'. If you want to maintain several releases in +parallel, you need to use a branch (*note Revisions and branches::.). + + +File: cvs.info, Node: Tags, Next: Branches motivation, Prev: Assigning revisions, Up: Revisions and branches + +Tags-Symbolic revisions +======================= + + The revision numbers live a life of their own. They need not have +anything at all to do with the release numbers of your software +product. Depending on how you use CVS the revision numbers might +change several times between two releases. As an example, some of the +source files that make up RCS 5.6 have the following revision numbers: + + ci.c 5.21 + co.c 5.9 + ident.c 5.3 + rcs.c 5.12 + rcsbase.h 5.11 + rcsdiff.c 5.10 + rcsedit.c 5.11 + rcsfcmp.c 5.9 + rcsgen.c 5.10 + rcslex.c 5.11 + rcsmap.c 5.2 + rcsutil.c 5.10 + + You can use the `tag' command to give a symbolic name to a certain +revision of a file. You can use the `-v' flag to the `status' command +to see all tags that a file has, and which revision numbers they +represent. Tag names must start with an uppercase or lowercase letter +and can contain uppercase and lowercase letters, digits, `-', and `_'. +The two tag names `BASE' and `HEAD' are reserved for use by CVS. It is +expected that future names which are special to CVS will be specially +named, for example by starting with `.', rather than being named +analogously to `BASE' and `HEAD', to avoid conflicts with actual tag +names. + + You'll want to choose some convention for naming tags, based on +information such as the name of the program and the version number of +the release. For example, one might take the name of the program, +immediately followed by the version number with `.' changed to `-', so +that CVS 1.9 would be tagged with the name `cvs1-9'. If you choose a +consistent convention, then you won't constantly be guessing whether a +tag is `cvs-1-9' or `cvs1_9' or what. You might even want to consider +enforcing your convention in the taginfo file (*note user-defined +logging::.). + + The following example shows how you can add a tag to a file. The +commands must be issued inside your working copy of the module. That +is, you should issue the command in the directory where `backend.c' +resides. + + $ cvs tag release-0-4 backend.c + T backend.c + $ cvs status -v backend.c + =================================================================== + File: backend.c Status: Up-to-date + + Version: 1.4 Tue Dec 1 14:39:01 1992 + RCS Version: 1.4 /usr/local/cvsroot/yoyodyne/tc/backend.c,v + Sticky Tag: (none) + Sticky Date: (none) + Sticky Options: (none) + + Existing Tags: + release-0-4 (revision: 1.4) + + There is seldom reason to tag a file in isolation. A more common +use is to tag all the files that constitute a module with the same tag +at strategic points in the development life-cycle, such as when a +release is made. + + $ cvs tag release-1-0 . + cvs tag: Tagging . + T Makefile + T backend.c + T driver.c + T frontend.c + T parser.c + + (When you give CVS a directory as argument, it generally applies the +operation to all the files in that directory, and (recursively), to any +subdirectories that it may contain. *Note Recursive behavior::.) + + The `checkout' command has a flag, `-r', that lets you check out a +certain revision of a module. This flag makes it easy to retrieve the +sources that make up release 1.0 of the module `tc' at any time in the +future: + + $ cvs checkout -r release-1-0 tc + +This is useful, for instance, if someone claims that there is a bug in +that release, but you cannot find the bug in the current working copy. + + You can also check out a module as it was at any given date. *Note +checkout options::. + + When you tag more than one file with the same tag you can think +about the tag as "a curve drawn through a matrix of filename vs. +revision number." Say we have 5 files with the following revisions: + + file1 file2 file3 file4 file5 + + 1.1 1.1 1.1 1.1 /--1.1* <-*- TAG + 1.2*- 1.2 1.2 -1.2*- + 1.3 \- 1.3*- 1.3 / 1.3 + 1.4 \ 1.4 / 1.4 + \-1.5*- 1.5 + 1.6 + + At some time in the past, the `*' versions were tagged. You can +think of the tag as a handle attached to the curve drawn through the +tagged revisions. When you pull on the handle, you get all the tagged +revisions. Another way to look at it is that you "sight" through a set +of revisions that is "flat" along the tagged revisions, like this: + + file1 file2 file3 file4 file5 + + 1.1 + 1.2 + 1.1 1.3 _ + 1.1 1.2 1.4 1.1 / + 1.2*----1.3*----1.5*----1.2*----1.1 (--- <--- Look here + 1.3 1.6 1.3 \_ + 1.4 1.4 + 1.5 + + +File: cvs.info, Node: Branches motivation, Next: Creating a branch, Prev: Tags, Up: Revisions and branches + +What branches are good for +========================== + + Suppose that release 1.0 of tc has been made. You are continuing to +develop tc, planning to create release 1.1 in a couple of months. +After a while your customers start to complain about a fatal bug. You +check out release 1.0 (*note Tags::.) and find the bug (which turns out +to have a trivial fix). However, the current revision of the sources +are in a state of flux and are not expected to be stable for at least +another month. There is no way to make a bugfix release based on the +newest sources. + + The thing to do in a situation like this is to create a "branch" on +the revision trees for all the files that make up release 1.0 of tc. +You can then make modifications to the branch without disturbing the +main trunk. When the modifications are finished you can select to +either incorporate them on the main trunk, or leave them on the branch. +  File: cvs.info, Node: Creating a branch, Next: Sticky tags, Prev: Branches motivation, Up: Revisions and branches @@ -81,7 +262,7 @@ 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: Revisions and branches +File: cvs.info, Node: Sticky tags, Next: Magic branch numbers, Prev: Creating a branch, Up: Revisions and branches Sticky tags =========== @@ -155,6 +336,41 @@ contents it had previously. Here is how to do it: done $ + +File: cvs.info, Node: Magic branch numbers, Prev: Sticky tags, Up: Revisions and branches + +Magic branch numbers +==================== + + This section describes a CVS feature called "magic branches". For +most purposes, you need not worry about magic branches; CVS handles +them for you. However, they are visible to you in certain +circumstances, so it may be useful to have some idea of how it works. + + Externally, branch numbers consist of an odd number of dot-separated +decimal integers. *Note Revision numbers::. That is not the whole +truth, however. For efficiency reasons CVS sometimes inserts an extra 0 +in the second rightmost position (1.2.3 becomes 1.2.0.3, 8.9.10.11.12 +becomes 8.9.10.11.0.12 and so on). + + CVS does a pretty good job at hiding these so called magic branches, +but in a few places the hiding is incomplete: + + * The magic branch number appears in the output from `cvs log'. + + * You cannot specify a symbolic branch name to `cvs admin'. + + You can use the `admin' command to reassign a symbolic name to a +branch the way RCS expects it to be. If `R4patches' is assigned to the +branch 1.4.2 (magic branch number 1.4.0.2) in file `numbers.c' you can +do this: + + $ cvs admin -NR4patches:1.4.2 numbers.c + + It only works if at least one revision is already committed on the +branch. Be very careful so that you do not assign the tag to the wrong +number. (There is no way to see how the tag was assigned yesterday). +  File: cvs.info, Node: Merging, Next: Recursive behavior, Prev: Revisions and branches, Up: Top @@ -695,8 +911,7 @@ The Normal way to Rename The normal way to move a file is to copy OLD to NEW, and then issue the normal CVS commands to remove OLD from the repository, and add NEW -to it. (Both OLD and NEW could contain relative paths, for example -`foo/bar.c'). +to it. $ mv OLD NEW $ cvs remove OLD @@ -709,9 +924,9 @@ history of the file you must specify the old or the new name, depending on what portion of the history you are accessing. For example, `cvs log OLD' will give the log up until the time of the rename. - When NEW is committed its revision numbers will start at 1.0 again, -so if that bothers you, use the `-r rev' option to commit (*note commit -options::.) + When NEW is committed its revision numbers will start again, usually +at 1.1, so if that bothers you, use the `-r rev' option to commit. For +more information see *Note Assigning revisions::.  File: cvs.info, Node: Inside, Next: Rename by copying, Prev: Outside, Up: Moving files @@ -783,9 +998,6 @@ Disadvantages: * You cannot easily see the history of the file across the rename. - * Unless you use the `-r rev' (*note commit options::.) flag when - NEW is committed its revision numbers will start at 1.0 again. -  File: cvs.info, Node: Moving directories, Next: History browsing, Prev: Moving files, Up: Top @@ -946,8 +1158,8 @@ file. * Avoiding substitution:: Avoiding substitution * Substitution modes:: Substitution modes * Log keyword:: Problems with the $Log: cvs.info-3,v $ -* Log keyword:: Problems with the Revision 1.1.1.8 1997/03/29 04:46:01 tholo -* Log keyword:: Problems with the Latest release from Cyclic Software +* Log keyword:: Problems with the Revision 1.1.1.9 1997/04/21 04:34:12 tholo +* Log keyword:: Problems with the Missing files from import * Log keyword:: Problems with the keyword.  @@ -962,17 +1174,17 @@ RCS Keywords `$Author: tholo $' The login name of the user who checked in the revision. -`$Date: 1997/03/29 04:46:01 $' +`$Date: 1997/04/21 04:34:12 $' The date and time (UTC) the revision was checked in. -`$Header: /home/cvs/src/gnu/usr.bin/cvs/doc/cvs.info-3,v 1.1.1.8 1997/03/29 04:46:01 tholo Exp $' +`$Header: /home/cvs/src/gnu/usr.bin/cvs/doc/cvs.info-3,v 1.1.1.9 1997/04/21 04:34:12 tholo Exp $' A standard header containing the full pathname of the RCS file, the revision number, the date (UTC), the author, the state, and the locker (if locked). Files will normally never be locked when you use CVS. -`$Id: cvs.info-3,v 1.1.1.8 1997/03/29 04:46:01 tholo Exp $' - Same as `$Header: /home/cvs/src/gnu/usr.bin/cvs/doc/cvs.info-3,v 1.1.1.8 1997/03/29 04:46:01 tholo Exp $', except that the RCS filename is without a path. +`$Id: cvs.info-3,v 1.1.1.9 1997/04/21 04:34:12 tholo Exp $' + Same as `$Header: /home/cvs/src/gnu/usr.bin/cvs/doc/cvs.info-3,v 1.1.1.9 1997/04/21 04:34:12 tholo Exp $', except that the RCS filename is without a path. `$Name: $' Tag name used to check out this file. @@ -982,15 +1194,15 @@ RCS Keywords locked, and thus almost always useless when you are using CVS). `$Log: cvs.info-3,v $ -`Revision 1.1.1.8 1997/03/29 04:46:01 tholo -`Latest release from Cyclic Software +`Revision 1.1.1.9 1997/04/21 04:34:12 tholo +`Missing files from import `' The log message supplied during commit, preceded by a header containing the RCS filename, the revision number, the author, and the date (UTC). Existing log messages are *not* replaced. Instead, the new log message is inserted after `$Log: cvs.info-3,v $ - Instead, the new log message is inserted after `Revision 1.1.1.8 1997/03/29 04:46:01 tholo - Instead, the new log message is inserted after `Latest release from Cyclic Software + Instead, the new log message is inserted after `Revision 1.1.1.9 1997/04/21 04:34:12 tholo + Instead, the new log message is inserted after `Missing files from import Instead, the new log message is inserted after `'. Each new line is prefixed with a "comment leader" which RCS guesses from the file name extension. It can be changed with `cvs admin @@ -1001,7 +1213,7 @@ RCS Keywords `$RCSfile: cvs.info-3,v $' The name of the RCS file without a path. -`$Revision: 1.1.1.8 $' +`$Revision: 1.1.1.9 $' The revision number assigned to the revision. `$Source: /home/cvs/src/gnu/usr.bin/cvs/doc/cvs.info-3,v $' @@ -1018,14 +1230,14 @@ Using keywords ============== To include a keyword string you simply include the relevant text -string, such as `$Id: cvs.info-3,v 1.1.1.8 1997/03/29 04:46:01 tholo Exp $', inside the file, and commit the file. CVS will +string, such as `$Id: cvs.info-3,v 1.1.1.9 1997/04/21 04:34:12 tholo Exp $', inside the file, and commit the file. CVS will automatically expand the string as part of the commit operation. - It is common to embed `$Id: cvs.info-3,v 1.1.1.8 1997/03/29 04:46:01 tholo Exp $' string in the C source code. This + It is common to embed `$Id: cvs.info-3,v 1.1.1.9 1997/04/21 04:34:12 tholo Exp $' string in the C source code. This example shows the first few lines of a typical file, after keyword substitution has been performed: - static char *rcsid="$Id: cvs.info-3,v 1.1.1.8 1997/03/29 04:46:01 tholo Exp $"; + static char *rcsid="$Id: cvs.info-3,v 1.1.1.9 1997/04/21 04:34:12 tholo Exp $"; /* The following lines will prevent `gcc' version 2.X from issuing an "unused variable" warning. */ #if __GNUC__ == 2 @@ -1045,11 +1257,11 @@ binary files. $ ident samp.c samp.c: - $Id: cvs.info-3,v 1.1.1.8 1997/03/29 04:46:01 tholo Exp $ + $Id: cvs.info-3,v 1.1.1.9 1997/04/21 04:34:12 tholo Exp $ $ gcc samp.c $ ident a.out a.out: - $Id: cvs.info-3,v 1.1.1.8 1997/03/29 04:46:01 tholo Exp $ + $Id: cvs.info-3,v 1.1.1.9 1997/04/21 04:34:12 tholo Exp $ SCCS is another popular revision control system. It has a command, `what', which is very similar to `ident' and used for the same purpose. @@ -1058,7 +1270,7 @@ character sequence `@(#)' it is easy to include keywords that are detected by either command. Simply prefix the RCS keyword with the magic SCCS phrase, like this: - static char *id="@(#) $Id: cvs.info-3,v 1.1.1.8 1997/03/29 04:46:01 tholo Exp $"; + static char *id="@(#) $Id: cvs.info-3,v 1.1.1.9 1997/04/21 04:34:12 tholo Exp $";  File: cvs.info, Node: Avoiding substitution, Next: Substitution modes, Prev: Using keywords, Up: Keyword substitution @@ -1081,212 +1293,3 @@ this manual contains `$@asis{}Author$' whenever the text `$Author: tholo $' should appear. In `nroff' and `troff' you can embed the null-character `\&' inside the keyword for a similar effect. - -File: cvs.info, Node: Substitution modes, Next: Log keyword, Prev: Avoiding substitution, Up: Keyword substitution - -Substitution modes -================== - - Each file has a stored default substitution mode, and each working -directory copy of a file also has a substitution mode. The former is -set by the `-k' option to `cvs add' and `cvs admin'; the latter is set -by the -k or -A options to `cvs checkout' or `cvs update'. `cvs diff' -also has a `-k' option. For some examples, *Note Binary files::. - - The modes available are: - -`-kkv' - Generate keyword strings using the default form, e.g. `$Revision: - 5.7 $' for the `Revision' keyword. - -`-kkvl' - Like `-kkv', except that a locker's name is always inserted if the - given revision is currently locked. This option is normally not - useful when CVS is used. - -`-kk' - Generate only keyword names in keyword strings; omit their values. - For example, for the `Revision' keyword, generate the string - `$Revision: 1.1.1.8 $' instead of `$Revision: 1.1.1.8 $'. This option is useful - to ignore differences due to keyword substitution when comparing - different revisions of a file. - -`-ko' - Generate the old keyword string, present in the working file just - before it was checked in. For example, for the `Revision' - keyword, generate the string `$Revision: 1.1.1.8 $' instead of - `$Revision: 1.1.1.8 $' if that is how the string appeared when the - file was checked in. - -`-kb' - Like `-ko', but also inhibit conversion of line endings between - the canonical form in which they are stored in the repository - (linefeed only), and the form appropriate to the operating system - in use on the client. For systems, like unix, which use linefeed - only to terminate lines, this is the same as `-ko'. For more - information on binary files, see *Note Binary files::. - -`-kv' - Generate only keyword values for keyword strings. For example, - for the `Revision' keyword, generate the string `5.7' instead of - `$Revision: 1.1.1.8 $'. This can help generate files in programming - languages where it is hard to strip keyword delimiters like - `$Revision: 1.1.1.8 $' from a string. However, further keyword - substitution cannot be performed once the keyword names are - removed, so this option should be used with care. - - One often would like to use `-kv' with `cvs export'--*note - export::.. But be aware that doesn't handle an export containing - binary files correctly. - - -File: cvs.info, Node: Log keyword, Prev: Substitution modes, Up: Keyword substitution - -Problems with the $Log: cvs.info-3,v $ -Problems with the Revision 1.1.1.8 1997/03/29 04:46:01 tholo -Problems with the Latest release from Cyclic Software -Problems with the keyword. -================================ - - The `$Log: cvs.info-3,v $ - The `Revision 1.1.1.8 1997/03/29 04:46:01 tholo - The `Latest release from Cyclic Software - The `' keyword is somewhat controversial. As long as you are -working on your development system the information is easily accessible -even if you do not use the `$Log: cvs.info-3,v $ -even if you do not use the `Revision 1.1.1.8 1997/03/29 04:46:01 tholo -even if you do not use the `Latest release from Cyclic Software -even if you do not use the `' keyword--just do a `cvs log'. Once -you export the file the history information might be useless anyhow. - - A more serious concern is that RCS is not good at handling `$Log: cvs.info-3,v $ - A more serious concern is that RCS is not good at handling `Revision 1.1.1.8 1997/03/29 04:46:01 tholo - A more serious concern is that RCS is not good at handling `Latest release from Cyclic Software - A more serious concern is that RCS is not good at handling `' -entries when a branch is merged onto the main trunk. Conflicts often -result from the merging operation. - - People also tend to "fix" the log entries in the file (correcting -spelling mistakes and maybe even factual errors). If that is done the -information from `cvs log' will not be consistent with the information -inside the file. This may or may not be a problem in real life. - - It has been suggested that the `$Log: cvs.info-3,v $ - It has been suggested that the `Revision 1.1.1.8 1997/03/29 04:46:01 tholo - It has been suggested that the `Latest release from Cyclic Software - It has been suggested that the `' keyword should be inserted -*last* in the file, and not in the files header, if it is to be used at -all. That way the long list of change messages will not interfere with -everyday source file browsing. - - -File: cvs.info, Node: Binary files, Next: Builds, Prev: Keyword substitution, Up: Top - -Handling binary files -********************* - - There are two issues with using CVS to store binary files. The -first is that CVS by default convert line endings between the canonical -form in which they are stored in the repository (linefeed only), and -the form appropriate to the operating system in use on the client (for -example, carriage return followed by line feed for Windows NT). - - The second is that a binary file might happen to contain data which -looks like a keyword (*note Keyword substitution::.), so keyword -expansion must be turned off. - - The `-kb' option available with some CVS commands insures that -neither line ending conversion nor keyword expansion will be done. If -you are using an old version of RCS without this option, and you are -using an operating system, such as unix, which terminates lines with -linefeeds only, you can use `-ko' instead; if you are on another -operating system, upgrade to a version of RCS, such as 5.7 or later, -which supports `-kb'. - - Here is an example of how you can create a new file using the `-kb' -flag: - - $ echo '$Id: cvs.info-3,v 1.1.1.8 1997/03/29 04:46:01 tholo Exp $' > kotest - $ cvs add -kb -m"A test file" kotest - $ cvs ci -m"First checkin; contains a keyword" kotest - - If a file accidentally gets added without `-kb', one can use the -`cvs admin' command to recover. For example: - - $ echo '$Id: cvs.info-3,v 1.1.1.8 1997/03/29 04:46:01 tholo Exp $' > kotest - $ cvs add -m"A test file" kotest - $ cvs ci -m"First checkin; contains a keyword" kotest - $ cvs admin -kb kotest - $ cvs update -A kotest - $ cvs commit -m "make it binary" kotest # For non-unix systems - - When you check in the file `kotest' the keywords are expanded. (Try -the above example, and do a `cat kotest' after every command). The `cvs -admin -kb' command sets the default keyword substitution method for -this file, but it does not alter the working copy of the file that you -have. The easiest way to get the unexpanded version of `kotest' is -`cvs update -A'. If you need to cope with line endings (that is, you -are using a CVS client on a non-unix system), then you need to check in -a new copy of the file, as shown by the `cvs commit' command above. - - However, in using `cvs admin -k' to change the keyword expansion, be -aware that the keyword expansion mode is not version controlled. This -means that, for example, that if you have a text file in old releases, -and a binary file with the same name in new releases, CVS provides no -way to check out the file in text or binary mode depending on what -version you are checking out. There is no good workaround for this -problem. - - You can also set a default for whether `cvs add' and `cvs import' -treat a file as binary based on its name; for example you could say -that files who names end in `.exe' are binary. *Note Wrappers::. - - -File: cvs.info, Node: Builds, Next: Compatibility, Prev: Binary files, Up: Top - -How your build system interacts with CVS -**************************************** - - As mentioned in the introduction, CVS does not contain software for -building your software from source code. This section describes how -various aspects of your build system might interact with CVS. - - One common question, especially from people who are accustomed to -RCS, is how to make their build get an up to date copy of the sources. -The answer to this with CVS is two-fold. First of all, since CVS -itself can recurse through directories, there is no need to modify your -`Makefile' (or whatever configuration file your build tool uses) to -make sure each file is up to date. Instead, just use two commands, -first `cvs -q update' and then `make' or whatever the command is to -invoke your build tool. Secondly, you do not necessarily *want* to get -a copy of a change someone else made until you have finished your own -work. One suggested approach is to first update your sources, then -implement, build and test the change you were thinking of, and then -commit your sources (updating first if necessary). By periodically (in -between changes, using the approach just described) updating your -entire tree, you ensure that your sources are sufficiently up to date. - - One common need is to record which versions of which source files -went into a particular build. This kind of functionality is sometimes -called "bill of materials" or something similar. The best way to do -this with CVS is to use the `tag' command to record which versions went -into a given build (*note Tags::.). - - Using CVS in the most straightforward manner possible, each -developer will have a copy of the entire source tree which is used in a -particular build. If the source tree is small, or if developers are -geographically dispersed, this is the preferred solution. In fact one -approach for larger projects is to break a project down into smaller -separately-compiled subsystems, and arrange a way of releasing them -internally so that each developer need check out only those subsystems -which are they are actively working on. - - Another approach is to set up a structure which allows developers to -have their own copies of some files, and for other files to access -source files from a central location. Many people have come up with -some such a system using features such as the symbolic link feature -found in many operating systems, or the `VPATH' feature found in many -versions of `make'. One build tool which is designed to help with this -kind of thing is Odin (see -`ftp://ftp.cs.colorado.edu/pub/distribs/odin'). - diff --git a/gnu/usr.bin/cvs/doc/cvs.info-4 b/gnu/usr.bin/cvs/doc/cvs.info-4 index 091cf6527ba..1d075c16454 100644 --- a/gnu/usr.bin/cvs/doc/cvs.info-4 +++ b/gnu/usr.bin/cvs/doc/cvs.info-4 @@ -21,6 +21,215 @@ versions, except that the section entitled "GNU General Public License" 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: Substitution modes, Next: Log keyword, Prev: Avoiding substitution, Up: Keyword substitution + +Substitution modes +================== + + Each file has a stored default substitution mode, and each working +directory copy of a file also has a substitution mode. The former is +set by the `-k' option to `cvs add' and `cvs admin'; the latter is set +by the -k or -A options to `cvs checkout' or `cvs update'. `cvs diff' +also has a `-k' option. For some examples, *Note Binary files::. + + The modes available are: + +`-kkv' + Generate keyword strings using the default form, e.g. `$Revision: + 5.7 $' for the `Revision' keyword. + +`-kkvl' + Like `-kkv', except that a locker's name is always inserted if the + given revision is currently locked. This option is normally not + useful when CVS is used. + +`-kk' + Generate only keyword names in keyword strings; omit their values. + For example, for the `Revision' keyword, generate the string + `$Revision: 1.1.1.9 $' instead of `$Revision: 1.1.1.9 $'. This option is useful + to ignore differences due to keyword substitution when comparing + different revisions of a file. + +`-ko' + Generate the old keyword string, present in the working file just + before it was checked in. For example, for the `Revision' + keyword, generate the string `$Revision: 1.1.1.9 $' instead of + `$Revision: 1.1.1.9 $' if that is how the string appeared when the + file was checked in. + +`-kb' + Like `-ko', but also inhibit conversion of line endings between + the canonical form in which they are stored in the repository + (linefeed only), and the form appropriate to the operating system + in use on the client. For systems, like unix, which use linefeed + only to terminate lines, this is the same as `-ko'. For more + information on binary files, see *Note Binary files::. + +`-kv' + Generate only keyword values for keyword strings. For example, + for the `Revision' keyword, generate the string `5.7' instead of + `$Revision: 1.1.1.9 $'. This can help generate files in programming + languages where it is hard to strip keyword delimiters like + `$Revision: 1.1.1.9 $' from a string. However, further keyword + substitution cannot be performed once the keyword names are + removed, so this option should be used with care. + + One often would like to use `-kv' with `cvs export'--*note + export::.. But be aware that doesn't handle an export containing + binary files correctly. + + +File: cvs.info, Node: Log keyword, Prev: Substitution modes, Up: Keyword substitution + +Problems with the $Log: cvs.info-4,v $ +Problems with the Revision 1.1.1.9 1997/04/21 04:34:14 tholo +Problems with the Missing files from import +Problems with the keyword. +================================ + + The `$Log: cvs.info-4,v $ + The `Revision 1.1.1.9 1997/04/21 04:34:14 tholo + The `Missing files from import + The `' keyword is somewhat controversial. As long as you are +working on your development system the information is easily accessible +even if you do not use the `$Log: cvs.info-4,v $ +even if you do not use the `Revision 1.1.1.9 1997/04/21 04:34:14 tholo +even if you do not use the `Missing files from import +even if you do not use the `' keyword--just do a `cvs log'. Once +you export the file the history information might be useless anyhow. + + A more serious concern is that RCS is not good at handling `$Log: cvs.info-4,v $ + A more serious concern is that RCS is not good at handling `Revision 1.1.1.9 1997/04/21 04:34:14 tholo + A more serious concern is that RCS is not good at handling `Missing files from import + A more serious concern is that RCS is not good at handling `' +entries when a branch is merged onto the main trunk. Conflicts often +result from the merging operation. + + People also tend to "fix" the log entries in the file (correcting +spelling mistakes and maybe even factual errors). If that is done the +information from `cvs log' will not be consistent with the information +inside the file. This may or may not be a problem in real life. + + It has been suggested that the `$Log: cvs.info-4,v $ + It has been suggested that the `Revision 1.1.1.9 1997/04/21 04:34:14 tholo + It has been suggested that the `Missing files from import + It has been suggested that the `' keyword should be inserted +*last* in the file, and not in the files header, if it is to be used at +all. That way the long list of change messages will not interfere with +everyday source file browsing. + + +File: cvs.info, Node: Binary files, Next: Builds, Prev: Keyword substitution, Up: Top + +Handling binary files +********************* + + There are two issues with using CVS to store binary files. The +first is that CVS by default convert line endings between the canonical +form in which they are stored in the repository (linefeed only), and +the form appropriate to the operating system in use on the client (for +example, carriage return followed by line feed for Windows NT). + + The second is that a binary file might happen to contain data which +looks like a keyword (*note Keyword substitution::.), so keyword +expansion must be turned off. + + The `-kb' option available with some CVS commands insures that +neither line ending conversion nor keyword expansion will be done. If +you are using an old version of RCS without this option, and you are +using an operating system, such as unix, which terminates lines with +linefeeds only, you can use `-ko' instead; if you are on another +operating system, upgrade to a version of RCS, such as 5.7 or later, +which supports `-kb'. + + Here is an example of how you can create a new file using the `-kb' +flag: + + $ echo '$Id: cvs.info-4,v 1.1.1.9 1997/04/21 04:34:14 tholo Exp $' > kotest + $ cvs add -kb -m"A test file" kotest + $ cvs ci -m"First checkin; contains a keyword" kotest + + If a file accidentally gets added without `-kb', one can use the +`cvs admin' command to recover. For example: + + $ echo '$Id: cvs.info-4,v 1.1.1.9 1997/04/21 04:34:14 tholo Exp $' > kotest + $ cvs add -m"A test file" kotest + $ cvs ci -m"First checkin; contains a keyword" kotest + $ cvs admin -kb kotest + $ cvs update -A kotest + $ cvs commit -m "make it binary" kotest # For non-unix systems + + When you check in the file `kotest' the keywords are expanded. (Try +the above example, and do a `cat kotest' after every command). The `cvs +admin -kb' command sets the default keyword substitution method for +this file, but it does not alter the working copy of the file that you +have. The easiest way to get the unexpanded version of `kotest' is +`cvs update -A'. If you need to cope with line endings (that is, you +are using a CVS client on a non-unix system), then you need to check in +a new copy of the file, as shown by the `cvs commit' command above. + + However, in using `cvs admin -k' to change the keyword expansion, be +aware that the keyword expansion mode is not version controlled. This +means that, for example, that if you have a text file in old releases, +and a binary file with the same name in new releases, CVS provides no +way to check out the file in text or binary mode depending on what +version you are checking out. There is no good workaround for this +problem. + + You can also set a default for whether `cvs add' and `cvs import' +treat a file as binary based on its name; for example you could say +that files who names end in `.exe' are binary. *Note Wrappers::. + + +File: cvs.info, Node: Builds, Next: Compatibility, Prev: Binary files, Up: Top + +How your build system interacts with CVS +**************************************** + + As mentioned in the introduction, CVS does not contain software for +building your software from source code. This section describes how +various aspects of your build system might interact with CVS. + + One common question, especially from people who are accustomed to +RCS, is how to make their build get an up to date copy of the sources. +The answer to this with CVS is two-fold. First of all, since CVS +itself can recurse through directories, there is no need to modify your +`Makefile' (or whatever configuration file your build tool uses) to +make sure each file is up to date. Instead, just use two commands, +first `cvs -q update' and then `make' or whatever the command is to +invoke your build tool. Secondly, you do not necessarily *want* to get +a copy of a change someone else made until you have finished your own +work. One suggested approach is to first update your sources, then +implement, build and test the change you were thinking of, and then +commit your sources (updating first if necessary). By periodically (in +between changes, using the approach just described) updating your +entire tree, you ensure that your sources are sufficiently up to date. + + One common need is to record which versions of which source files +went into a particular build. This kind of functionality is sometimes +called "bill of materials" or something similar. The best way to do +this with CVS is to use the `tag' command to record which versions went +into a given build (*note Tags::.). + + Using CVS in the most straightforward manner possible, each +developer will have a copy of the entire source tree which is used in a +particular build. If the source tree is small, or if developers are +geographically dispersed, this is the preferred solution. In fact one +approach for larger projects is to break a project down into smaller +separately-compiled subsystems, and arrange a way of releasing them +internally so that each developer need check out only those subsystems +which are they are actively working on. + + Another approach is to set up a structure which allows developers to +have their own copies of some files, and for other files to access +source files from a central location. Many people have come up with +some such a system using features such as the symbolic link feature +found in many operating systems, or the `VPATH' feature found in many +versions of `make'. One build tool which is designed to help with this +kind of thing is Odin (see +`ftp://ftp.cs.colorado.edu/pub/distribs/odin'). +  File: cvs.info, Node: Compatibility, Next: Revision management, Prev: Builds, Up: Top @@ -234,6 +443,7 @@ Global options `-e EDITOR' Use EDITOR to enter revision log information. Overrides the setting of the `$CVSEDITOR' and `$EDITOR' environment variables. + For more information, see *Note Committing your changes::. `-f' Do not read the `~/.cvsrc' file. This option is most often used @@ -526,8 +736,8 @@ than RCS. Useful with CVS. Sets the comment leader to STRING. The comment leader is printed before every log message line generated by the keyword `$Log: cvs.info-4,v $ - keyword `Revision 1.1.1.8 1997/03/29 04:46:03 tholo - keyword `Latest release from Cyclic Software + keyword `Revision 1.1.1.9 1997/04/21 04:34:14 tholo + keyword `Missing files from import keyword `' (*note Keyword substitution::.). This is useful for programming languages without multi-line comments. RCS initially guesses the value of the comment leader from the file @@ -624,8 +834,8 @@ than RCS. and `Rel' (for released). By default, the state of a new revision is set to `Exp' when it is created. The state is visible in the output from CVS LOG (*note log::.), and in the `$Log: cvs.info-4,v $ - output from CVS LOG (*note log::.), and in the `Revision 1.1.1.8 1997/03/29 04:46:03 tholo - output from CVS LOG (*note log::.), and in the `Latest release from Cyclic Software + output from CVS LOG (*note log::.), and in the `Revision 1.1.1.9 1997/04/21 04:34:14 tholo + output from CVS LOG (*note log::.), and in the `Missing files from import output from CVS LOG (*note log::.), and in the `' and `$State: Exp $' keywords (*note Keyword substitution::.). Note that CVS uses the `dead' state for its own purposes; to take a file to or @@ -704,8 +914,8 @@ Comment leaders ............... If you use the `$Log: cvs.info-4,v $ - If you use the `Revision 1.1.1.8 1997/03/29 04:46:03 tholo - If you use the `Latest release from Cyclic Software + If you use the `Revision 1.1.1.9 1997/04/21 04:34:14 tholo + If you use the `Missing files from import If you use the `' keyword and you do not agree with the guess for comment leader that CVS has done, you can enforce your will with `cvs admin -c'. This might be suitable for `nroff' source: @@ -1044,223 +1254,3 @@ trunk. $ cvs checkout -r EXPR1 whatever_module - -File: cvs.info, Node: diff, Next: export, Prev: commit, Up: CVS commands - -diff--Run diffs between revisions -================================= - - * Synopsis: diff [-l] [rcsdiff_options] [[-r rev1 | -D date1] [-r - rev2 | -D date2]] [files...] - - * Requires: working directory, repository. - - * Changes: nothing. - - The `diff' command is used to compare different revisions of files. -The default action is to compare your working files with the revisions -they were based on, and report any differences that are found. - - If any file names are given, only those files are compared. If any -directories are given, all files under them will be compared. - - The exit status will be 0 if no differences were found, 1 if some -differences were found, and 2 if any error occurred. - -* Menu: - -* diff options:: diff options -* diff examples:: diff examples - - -File: cvs.info, Node: diff options, Next: diff examples, Up: diff - -diff options ------------- - - These standard options are supported by `diff' (*note Common -options::., for a complete description of them): - -`-D DATE' - Use the most recent revision no later than DATE. See `-r' for how - this affects the comparison. - -`-k KFLAG' - Process RCS keywords according to KFLAG. See co(1). - -`-l' - Local; run only in current working directory. - -`-R' - Examine directories recursively. This option is on by default. - -`-r TAG' - Compare with revision TAG. Zero, one or two `-r' options can be - present. With no `-r' option, the working file will be compared - with the revision it was based on. With one `-r', that revision - will be compared to your current working file. With two `-r' - options those two revisions will be compared (and your working - file will not affect the outcome in any way). - - One or both `-r' options can be replaced by a `-D DATE' option, - described above. - -`--ifdef=ARG' - Output in ifdef format. Consult the documentation of your - underlying diff program concerning the `-D' option to diff, for - more information on this format. - - The following options are passed through to `rcsdiff', which in turn -passes them to `diff'. The exact meaning of the options depends on -which `diff' you are using. See the documentation for your `diff' for -details. - - `-a' `-b' `-B' `-c' `-C' NLINES `-d' `-e' `-f' `-h' `-H' `-i' `-n' -`-N' `-p' `-s' `-t' `-u' `-U' NLINES `-F' REGEXP `-I' REGEXP `-L' LABEL -`-T' `-V' ARG `-W' COLUMNS `-w' `-y' `-0' `-1' `-2' `-3' `-4' `-5' `-6' -`-7' `-8' `-9' `--binary' `--brief' `--changed-group-format=ARG' -`--context[=LINES]' `--ed' `--expand-tabs' `--forward-ed' -`--horizon-lines=ARG' `--ignore-all-space' `--ignore-blank-lines' -`--ignore-case' `--ignore-matching-lines=REGEXP' -`--ignore-space-change' `--initial-tab' `--label=LABEL' `--left-column' -`--minimal' `--new-file' `--new-line-format=ARG' -`--old-line-format=ARG' `--paginate' `--rcs' `--report-identical-files' -`--code-c-function' `--side-by-side' `--show-function-line=REGEXP' -`--speed-large-files' `--suppress-common-lines' `--text' -`--unchanged-group-format=ARG' `--unified[=LINES]' `--width=COLUMNS' - - -File: cvs.info, Node: diff examples, Prev: diff options, Up: diff - -diff examples -------------- - - The following line produces a Unidiff (`-u' flag) between revision -1.14 and 1.19 of `backend.c'. Due to the `-kk' flag no keywords are -substituted, so differences that only depend on keyword substitution -are ignored. - - $ cvs diff -kk -u -r 1.14 -r 1.19 backend.c - - Suppose the experimental branch EXPR1 was based on a set of files -tagged RELEASE_1_0. To see what has happened on that branch, the -following can be used: - - $ cvs diff -r RELEASE_1_0 -r EXPR1 - - A command like this can be used to produce a context diff between -two releases: - - $ cvs diff -c -r RELEASE_1_0 -r RELEASE_1_1 > diffs - - If you are maintaining ChangeLogs, a command like the following just -before you commit your changes may help you write the ChangeLog entry. -All local modifications that have not yet been committed will be -printed. - - $ cvs diff -u | less - - -File: cvs.info, Node: export, Next: history, Prev: diff, Up: CVS commands - -export--Export sources from CVS, similar to checkout -==================================================== - - * Synopsis: export [-flNn] [-r rev|-D date] [-k subst] [-d dir] - module... - - * Requires: repository. - - * Changes: current directory. - - This command is a variant of `checkout'; use it when you want a copy -of the source for module without the CVS administrative directories. -For example, you might use `export' to prepare source for shipment -off-site. This command requires that you specify a date or tag (with -`-D' or `-r'), so that you can count on reproducing the source you ship -to others. - - One often would like to use `-kv' with `cvs export'. This causes -any RCS keywords to be expanded such that an import done at some other -site will not lose the keyword revision information. But be aware that -doesn't handle an export containing binary files correctly. Also be -aware that after having used `-kv', one can no longer use the `ident' -command (which is part of the RCS suite--see ident(1)) which looks for -RCS keyword strings. If you want to be able to use `ident' you must not -use `-kv'. - -* Menu: - -* export options:: export options - - -File: cvs.info, Node: export options, Up: export - -export options --------------- - - These standard options are supported by `export' (*note Common -options::., for a complete description of them): - -`-D DATE' - Use the most recent revision no later than DATE. - -`-f' - If no matching revision is found, retrieve the most recent - revision (instead of ignoring the file). - -`-l' - Local; run only in current working directory. - -`-n' - Do not run any checkout program. - -`-R' - Export directories recursively. This is on by default. - -`-r TAG' - Use revision TAG. - - In addition, these options (that are common to `checkout' and -`export') are also supported: - -`-d DIR' - Create a directory called DIR for the working files, instead of - using the module name. Unless you also use `-N', the paths - created under DIR will be as short as possible. - -`-k SUBST' - Set keyword expansion mode (*note Substitution modes::.). - -`-N' - Only useful together with `-d DIR'. With this option, CVS will - not shorten module paths in your working directory. (Normally, - CVS shortens paths as much as possible when you specify an - explicit target directory.) - - -File: cvs.info, Node: history, Next: import, Prev: export, Up: CVS commands - -history--Show status of files and users -======================================= - - * Synopsis: history [-report] [-flags] [-options args] [files...] - - * Requires: the file `$CVSROOT/CVSROOT/history' - - * Changes: nothing. - - CVS can keep a history file that tracks each use of the `checkout', -`commit', `rtag', `update', and `release' commands. You can use -`history' to display this information in various formats. - - Logging must be enabled by creating the file -`$CVSROOT/CVSROOT/history'. - - *Warning:* `history' uses `-f', `-l', `-n', and `-p' in ways that -conflict with the normal use inside CVS (*note Common options::.). - -* Menu: - -* history options:: history options - diff --git a/gnu/usr.bin/cvs/doc/cvs.info-5 b/gnu/usr.bin/cvs/doc/cvs.info-5 index 48e6314f115..7879acef096 100644 --- a/gnu/usr.bin/cvs/doc/cvs.info-5 +++ b/gnu/usr.bin/cvs/doc/cvs.info-5 @@ -21,6 +21,226 @@ versions, except that the section entitled "GNU General Public License" 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: diff, Next: export, Prev: commit, Up: CVS commands + +diff--Run diffs between revisions +================================= + + * Synopsis: diff [-l] [rcsdiff_options] [[-r rev1 | -D date1] [-r + rev2 | -D date2]] [files...] + + * Requires: working directory, repository. + + * Changes: nothing. + + The `diff' command is used to compare different revisions of files. +The default action is to compare your working files with the revisions +they were based on, and report any differences that are found. + + If any file names are given, only those files are compared. If any +directories are given, all files under them will be compared. + + The exit status will be 0 if no differences were found, 1 if some +differences were found, and 2 if any error occurred. + +* Menu: + +* diff options:: diff options +* diff examples:: diff examples + + +File: cvs.info, Node: diff options, Next: diff examples, Up: diff + +diff options +------------ + + These standard options are supported by `diff' (*note Common +options::., for a complete description of them): + +`-D DATE' + Use the most recent revision no later than DATE. See `-r' for how + this affects the comparison. + +`-k KFLAG' + Process RCS keywords according to KFLAG. See co(1). + +`-l' + Local; run only in current working directory. + +`-R' + Examine directories recursively. This option is on by default. + +`-r TAG' + Compare with revision TAG. Zero, one or two `-r' options can be + present. With no `-r' option, the working file will be compared + with the revision it was based on. With one `-r', that revision + will be compared to your current working file. With two `-r' + options those two revisions will be compared (and your working + file will not affect the outcome in any way). + + One or both `-r' options can be replaced by a `-D DATE' option, + described above. + +`--ifdef=ARG' + Output in ifdef format. Consult the documentation of your + underlying diff program concerning the `-D' option to diff, for + more information on this format. + + The following options are passed through to `rcsdiff', which in turn +passes them to `diff'. The exact meaning of the options depends on +which `diff' you are using. See the documentation for your `diff' for +details. + + `-a' `-b' `-B' `-c' `-C' NLINES `-d' `-e' `-f' `-h' `-H' `-i' `-n' +`-N' `-p' `-s' `-t' `-u' `-U' NLINES `-F' REGEXP `-I' REGEXP `-L' LABEL +`-T' `-V' ARG `-W' COLUMNS `-w' `-y' `-0' `-1' `-2' `-3' `-4' `-5' `-6' +`-7' `-8' `-9' `--binary' `--brief' `--changed-group-format=ARG' +`--context[=LINES]' `--ed' `--expand-tabs' `--forward-ed' +`--horizon-lines=ARG' `--ignore-all-space' `--ignore-blank-lines' +`--ignore-case' `--ignore-matching-lines=REGEXP' +`--ignore-space-change' `--initial-tab' `--label=LABEL' `--left-column' +`--minimal' `--new-file' `--new-line-format=ARG' +`--old-line-format=ARG' `--paginate' `--rcs' `--report-identical-files' +`--code-c-function' `--side-by-side' `--show-function-line=REGEXP' +`--speed-large-files' `--suppress-common-lines' `--text' +`--unchanged-group-format=ARG' `--unified[=LINES]' `--width=COLUMNS' + + +File: cvs.info, Node: diff examples, Prev: diff options, Up: diff + +diff examples +------------- + + The following line produces a Unidiff (`-u' flag) between revision +1.14 and 1.19 of `backend.c'. Due to the `-kk' flag no keywords are +substituted, so differences that only depend on keyword substitution +are ignored. + + $ cvs diff -kk -u -r 1.14 -r 1.19 backend.c + + Suppose the experimental branch EXPR1 was based on a set of files +tagged RELEASE_1_0. To see what has happened on that branch, the +following can be used: + + $ cvs diff -r RELEASE_1_0 -r EXPR1 + + A command like this can be used to produce a context diff between +two releases: + + $ cvs diff -c -r RELEASE_1_0 -r RELEASE_1_1 > diffs + + If you are maintaining ChangeLogs, a command like the following just +before you commit your changes may help you write the ChangeLog entry. +All local modifications that have not yet been committed will be +printed. + + $ cvs diff -u | less + + +File: cvs.info, Node: export, Next: history, Prev: diff, Up: CVS commands + +export--Export sources from CVS, similar to checkout +==================================================== + + * Synopsis: export [-flNn] [-r rev|-D date] [-k subst] [-d dir] + module... + + * Requires: repository. + + * Changes: current directory. + + This command is a variant of `checkout'; use it when you want a copy +of the source for module without the CVS administrative directories. +For example, you might use `export' to prepare source for shipment +off-site. This command requires that you specify a date or tag (with +`-D' or `-r'), so that you can count on reproducing the source you ship +to others. + + One often would like to use `-kv' with `cvs export'. This causes +any RCS keywords to be expanded such that an import done at some other +site will not lose the keyword revision information. But be aware that +doesn't handle an export containing binary files correctly. Also be +aware that after having used `-kv', one can no longer use the `ident' +command (which is part of the RCS suite--see ident(1)) which looks for +RCS keyword strings. If you want to be able to use `ident' you must not +use `-kv'. + +* Menu: + +* export options:: export options + + +File: cvs.info, Node: export options, Up: export + +export options +-------------- + + These standard options are supported by `export' (*note Common +options::., for a complete description of them): + +`-D DATE' + Use the most recent revision no later than DATE. + +`-f' + If no matching revision is found, retrieve the most recent + revision (instead of ignoring the file). + +`-l' + Local; run only in current working directory. + +`-n' + Do not run any checkout program. + +`-R' + Export directories recursively. This is on by default. + +`-r TAG' + Use revision TAG. + + In addition, these options (that are common to `checkout' and +`export') are also supported: + +`-d DIR' + Create a directory called DIR for the working files, instead of + using the module name. Unless you also use `-N', the paths + created under DIR will be as short as possible. + +`-k SUBST' + Set keyword expansion mode (*note Substitution modes::.). + +`-N' + Only useful together with `-d DIR'. With this option, CVS will + not shorten module paths in your working directory. (Normally, + CVS shortens paths as much as possible when you specify an + explicit target directory.) + + +File: cvs.info, Node: history, Next: import, Prev: export, Up: CVS commands + +history--Show status of files and users +======================================= + + * Synopsis: history [-report] [-flags] [-options args] [files...] + + * Requires: the file `$CVSROOT/CVSROOT/history' + + * Changes: nothing. + + CVS can keep a history file that tracks each use of the `checkout', +`commit', `rtag', `update', and `release' commands. You can use +`history' to display this information in various formats. + + Logging must be enabled by creating the file +`$CVSROOT/CVSROOT/history'. + + *Warning:* `history' uses `-f', `-l', `-n', and `-p' in ways that +conflict with the normal use inside CVS (*note Common options::.). + +* Menu: + +* history options:: history options +  File: cvs.info, Node: history options, Up: history @@ -710,10 +930,10 @@ options::., for a complete description of them): `-a' Use the `-a' option to have `rtag' look in the `Attic' (*note - Removing files::.) for removed files that contain the specified - tag. The tag is removed from these files, which makes it - convenient to re-use a symbolic tag as development continues (and - files get removed from the up-coming distribution). + Attic::.) for removed files that contain the specified tag. The + tag is removed from these files, which makes it convenient to + re-use a symbolic tag as development continues (and files get + removed from the up-coming distribution). `-b' Make the tag a branch tag. *Note Revisions and branches::. diff --git a/gnu/usr.bin/cvs/doc/cvs.info-6 b/gnu/usr.bin/cvs/doc/cvs.info-6 index 40ac18a420b..d7c49a76a49 100644 --- a/gnu/usr.bin/cvs/doc/cvs.info-6 +++ b/gnu/usr.bin/cvs/doc/cvs.info-6 @@ -1021,8 +1021,8 @@ contains the required fields. If no matching line is found in the `editinfo' file, the editor specified in the environment variable `$CVSEDITOR' is used instead. If that variable is not set, then the environment variable `$EDITOR' is -used instead. If that variable is not set a precompiled default, -normally `vi', will be used. +used instead. If that variable is not set a default will be used. See +*Note Committing your changes::. The `editinfo' file is often most useful together with the `rcsinfo' file, which can be used to specify a log message template. diff --git a/gnu/usr.bin/cvs/doc/cvs.info-7 b/gnu/usr.bin/cvs/doc/cvs.info-7 index 96e5e5f00ab..b95f8587a01 100644 --- a/gnu/usr.bin/cvs/doc/cvs.info-7 +++ b/gnu/usr.bin/cvs/doc/cvs.info-7 @@ -57,8 +57,8 @@ All environment variables which affect CVS `$EDITOR' `$CVSEDITOR' Specifies the program to use for recording log messages during - commit. If not set, the default is `/usr/ucb/vi'. `$CVSEDITOR' - overrides `$EDITOR'. + commit. `$CVSEDITOR' overrides `$EDITOR'. See *Note Committing + your changes::. `$PATH' If `$RCSBIN' is not set, and no path is compiled into CVS, it will @@ -161,37 +161,113 @@ Troubleshooting * Menu: -* Magic branch numbers:: Magic branch numbers +* Error messages:: Partial list of CVS errors  -File: cvs.info, Node: Magic branch numbers, Up: Troubleshooting - -Magic branch numbers -==================== - - Externally, branch numbers consist of an odd number of dot-separated -decimal integers. *Note Revision numbers::. That is not the whole -truth, however. For efficiency reasons CVS sometimes inserts an extra 0 -in the second rightmost position (1.2.3 becomes 1.2.0.3, 8.9.10.11.12 -becomes 8.9.10.11.0.12 and so on). - - CVS does a pretty good job at hiding these so called magic branches, -but in a few places the hiding is incomplete: - - * The magic branch number appears in the output from `cvs log'. - - * You cannot specify a symbolic branch name to `cvs admin'. - - You can use the `admin' command to reassign a symbolic name to a -branch the way RCS expects it to be. If `R4patches' is assigned to the -branch 1.4.2 (magic branch number 1.4.0.2) in file `numbers.c' you can -do this: - - $ cvs admin -NR4patches:1.4.2 numbers.c - - It only works if at least one revision is already committed on the -branch. Be very careful so that you do not assign the tag to the wrong -number. (There is no way to see how the tag was assigned yesterday). +File: cvs.info, Node: Error messages, Up: Troubleshooting + +Partial list of error messages +============================== + + Here is a partial list of error messages that you may see from CVS. +It is not a complete list--CVS is capable of printing many, many error +messages, often with parts of them supplied by the operating system, +but the intention is to list the common and/or potentially confusing +error messages. + + The messages are alphabetical, but introductory text such as `cvs +update: ' is not considered in ordering them. + + In some cases the list includes messages printed by old versions of +CVS (partly because users may not be sure which version of CVS they are +using at any particular moment). + +`cvs [server aborted]: received broken pipe signal' + This message seems to be caused by a hard-to-track-down bug in CVS + or the systems it runs on (we don't know--we haven't tracked it + down yet!). It seems to happen only after a CVS command has + completed, and you should be able to just ignore the message. + However, if you have discovered information concerning its cause, + please let us know as described in *Note BUGS::. + +`cannot open CVS/Entries for reading: No such file or directory' + This generally indicates a CVS internal error, and can be handled + as with other CVS bugs (*note BUGS::.). Usually there is a + workaround--the exact nature of which would depend on the + situation but which hopefully could be figured out. + +`cvs [update aborted]: could not patch FILE: No such file or directory' + This means that there was a problem finding the `patch' program. + Make sure that it is in your `PATH'. Note that despite + appearances the message is *not* referring to whether it can find + FILE. + +`cvs update: could not patch FILE; will refetch' + This means that for whatever reason the client was unable to apply + a patch that the server sent. The message is nothing to be + concerned about, because inability to apply the patch only slows + things down and has no effect on what CVS does. + +`dying gasps from SERVER unexpected' + This message seems to be caused by a hard-to-track-down bug in CVS + or the systems it runs on (we don't know--we haven't tracked it + down yet!). If you see it, you probably can just retry the + operation which failed, or if you have discovered information + concerning its cause, please let us know as described in *Note + BUGS::. + +`end of file from server (consult above messages if any)' + The most common cause for this message is if you are using an + external `rsh' program and it exited with an error. In this case + the `rsh' program should have printed a message, which will appear + before the above message. For more information on setting up a + CVS client and server, see *Note Remote repositories::. + +`cvs commit: Executing 'mkmodules'' + This means that your repository is set up for a version of CVS + prior to CVS 1.8. When using CVS 1.8 or later, the above message + will be preceded by + + cvs commit: Rebuilding administrative file database + + If you see both messages, the database is being rebuilt twice, + which is unnecessary but harmless. If you wish to avoid the + duplication, and you have no versions of CVS 1.7 or earlier in + use, remove `-i mkmodules' every place it appears in your `modules' + file. For more information on the `modules' file, see *Note + modules::. + +`cvs commit: Up-to-date check failed for `FILE'' + This means that someone else has committed a change to that file + since the last time that you did a `cvs update'. So before + proceeding with your `cvs commit' you need to `cvs update'. CVS + will merge the changes that you made and the changes that the + other person made. If it does not detect any conflicts it will + report `M cacErrCodes.h' and you are ready to `cvs commit'. If it + detects conflicts it will print a message saying so, will report + `C cacErrCodes.h', and you need to manually resolve the conflict. + For more details on this process see *Note Conflicts example::. + +`Usage: diff3 [-exEX3 [-i | -m] [-L label1 -L label3]] file1 file2 file3' + Only one of [exEX3] allowed + This indicates a problem with the installation of `diff3' and + `rcsmerge'. Specifically `rcsmerge' was compiled to look for GNU + diff3, but it is finding unix diff3 instead. The exact text of + the message will vary depending on the system. The solution is to + make sure `rcsmerge' finds GNU diff3. Depending on how `rcsmerge' + was compiled, it might be sufficient to place GNU diff3 in your + `PATH', or it might be necessary to recompile `rcsmerge' or find a + binary distribution of `rcsmerge' which looks in the `PATH'. + +`cvs commit: warning: editor session failed' + This means that the editor which CVS is using exits with a nonzero + exit status. Some versions of vi will do this even when there was + not a problem editing the file. If so, point the CVSEDITOR + environment variable to a small script such as: + + #!/bin/sh + vi $* + exit 0  File: cvs.info, Node: Copying, Next: Index, Prev: Troubleshooting, Up: Top diff --git a/gnu/usr.bin/cvs/doc/cvs.info-8 b/gnu/usr.bin/cvs/doc/cvs.info-8 index f9909aa4b92..4314f28955f 100644 --- a/gnu/usr.bin/cvs/doc/cvs.info-8 +++ b/gnu/usr.bin/cvs/doc/cvs.info-8 @@ -60,11 +60,13 @@ Index * ALL in commitinfo: commitinfo. * annotate (subcommand): annotate. * Atomic transactions, lack of: Concurrency. +* attic: Attic. * authenticated client, using: Password authentication client. * authenticating server, setting up: Password authentication server. * Author keyword: Keyword list. * Automatically ignored files: cvsignore. * Avoiding editor invocation: Common options. +* Base directory, in CVS directory: Working directory storage. * bill of materials: Builds. * Binary files: Binary files. * Branch merge example: Merging a branch. @@ -85,6 +87,7 @@ Index * Changing a log message: admin options. * checked out copy, keeping: Keeping a checked out copy. * Checkin program: modules. +* Checkin.prog file, in CVS directory: Working directory storage. * Checking commits: commitinfo. * Checking out source: Getting the source. * Checkout (subcommand): checkout. @@ -125,6 +128,19 @@ Index * CVS, history of: What is CVS?. * CVS, introduction to: What is CVS?. * CVS, versions of: Compatibility. +* CVS/Base directory: Working directory storage. +* CVS/Checkin.prog file: Working directory storage. +* CVS/Entries file: Working directory storage. +* CVS/Entries.Backup file: Working directory storage. +* CVS/Entries.Log file: Working directory storage. +* CVS/Entries.Static file: Working directory storage. +* CVS/Notify file: Working directory storage. +* CVS/Notify.tmp file: Working directory storage. +* CVS/Repository file: Working directory storage. +* CVS/Root file: Specifying a repository. +* CVS/Tag file: Working directory storage. +* CVS/Template file: Working directory storage. +* CVS/Update.prog file: Working directory storage. * CVS_CLIENT_LOG: Environment variables. * CVS_CLIENT_PORT: Kerberos authenticated. * CVS_IGNORE_REMOTE_ROOT: Environment variables. @@ -152,6 +168,7 @@ Index * CVSWRAPPERS, environment variable: Wrappers. * Date keyword: Keyword list. * Dates: Common options. +* dead state: Attic. * Decimal revision number: Revision numbers. * DEFAULT in commitinfo: commitinfo. * DEFAULT in editinfo: editinfo. @@ -183,6 +200,10 @@ Index * Editor, specifying per module: editinfo. * editors (subcommand): Watch information. * emerge: Conflicts example. +* Entries file, in CVS directory: Working directory storage. +* Entries.Backup file, in CVS directory: Working directory storage. +* Entries.Log file, in CVS directory: Working directory storage. +* Entries.Static file, in CVS directory: Working directory storage. * Environment variables: Environment variables. * Errors, reporting (CVS): What is CVS?. * Errors, reporting (manual): BUGS. @@ -267,7 +288,6 @@ Index * Mail, automatic mail on commit: Informing others. * Mailing list: What is CVS?. * Mailing log messages: loginfo. -* Main trunk (intro): Revision numbers. * Main trunk and branches: Revisions and branches. * make: Builds. * Many repositories: Multiple repositories. @@ -278,6 +298,7 @@ Index * Merging a branch: Merging a branch. * Merging a file: Updating a file. * Merging two revisions: Merging two revisions. +* mkmodules: Error messages. * Modifications, copying between branches: Merging. * Module status: modules. * Module, defining: Defining the module. @@ -296,6 +317,8 @@ Index * Needs Patch: File status. * Newsgroups: What is CVS?. * notify (admin file): Getting Notified. +* Notify file, in CVS directory: Working directory storage. +* Notify.tmp file, in CVS directory: Working directory storage. * Nroff (selecting comment leader): admin examples. * Number, branch: Revision numbers. * Number, revision-: Revision numbers. @@ -313,6 +336,7 @@ Index * password client, using: Password authentication client. * password server, setting up: Password authentication server. * PATH: Environment variables. +* Per-directory sticky tags/dates: Working directory storage. * Per-module editor: editinfo. * Policy: When to commit. * Precommit checking: commitinfo. @@ -358,6 +382,7 @@ Index * Repositories, multiple: Multiple repositories. * Repositories, remote: Remote repositories. * Repository (intro): Repository. +* Repository file, in CVS directory: Working directory storage. * Repository, example: Repository. * Repository, how data is stored: Repository storage. * Repository, setting up: Creating a repository. @@ -376,6 +401,7 @@ Index * Revisions, merging differences between: Merging two revisions. * Revisions, versions and releases: Versions revisions releases. * Right-hand options: Common options. +* Root file, in CVS directory: Specifying a repository. * rsh: Connecting via rsh. * Rtag (subcommand): rtag. * rtag, creating a branch using: Creating a branch. @@ -400,6 +426,7 @@ Index * sticky date: Sticky tags. * Sticky tags: Sticky tags. * Sticky tags, resetting: Sticky tags. +* Sticky tags/dates, per-directory: Working directory storage. * Storing log messages: loginfo. * Structure: Structure. * Subdirectories: Recursive behavior. @@ -408,6 +435,7 @@ Index * Symbolic name (tag): Tags. * Syntax of info files: syntax. * Tag (subcommand): tag. +* Tag file, in CVS directory: Working directory storage. * Tag program: modules. * tag, command, introduction: Tags. * tag, example: Tags. @@ -419,6 +447,7 @@ Index * tc, Trivial Compiler (example): A sample session. * Team of developers: Multiple developers. * TEMP: Environment variables. +* Template file, in CVS directory: Working directory storage. * Template for log message: rcsinfo. * temporary files, location of: Environment variables. * Third-party sources: Tracking sources. @@ -443,6 +472,7 @@ Index * Update (subcommand): update. * Update program: modules. * update, introduction: Updating a file. +* Update.prog file, in CVS directory: Working directory storage. * Updating a file: Updating a file. * USER: Environment variables. * user aliases: Password authentication server. diff --git a/gnu/usr.bin/cvs/doc/cvs.ps b/gnu/usr.bin/cvs/doc/cvs.ps index fbb88918819..4df21d775f1 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: 180 +%%Pages: 184 %%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.03.25:1328 +%DVIPSSource: TeX output 1997.04.18:1219 %%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 @@ -1311,7 +1311,7 @@ FC14C080003F7F38003FF813076D7E1301B3A2806D7E15F091387FFFF016F8141F801403 4A13E09138FFE00092C7FC495A5CB3A21303495A137F387FFFF0B5FC14C05C49C8FCEA7F E025477BBE30>I<017C133848B4137C48EB80FE4813C14813C348EBEFFC397FEFFFF0D8 FF8713E0010713C0486C1380D87C0113003838007C1F0C78B730>I -E /Fo 46 123 df12 @@ -1343,132 +1343,140 @@ DI<01061403D90780131F90390FF801FE91B512FC16F816 -F016E0168049EBFE0015F890381C7FC091C8FCA3133C1338A513781370A2EC1FE0ECFFF8 -903873E03E9038FF001F01FCEB0F804914C049EB07E04914F049130390C7FC16F8A61507 -A21206EA3F80487EA2150F00FF15F0A24914E090C7121F00FC15C000F0143F00701580ED -7F0012786C14FE4A5A6C495A390F800FE03907E03FC06CB5C7FCC613FCEB1FE0283F7ABC -2D>53 D<13F0EA01FC1203EA07FEA313FCA2EA03F8EA01E0C7FCB3121EEA3F80EA7FC012 -FFA41380EA7F00123C0F2778A619>58 D67 D<013FB7FC18E018F8903B007FF0000FFE6E48EB01FF9438007FC04B6E7E180F85 -727E727E147F4B6E7EA2727EA302FF178092C9FCA54918C05CA41A8013034A5DA41A0013 -074A5DA261A24E5A130F4A5E180F61181F61011F4C5A5C4E5A4EC7FC4D5A4D5A013F4B5A -4A4A5AEF3FE0EF7F80017F4A48C8FC01FFEC1FFCB812F0178004FCC9FC423E7DBD45>I< -013FB812F8A39026007FF0C7127F6E48140F18034B14011800A31978147F4B1570A502FF -143892C7FCA3190017784915704A14F016011603160F91B6FC495DA29138FC001F160716 -03160101075D5CA2197019F019E0010F4A5A4A90C7120119C0A218031980011F16075CF0 -0F00A260181E013F163E4A157E4D5A1703017F150F01FFEDFFF8B9FCA2603D3E7DBD3E> -I<90263FFFE0023FB5FC6F16FEA29026003FF8020313C0021F030013004A6C157C023B16 -3C6F15381439810238167802787FDA707F157082153F82031F15F002F07FDAE00F5D8215 -078203031401010180DAC0015D82811780047F1303010315C04A013F5C17E0161F17F004 -0F1307010715F891C7000791C7FC17FC160317FE04015B4915FF010E6E130E188E177F18 -CEEF3FDE011E16FE011C6F5AA2170FA21707133C01386F5A133C017C150113FE2607FF80 -1400B512FC18705C483E7DBD44>78 D<923803FF80031F13F09238FE01FE913903F0003F -DA0FC0EB1FC0DA3F80EB07E0027EC76C7E49486E7E49488149486E7E4948157F495A013F -17804948ED3FC049C9FCA24848EE1FE012035B000718F05B120FA2485A19F8123F5BA212 -7FA219F04848163FA5F07FE0A35BF0FFC0A219805F19007F4D5A127F4D5A60003F160F6D -5E001F4C5A4D5A6C6C4B5A95C7FC6C6C15FE00034B5A6C6C4A5A6C6C4A5A017FEC1FC06D -6C495AD90FE001FEC8FC903903F807F80100B512C0DA0FFCC9FC3D4276BF47>I<013FB6 -12F017FF18E0903B007FF0003FF86E48EB07FCEF01FE4B6D7EF07F8019C0183F19E0147F -4B15F0A502FFED7FE092C8FCA219C0F0FF80A2494B13004A5D4D5AEF0FF04D5AEF7F8001 -03DA07FEC7FC91B612F017809139FC0007E0EE03F8EE00FC0107814A147F717EA284A213 -0F5CA484011F157F5CA41902013F17075CA2F0F00F017F170E496C143FB600E0011F131C -94380FF83C4B01071378CA3801FFE09438003F8040407DBD43>82 -D<9239FF8003800207EBF007021F9038FC0F0091387F00FE02FCEB1F1FD903F0EB07BF49 -486DB4FC49487F4A6D5A49C8FC49157E133E137E173E49153CA57F1738A26D92C7FC8080 -80EB7FFEECFFE06D13FEEDFFC06D14F06D14FC010380010080143F020380DA003F7F1503 -1500707E163F161FA2160F121CA31607160F003C5EA35F003E151F94C7FC007E5D007F15 -3E6D5C16FC01E0495AD87DF0495AD8FCFCEB0FC03AF87F803F8027F01FFFFEC8FCD8E007 -13F839C0007FC031427BBF33>I<0007B912F0A33C0FFE000FF8003F01F0160F01C04A13 -034848160190C7FC121EF000E048141F5E1238A212781270153F5E5AA3C81600157F5EA5 -15FF93C9FCA55C5DA514035DA514075DA5140F5DA3141FEC7FFC0003B7FCA33C3D76BC42 ->I<120FEA3FC0127F13E0A212FF13C0127F1380EA1E000B0A70BD19>95 -D97 -DI -IIII<177C913907F803FE91393FFE0F8F9139FC0F9C3F903901F007F89039 -07E003E0D90FC013F0011F903801F80C02801400133FD97F007FA315035B495CA3017E49 -5A5E150F6D5C6D495A90263F803EC7FCECC0FC903871FFF09038E07F8091C9FC485AA47F -A27F90B512F8EDFF806C15E016F86D8048B6FC3A07E0000FFED80F801300003FC8127F00 -3E815A00FC815AA25E163EA25E6C15FC007C4A5A6C4A5A6CEC0FC0D80FC0013FC7FC3903 -F801FCC6B512F0010F90C8FC303D7FA82D>I<147FEB3FFFA313017FA25CA513015CA513 -035CA4ED07F80107EB1FFF9139F0781FC09138F1E00F9139F38007E0ECF70002FE14F049 -5A5CA25CA24A130F131F4A14E0A4161F133F4A14C0A4163F137F91C71380A4167F5B4915 -00A300015D486C491380B5D8F87F13FCA32E3F7DBE33>I<1478EB01FE130314FFA25B14 -FE130314FCEB00F01400ACEB03F8EA01FF14F0A2EA001F130FA314E0A5131F14C0A5133F -1480A5137F1400A55B5BA4EA03FF007F13F0A2B5FC183E7DBD1A>I<147FEB3FFFA31301 -7FA25CA513015CA513035CA501070103B5FC02F014FEA26F13F06F1380EEFE00010F14F8 -4A485AED03C04B5A031FC7FC153E011F13784A5AECC3E0ECC7F0ECCFF814FF497F14F9EC -E1FE14C04A7E4A7E4980017E133F82151F82150F01FE8049130782A2000181486C49B4FC -B5D8F03F13F04B13E0A2303F7EBE30>107 D<143FEB1FFF5BA213017FA214FEA5130114 -FCA5130314F8A5130714F0A5130F14E0A5131F14C0A5133F1480A5137F1400A55B5BA4EA -03FF007F13F8A2B5FC183F7DBE1A>I<902707F007F8EB03FCD803FFD91FFF90380FFF80 -913CE0781FC03C0FE09126E1E00FEBF0073E001FE38007E1C003F090260FE700EBE38002 -EEDAF70013F802FC14FE02D85C14F84A5CA24A5C011F020F14074A4A14F0A5013F021F14 -0F4A4A14E0A5017F023F141F91C74914C0A549027F143F4992C71380A300014B147F486C -496DEBFFC0B5D8F87FD9FC3F13FEA347287DA74C>I<903907F007F8D803FFEB1FFF9139 -E0781FC09138E1E00F3B001FE38007E090380FE70002EE14F014FC14D814F85CA24A130F -131F4A14E0A4161F133F4A14C0A4163F137F91C71380A4167F5B491500A300015D486C49 -1380B5D8F87F13FCA32E287DA733>II<91387F01FE903A7FFF -0FFFC09139FE3E03F09238F801F8903A01FFE000FE4B137F6D497F4990C713804A15C04A -141FA218E0A20103150F5C18F0A3171F010716E05CA3173F18C0130F4A147F1880A2EFFF -004C5A011F5D16034C5A6E495AEE1FC06E495AD93FDC017EC7FC91388F01F8913883FFE0 -028090C8FC92C9FC137FA291CAFCA45BA25BA31201487EB512F8A3343A81A733>I<9039 -07F01F80D803FFEB7FE09138E1E1F09138E387F839001FE707EB0FE614EE02FC13F002D8 -13E09138F801804AC7FCA25C131FA25CA4133F5CA5137F91C8FCA55B5BA31201487EB512 -FEA325287EA724>114 D<9138FF81C0010713E390381F807F90397C003F8049131F4848 -130F5B00031407A248481400A27FA27F6D90C7FCEBFF8014FC6C13FF6C14C015F06C6C7F -011F7F13079038007FFE1403140100381300157EA2123C153E157E007C147CA2007E1478 -15F8007F495A4A5A486C485A26F9E01FC7FC38E0FFFC38C01FE0222A7DA824>II<01FE147F00FFEC7FFF4914FEA2000714 -0300031401A34914FCA4150312074914F8A41507120F4914F0A4150F121F4914E0A2151F -A3153F4914C0157F15FFEC01DF3A0FC003BFE09138073FFF3803F01E3801FFF826003FE0 -1380282977A733>III<48B539C07FFFC0A33C000FFE00 -3FF8006D48EB1FE0010315800101023EC7FC6E133C01005C027F5B6F5A91383F81C0EDC3 -80DA1FC7C8FC15EFEC0FFE6E5A5D140381A24A7E140FEC1E7F023C7FEC383F02707FECE0 -1F010180903803C00F49486C7ED90F007F491303017E80D801FE80D807FF497EB5D8803F -13F8A332277FA630>I<90B539E007FFF05E18E0902707FE000313006D48EB01FC705A5F -01014A5A5F16036E5C0100140794C7FC160E805E805E1678ED8070023F13F05EED81C015 -C191381FC38015C793C8FC15EF15EEEC0FFCA25DA26E5AA25DA26E5A5DA24AC9FC5C140E -141E141C5C121C003F5B5A485B495A130300FE5B4848CAFCEA701EEA783CEA3FF0EA0FC0 -343A80A630>I<017FB512FEA2ECC00190397E0003FC49EB07F849EB0FF049EB1FE049EB -3FC0ED7F8000011500495B4A5A4A5A4848485A4A5AC7485A4A5A5D147F4AC7FC495A495A -49481370494813E0495A5C133F90387F8001D9FF0013C0485A48481303485A4848EB0780 -49130F4848131F003F143F397F8001FFB71200A227277EA628>I +485D5AB7FC5EA22B3D7CBC2D>II<161C163C167CA216FCED01F815031507150FA2 +151DED3BF0157315E315C31401EC038391380707E0140E141CA2143814709138E00FC0EB +01C014801303EB0700130E49EB1F805B133013705B485A4848EB3F0090C7FC5A120E5A5A +48147E1260B8FCA3C73801FE00A25DA41403A25DA314074A7E0107B512F8A3283E7BBD2D +>I<01061403D90780131F90390FF801FE91B512FC16F816F016E0168049EBFE0015F890 +381C7FC091C8FCA3133C1338A513781370A2EC1FE0ECFFF8903873E03E9038FF001F01FC +EB0F804914C049EB07E04914F049130390C7FC16F8A61507A21206EA3F80487EA2150F00 +FF15F0A24914E090C7121F00FC15C000F0143F00701580ED7F0012786C14FE4A5A6C495A +390F800FE03907E03FC06CB5C7FCC613FCEB1FE0283F7ABC2D>I<13F0EA01FC1203EA07 +FEA313FCA2EA03F8EA01E0C7FCB3121EEA3F80EA7FC012FFA41380EA7F00123C0F2778A6 +19>58 D67 D<013FB7FC18E018F890 +3B007FF0000FFE6E48EB01FF9438007FC04B6E7E180F85727E727E147F4B6E7EA2727EA3 +02FF178092C9FCA54918C05CA41A8013034A5DA41A0013074A5DA261A24E5A130F4A5E18 +0F61181F61011F4C5A5C4E5A4EC7FC4D5A4D5A013F4B5A4A4A5AEF3FE0EF7F80017F4A48 +C8FC01FFEC1FFCB812F0178004FCC9FC423E7DBD45>I<013FB812F8A39026007FF0C712 +7F6E48140F18034B14011800A31978147F4B1570A502FF143892C7FCA319001778491570 +4A14F016011603160F91B6FC495DA29138FC001F16071603160101075D5CA2197019F019 +E0010F4A5A4A90C7120119C0A218031980011F16075CF00F00A260181E013F163E4A157E +4D5A1703017F150F01FFEDFFF8B9FCA2603D3E7DBD3E>I<90263FFFE0023FB5FC6F16FE +A29026003FF8020313C0021F030013004A6C157C023B163C6F1538143981023816780278 +7FDA707F157082153F82031F15F002F07FDAE00F5D8215078203031401010180DAC0015D +82811780047F1303010315C04A013F5C17E0161F17F0040F1307010715F891C7000791C7 +FC17FC160317FE04015B4915FF010E6E130E188E177F18CEEF3FDE011E16FE011C6F5AA2 +170FA21707133C01386F5A133C017C150113FE2607FF801400B512FC18705C483E7DBD44 +>78 D<923803FF80031F13F09238FE01FE913903F0003FDA0FC0EB1FC0DA3F80EB07E002 +7EC76C7E49486E7E49488149486E7E4948157F495A013F17804948ED3FC049C9FCA24848 +EE1FE012035B000718F05B120FA2485A19F8123F5BA2127FA219F04848163FA5F07FE0A3 +5BF0FFC0A219805F19007F4D5A127F4D5A60003F160F6D5E001F4C5A4D5A6C6C4B5A95C7 +FC6C6C15FE00034B5A6C6C4A5A6C6C4A5A017FEC1FC06D6C495AD90FE001FEC8FC903903 +F807F80100B512C0DA0FFCC9FC3D4276BF47>I<013FB612F017FF18E0903B007FF0003F +F86E48EB07FCEF01FE4B6D7EF07F8019C0183F19E0147F4B15F0A502FFED7FE092C8FCA2 +19C0F0FF80A2494B13004A5D4D5AEF0FF04D5AEF7F800103DA07FEC7FC91B612F0178091 +39FC0007E0EE03F8EE00FC0107814A147F717EA284A2130F5CA484011F157F5CA4190201 +3F17075CA2F0F00F017F170E496C143FB600E0011F131C94380FF83C4B01071378CA3801 +FFE09438003F8040407DBD43>82 D<9239FF8003800207EBF007021F9038FC0F0091387F +00FE02FCEB1F1FD903F0EB07BF49486DB4FC49487F4A6D5A49C8FC49157E133E137E173E +49153CA57F1738A26D92C7FC808080EB7FFEECFFE06D13FEEDFFC06D14F06D14FC010380 +010080143F020380DA003F7F15031500707E163F161FA2160F121CA31607160F003C5EA3 +5F003E151F94C7FC007E5D007F153E6D5C16FC01E0495AD87DF0495AD8FCFCEB0FC03AF8 +7F803F8027F01FFFFEC8FCD8E00713F839C0007FC031427BBF33>I<0007B912F0A33C0F +FE000FF8003F01F0160F01C04A13034848160190C7FC121EF000E048141F5E1238A21278 +1270153F5E5AA3C81600157F5EA515FF93C9FCA55C5DA514035DA514075DA5140F5DA314 +1FEC7FFC0003B7FCA33C3D76BC42>I<120FEA3FC0127F13E0A212FF13C0127F1380EA1E +000B0A70BD19>95 D97 DI< +EC1FF0ECFFFE903903F01F8090390FC003C0D93F0013E0017E130F49131F000115F04848 +EB3FE0485AA24848EB1FC0001FEC0F004990C7FC123FA2485AA412FF90C9FCA96CEC0380 +150716006C6C5B151E001F5C6C6C5B6C6C5B6C6C485A3901F80F8026007FFEC7FCEB0FF0 +242A7AA828>IIII<177C913907F803FE91393FFE0F8F9139FC0F9C3F9039 +01F007F8903907E003E0D90FC013F0011F903801F80C02801400133FD97F007FA315035B +495CA3017E495A5E150F6D5C6D495A90263F803EC7FCECC0FC903871FFF09038E07F8091 +C9FC485AA47FA27F90B512F8EDFF806C15E016F86D8048B6FC3A07E0000FFED80F801300 +003FC8127F003E815A00FC815AA25E163EA25E6C15FC007C4A5A6C4A5A6CEC0FC0D80FC0 +013FC7FC3903F801FCC6B512F0010F90C8FC303D7FA82D>I<147FEB3FFFA313017FA25C +A513015CA513035CA4ED07F80107EB1FFF9139F0781FC09138F1E00F9139F38007E0ECF7 +0002FE14F0495A5CA25CA24A130F131F4A14E0A4161F133F4A14C0A4163F137F91C71380 +A4167F5B491500A300015D486C491380B5D8F87F13FCA32E3F7DBE33>I<1478EB01FE13 +0314FFA25B14FE130314FCEB00F01400ACEB03F8EA01FF14F0A2EA001F130FA314E0A513 +1F14C0A5133F1480A5137F1400A55B5BA4EA03FF007F13F0A2B5FC183E7DBD1A>I<147F +EB3FFFA313017FA25CA513015CA513035CA501070103B5FC02F014FEA26F13F06F1380EE +FE00010F14F84A485AED03C04B5A031FC7FC153E011F13784A5AECC3E0ECC7F0ECCFF814 +FF497F14F9ECE1FE14C04A7E4A7E4980017E133F82151F82150F01FE8049130782A20001 +81486C49B4FCB5D8F03F13F04B13E0A2303F7EBE30>107 D<143FEB1FFF5BA213017FA2 +14FEA5130114FCA5130314F8A5130714F0A5130F14E0A5131F14C0A5133F1480A5137F14 +00A55B5BA4EA03FF007F13F8A2B5FC183F7DBE1A>I<902707F007F8EB03FCD803FFD91F +FF90380FFF80913CE0781FC03C0FE09126E1E00FEBF0073E001FE38007E1C003F090260F +E700EBE38002EEDAF70013F802FC14FE02D85C14F84A5CA24A5C011F020F14074A4A14F0 +A5013F021F140F4A4A14E0A5017F023F141F91C74914C0A549027F143F4992C71380A300 +014B147F486C496DEBFFC0B5D8F87FD9FC3F13FEA347287DA74C>I<903907F007F8D803 +FFEB1FFF9139E0781FC09138E1E00F3B001FE38007E090380FE70002EE14F014FC14D814 +F85CA24A130F131F4A14E0A4161F133F4A14C0A4163F137F91C71380A4167F5B491500A3 +00015D486C491380B5D8F87F13FCA32E287DA733>II<91387F +01FE903A7FFF0FFFC09139FE3E03F09238F801F8903A01FFE000FE4B137F6D497F4990C7 +13804A15C04A141FA218E0A20103150F5C18F0A3171F010716E05CA3173F18C0130F4A14 +7F1880A2EFFF004C5A011F5D16034C5A6E495AEE1FC06E495AD93FDC017EC7FC91388F01 +F8913883FFE0028090C8FC92C9FC137FA291CAFCA45BA25BA31201487EB512F8A3343A81 +A733>I<903907F01F80D803FFEB7FE09138E1E1F09138E387F839001FE707EB0FE614EE +02FC13F002D813E09138F801804AC7FCA25C131FA25CA4133F5CA5137F91C8FCA55B5BA3 +1201487EB512FEA325287EA724>114 D<9138FF81C0010713E390381F807F90397C003F +8049131F4848130F5B00031407A248481400A27FA27F6D90C7FCEBFF8014FC6C13FF6C14 +C015F06C6C7F011F7F13079038007FFE1403140100381300157EA2123C153E157E007C14 +7CA2007E147815F8007F495A4A5A486C485A26F9E01FC7FC38E0FFFC38C01FE0222A7DA8 +24>II<01FE147F00FFEC7FFF49 +14FEA20007140300031401A34914FCA4150312074914F8A41507120F4914F0A4150F121F +4914E0A2151FA3153F4914C0157F15FFEC01DF3A0FC003BFE09138073FFF3803F01E3801 +FFF826003FE01380282977A733>III<48B539C07FFFC0 +A33C000FFE003FF8006D48EB1FE0010315800101023EC7FC6E133C01005C027F5B6F5A91 +383F81C0EDC380DA1FC7C8FC15EFEC0FFE6E5A5D140381A24A7E140FEC1E7F023C7FEC38 +3F02707FECE01F010180903803C00F49486C7ED90F007F491303017E80D801FE80D807FF +497EB5D8803F13F8A332277FA630>I<90B539E007FFF05E18E0902707FE000313006D48 +EB01FC705A5F01014A5A5F16036E5C0100140794C7FC160E805E805E1678ED8070023F13 +F05EED81C015C191381FC38015C793C8FC15EF15EEEC0FFCA25DA26E5AA25DA26E5A5DA2 +4AC9FC5C140E141E141C5C121C003F5B5A485B495A130300FE5B4848CAFCEA701EEA783C +EA3FF0EA0FC0343A80A630>I<017FB512FEA2ECC00190397E0003FC49EB07F849EB0FF0 +49EB1FE049EB3FC0ED7F8000011500495B4A5A4A5A4848485A4A5AC7485A4A5A5D147F4A +C7FC495A495A49481370494813E0495A5C133F90387F8001D9FF0013C0485A4848130348 +5A4848EB078049130F4848131F003F143F397F8001FFB71200A227277EA628>I E /Fp 59 122 df<94267FFF80903801FFE0043FB500F0013F13FC4BB6D8FC01B57E030F DBFF0FECFF80037F04BF15C04AB5D8E00390B5008113E04A01FCC76CEBFC03020F01F091 B5D8F00713F04A01C04914E04A90C7484A4813F84A4817804A485C49491700495B62495B @@ -1766,166 +1774,186 @@ F0A248CD12F8A2001E1A78003E1A7CA2003C1A3C007C1A3EA200781A1EA300F81A1FA248 E0EC07FCDA0FFCEC3FF0913B03FFC003FFC0020090B6C8FC033F14FC030714E09226007F FEC9FC50557BC05B>13 D15 D E /Fr 24 121 df<121EEA7F80A2EAFFC0A4EA7F80A2EA1E000A0A77891D> -46 D67 D82 DI86 D97 D99 -DIIIIII107 D109 DI112 -DII<90383FC00C9038FFF81C0003EBFE3C390FE03F -FC381F8007EB0003003E1301481300157C5A153CA36C141CA27E6C14006C7E13E013FE38 -3FFFE06C13FE6CEBFF806C14E0000114F06C6C13F8010F13FC1300EC07FE14011400157F -153F12E0151FA37EA2151E6C143E6C143C6C147C6C14F89038C001F039FBF807E000F1B5 -12C0D8E07F130038C007FC20317BAF2A>I<007FB712F8A39039801FF0073A7E000FE000 -00781678A20070163800F0163CA348161CA5C71500B3A8EC3FF8011FB512F0A32E2E7CAD -36>III<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 DI<121EEA7F80A2EAFFC0A4EA7F80A2EA1E -000A0A798919>IIIIII<150E151E153EA2157EA215FE1401 -A21403EC077E1406140E141CA214381470A214E0EB01C0A2EB0380EB0700A2130E5BA25B -5BA25B5B1201485A90C7FC5A120E120C121C5AA25A5AB8FCA3C8EAFE00AC4A7E49B6FCA3 -283E7EBD2D>I<00061403D80780131F01F813FE90B5FC5D5D5D15C092C7FC14FCEB3FE0 -90C9FCACEB01FE90380FFF8090383E03E090387001F8496C7E49137E497F90C713800006 -141FC813C0A216E0150FA316F0A3120C127F7F12FFA416E090C7121F12FC007015C01278 -0038EC3F80123C6CEC7F00001F14FE6C6C485A6C6C485A3903F80FE0C6B55A013F90C7FC -EB07F8243F7CBC2D>II<1238123C -123F90B612FCA316F85A16F016E00078C712010070EC03C0ED078016005D48141E151C15 -3C5DC8127015F04A5A5D14034A5A92C7FC5C141EA25CA2147C147814F8A213015C1303A3 -1307A3130F5CA2131FA6133FAA6D5A0107C8FC26407BBD2D>III<121EEA7F80A2EAFFC0A4EA7F80A2EA1E00C7FCB3121EEA7F80A2EAFFC0A4EA7F80 -A2EA1E000A2779A619>I<121EEA7F80A2EAFFC0A4EA7F80A2EA1E00C7FCB3121E127FEA -FF80A213C0A4127F121E1200A412011380A3120313005A1206120E120C121C5A1230A20A -3979A619>I63 D<15074B7EA34B7EA34B7EA34B7EA34B7E15E7A2913801C7FC15C3 -A291380381FEA34AC67EA3020E6D7EA34A6D7EA34A6D7EA34A6D7EA34A6D7EA349486D7E -91B6FCA249819138800001A249C87EA24982010E157FA2011E82011C153FA2013C820138 -151FA2017882170F13FC00034C7ED80FFF4B7EB500F0010FB512F8A33D417DC044>65 +A72D>15 D E /Fr 31 121 df45 D<121EEA7F80A2EAFFC0A4EA7F +80A2EA1E000A0A77891D>I67 +DII73 D79 D82 DI<003FB912E0A3903BF0003FF0 +007F01806D48130F48C7ED07F0007E1703007C170100781700A300701870A5481838A5C8 +1600B3B14B7E4B7E0103B7FCA33D3D7CBC47>I +86 D97 D99 DIIIIII +107 D109 +DIIIII<90383FC00C9038FFF81C0003EBFE3C390FE03FFC381F8007EB0003003E1301 +481300157C5A153CA36C141CA27E6C14006C7E13E013FE383FFFE06C13FE6CEBFF806C14 +E0000114F06C6C13F8010F13FC1300EC07FE14011400157F153F12E0151FA37EA2151E6C +143E6C143C6C147C6C14F89038C001F039FBF807E000F1B512C0D8E07F130038C007FC20 +317BAF2A>I<007FB712F8A39039801FF0073A7E000FE00000781678A20070163800F016 +3CA348161CA5C71500B3A8EC3FF8011FB512F0A32E2E7CAD36>III<3B7FFFF001FFFEA30003D9C00013E0C649 +EB7F80017F027EC7FC167C6D6C13786D6C5B6D6C5B15016D6C485AD903FC5B15076D6C48 +C8FC903800FF1EEC7F9C15BCEC3FF86E5AA2140F6E7E14034A7E4A7EEC1EFF141C91383C +7F804A6C7E14709138F01FE049486C7E49486C7E148001076D7E49486C7E130E011E6D7E +496E7E017C6E7E13FC000382D80FFEEC7FF8B549B512C0A3322F7DAE38>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 DI<121EEA7F80A2EAFFC0A4EA7F80A2EA1E000A0A79 +8919>IIIIII<150E151E153EA2157EA215FE1401A21403EC +077E1406140E141CA214381470A214E0EB01C0A2EB0380EB0700A2130E5BA25B5BA25B5B +1201485A90C7FC5A120E120C121C5AA25A5AB8FCA3C8EAFE00AC4A7E49B6FCA3283E7EBD +2D>I<00061403D80780131F01F813FE90B5FC5D5D5D15C092C7FC14FCEB3FE090C9FCAC +EB01FE90380FFF8090383E03E090387001F8496C7E49137E497F90C713800006141FC813 +C0A216E0150FA316F0A3120C127F7F12FFA416E090C7121F12FC007015C012780038EC3F +80123C6CEC7F00001F14FE6C6C485A6C6C485A3903F80FE0C6B55A013F90C7FCEB07F824 +3F7CBC2D>II<1238123C123F90B6 +12FCA316F85A16F016E00078C712010070EC03C0ED078016005D48141E151C153C5DC812 +7015F04A5A5D14034A5A92C7FC5C141EA25CA2147C147814F8A213015C1303A31307A313 +0F5CA2131FA6133FAA6D5A0107C8FC26407BBD2D>III<12 +1EEA7F80A2EAFFC0A4EA7F80A2EA1E00C7FCB3121EEA7F80A2EAFFC0A4EA7F80A2EA1E00 +0A2779A619>I<121EEA7F80A2EAFFC0A4EA7F80A2EA1E00C7FCB3121E127FEAFF80A213 +C0A4127F121E1200A412011380A3120313005A1206120E120C121C5A1230A20A3979A619 +>I63 D<15074B7EA34B7EA34B7EA34B7EA34B7E15E7A2913801C7FC15C3A2913803 +81FEA34AC67EA3020E6D7EA34A6D7EA34A6D7EA34A6D7EA34A6D7EA349486D7E91B6FCA2 +49819138800001A249C87EA24982010E157FA2011E82011C153FA2013C820138151FA201 +7882170F13FC00034C7ED80FFF4B7EB500F0010FB512F8A33D417DC044>65 D)e Fs(wrote)k(the)h(man)m(ual)e(pages)i(whic)m(h)d @@ -2390,11 +2418,12 @@ b(,)180 1462 y(and)30 b(ab)s(out)g(setuid/setgid.)75 1886 y Fq(\017)60 b Fs(This)24 b(list)g(is)g(not)i(complete.)39 b(If)25 b(y)m(ou)h(notice)g(an)m(y)f(error,)i(omission,)e(or)g (something)g(that)h(is)e(unclear,)i(please)180 2010 y(send)k(mail)f(to) -i Fn(bug-cvs@prep.ai.mit.edu)o Fs(.)125 2309 y(I)f(hop)s(e)f(that)i(y)m -(ou)g(will)d(\014nd)h(this)g(man)m(ual)h(useful,)e(despite)i(the)h(ab)s -(o)m(v)m(e-men)m(tioned)g(shortcomings.)2916 2666 y(Link)m(oping,)e -(Octob)s(er)h(1993)3309 2770 y(P)m(er)h(Cederqvist)p -eop +i Fn(bug-cvs@prep.ai.mit.edu)o Fs(.)k(This)29 b(is)g(also)h(the)h +(address)e(for)i(rep)s(orting)e(bugs)g(in)g Fr(cvs)p +Fs(.)125 2309 y(I)h(hop)s(e)f(that)i(y)m(ou)g(will)d(\014nd)h(this)g +(man)m(ual)h(useful,)e(despite)i(the)h(ab)s(o)m(v)m(e-men)m(tioned)g +(shortcomings.)2916 2666 y(Link)m(oping,)e(Octob)s(er)h(1993)3309 +2770 y(P)m(er)h(Cederqvist)p eop %%Page: 4 6 4 5 bop 0 -116 a Fs(4)2456 b(CVS|Concurren)m(t)29 b(V)-8 b(ersions)30 b(System)p eop @@ -2521,7 +2550,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(18)h -([Builds],)e(page)i(85,)g(for)f(more)g(information)f(on)h(doing)f +([Builds],)e(page)i(87,)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 @@ -2574,7 +2603,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(137\).)480 4050 y(Another)k(asp)s(ect)h(of)f(c) +(e)e(\014les],)i(page)h(139\).)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) @@ -2627,136 +2656,162 @@ i(p)s(erform)e(tasks)h(suc)m(h)g(as)h(doing)e(w)m(ork)h(in)f(a)h(dev)m (ha)m(v)m(e)i(b)s(een)e(pro)m(v)m(en.)p eop %%Page: 9 11 9 10 bop 0 -116 a Fs(Chapter)30 b(2:)41 b(A)30 b(sample)g(session)2718 -b(9)0 366 y Fp(2)80 b(A)31 b(sample)f(session)125 731 +b(9)0 366 y Fp(2)80 b(A)31 b(sample)f(session)125 756 y Fs(As)f(a)g(w)m(a)m(y)h(of)f(in)m(tro)s(ducing)e Fr(cvs)p Fs(,)h(w)m(e'll)h(go)g(through)g(a)g(t)m(ypical)g(w)m(ork-session)f (using)g Fr(cvs)p Fs(.)39 b(The)29 b(\014rst)f(thing)0 -855 y(to)36 b(understand)e(is)h(that)h Fr(cvs)f Fs(stores)h(all)f +881 y(to)36 b(understand)e(is)h(that)h Fr(cvs)f Fs(stores)h(all)f (\014les)f(in)h(a)h(cen)m(tralized)g Fo(rep)s(ository)42 -b Fs(\(see)37 b(Chapter)e(3)h([Rep)s(ository],)0 980 +b Fs(\(see)37 b(Chapter)e(3)h([Rep)s(ository],)0 1005 y(page)31 b(13\);)h(this)d(section)i(assumes)f(that)h(a)f(rep)s -(ository)g(is)f(set)i(up.)125 1254 y(Supp)s(ose)e(y)m(ou)j(are)g(w)m +(ository)g(is)f(set)i(up.)125 1283 y(Supp)s(ose)e(y)m(ou)j(are)g(w)m (orking)f(on)h(a)g(simple)d(compiler.)43 b(The)31 b(source)h(consists)f -(of)h(a)g(handful)d(of)j(C)f(\014les)g(and)0 1378 y(a)j(`)p +(of)h(a)g(handful)d(of)j(C)f(\014les)g(and)0 1407 y(a)j(`)p Fn(Makefile)p Fs('.)48 b(The)33 b(compiler)f(is)g(called)h(`)p Fn(tc)p Fs(')g(\(T)-8 b(rivial)32 b(Compiler\),)g(and)h(the)h(rep)s -(ository)e(is)g(set)i(up)f(so)g(that)0 1503 y(there)e(is)e(a)i(mo)s -(dule)d(called)i(`)p Fn(tc)p Fs('.)0 1941 y Fm(2.1)68 -b(Getting)31 b(the)g(source)125 2215 y Fs(The)26 b(\014rst)g(thing)h(y) +(ository)e(is)g(set)i(up)f(so)g(that)0 1532 y(there)e(is)e(a)i(mo)s +(dule)d(called)i(`)p Fn(tc)p Fs('.)0 2009 y Fm(2.1)68 +b(Getting)31 b(the)g(source)125 2286 y Fs(The)26 b(\014rst)g(thing)h(y) m(ou)g(m)m(ust)g(do)g(is)f(to)i(get)g(y)m(our)f(o)m(wn)g(w)m(orking)g (cop)m(y)h(of)f(the)g(source)g(for)g(`)p Fn(tc)p Fs('.)40 -b(F)-8 b(or)28 b(this,)f(y)m(ou)0 2340 y(use)j(the)h -Fn(checkout)d Fs(command:)240 2593 y Fn($)47 b(cvs)g(checkout)f(tc)0 -2867 y Fs(This)29 b(will)e(create)32 b(a)f(new)f(directory)g(called)f +b(F)-8 b(or)28 b(this,)f(y)m(ou)0 2411 y(use)j(the)h +Fn(checkout)d Fs(command:)240 2667 y Fn($)47 b(cvs)g(checkout)f(tc)0 +2944 y Fs(This)29 b(will)e(create)32 b(a)f(new)f(directory)g(called)f (`)p Fn(tc)p Fs(')i(and)e(p)s(opulate)h(it)f(with)h(the)g(source)h -(\014les.)240 3120 y Fn($)47 b(cd)h(tc)240 3224 y($)f(ls)240 -3328 y(CVS)429 b(Makefile)188 b(backend.c)141 b(driver.c)189 -b(frontend.c)93 b(parser.c)125 3602 y Fs(The)30 b(`)p +(\014les.)240 3201 y Fn($)47 b(cd)h(tc)240 3305 y($)f(ls)240 +3408 y(CVS)429 b(Makefile)188 b(backend.c)141 b(driver.c)189 +b(frontend.c)93 b(parser.c)125 3686 y Fs(The)30 b(`)p Fn(CVS)p Fs(')i(directory)e(is)h(used)g(in)m(ternally)e(b)m(y)i Fr(cvs)p Fs(.)43 b(Normally)-8 b(,)32 b(y)m(ou)f(should)f(not)i(mo)s -(dify)d(or)j(remo)m(v)m(e)h(an)m(y)0 3726 y(of)e(the)f(\014les)f(in)g -(it.)125 4000 y(Y)-8 b(ou)31 b(start)h(y)m(our)e(fa)m(v)m(orite)j +(dify)d(or)j(remo)m(v)m(e)h(an)m(y)0 3810 y(of)e(the)f(\014les)f(in)g +(it.)125 4087 y(Y)-8 b(ou)31 b(start)h(y)m(our)e(fa)m(v)m(orite)j (editor,)e(hac)m(k)g(a)m(w)m(a)m(y)i(at)f(`)p Fn(backend.c)p Fs(',)d(and)i(a)g(couple)f(of)i(hours)d(later)i(y)m(ou)h(ha)m(v)m(e)0 -4125 y(added)24 b(an)g(optimization)f(pass)h(to)h(the)f(compiler.)38 +4212 y(added)24 b(an)g(optimization)f(pass)h(to)h(the)f(compiler.)38 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 4249 +b(There)23 b(is)h(no)g(need)g(to)h(lo)s(c)m(k)0 4336 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(5)i([Multiple)e(dev)m(elop)s(ers],)h(page)h(33,)g -(for)g(an)f(explanation.)0 4688 y Fm(2.2)68 b(Committing)32 -b(y)l(our)f(c)l(hanges)125 4962 y Fs(When)f(y)m(ou)i(ha)m(v)m(e)g(c)m +b(See)31 b(Chapter)e(5)i([Multiple)e(dev)m(elop)s(ers],)h(page)h(35,)g +(for)g(an)f(explanation.)0 4814 y Fm(2.2)68 b(Committing)32 +b(y)l(our)f(c)l(hanges)125 5091 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 (ou)i(decide)g(to)g(mak)m(e)h(a)g(new)e(v)m(ersion)0 -5087 y(of)h(`)p Fn(backend.c)p Fs('.)240 5340 y Fn($)47 -b(cvs)g(commit)f(backend.c)p eop +5215 y(of)36 b(`)p Fn(backend.c)p Fs('.)55 b(This)34 +b(will)f(store)j(y)m(our)g(new)f(`)p Fn(backend.c)p Fs(')f(in)g(the)i +(rep)s(ository)f(and)g(mak)m(e)i(it)e(a)m(v)-5 b(ailable)35 +b(to)0 5340 y(an)m(y)m(one)d(else)e(who)g(is)f(using)g(that)i(same)g +(rep)s(ository)-8 b(.)p eop %%Page: 10 12 10 11 bop 0 -116 a Fs(10)2411 b(CVS|Concurren)m(t)29 -b(V)-8 b(ersions)30 b(System)0 366 y Fr(cvs)36 b Fs(starts)h(an)g -(editor,)h(to)g(allo)m(w)e(y)m(ou)h(to)h(en)m(ter)f(a)h(log)f(message.) -61 b(Y)-8 b(ou)37 b(t)m(yp)s(e)g(in)f(\\Added)g(an)h(optimization)0 -491 y(pass.",)31 b(sa)m(v)m(e)h(the)e(temp)s(orary)g(\014le,)g(and)g -(exit)g(the)h(editor.)125 773 y(The)40 b(en)m(vironmen)m(t)h(v)-5 +b(V)-8 b(ersions)30 b(System)240 366 y Fn($)47 b(cvs)g(commit)f +(backend.c)0 640 y Fr(cvs)36 b Fs(starts)h(an)g(editor,)h(to)g(allo)m +(w)e(y)m(ou)h(to)h(en)m(ter)f(a)h(log)f(message.)61 b(Y)-8 +b(ou)37 b(t)m(yp)s(e)g(in)f(\\Added)g(an)h(optimization)0 +765 y(pass.",)31 b(sa)m(v)m(e)h(the)e(temp)s(orary)g(\014le,)g(and)g +(exit)g(the)h(editor.)125 1039 y(The)40 b(en)m(vironmen)m(t)h(v)-5 b(ariable)39 b Fn($CVSEDITOR)g Fs(determines)h(whic)m(h)f(editor)i(is)f -(started.)73 b(If)41 b Fn($CVSEDITOR)d Fs(is)0 898 y(not)33 +(started.)73 b(If)41 b Fn($CVSEDITOR)d Fs(is)0 1163 y(not)33 b(set,)h(then)f(if)f(the)h(en)m(vironmen)m(t)f(v)-5 b(ariable)32 b Fn($EDITOR)f Fs(is)h(set,)i(it)e(will)e(b)s(e)j(used.)47 -b(If)32 b(b)s(oth)g Fn($CVSEDITOR)f Fs(and)0 1022 y Fn($EDITOR)24 -b Fs(are)j(not)g(set)g(then)f(the)h(editor)f(defaults)f(to)i -Fn(vi)p Fs(.)39 b(If)26 b(y)m(ou)h(w)m(an)m(t)g(to)g(a)m(v)m(oid)g(the) -g(o)m(v)m(erhead)g(of)g(starting)f(an)0 1147 y(editor)k(y)m(ou)h(can)f -(sp)s(ecify)f(the)i(log)f(message)i(on)e(the)h(command)f(line)e(using)h -(the)i(`)p Fn(-m)p Fs(')f(\015ag)h(instead,)f(lik)m(e)f(this:)240 -1408 y Fn($)47 b(cvs)g(commit)f(-m)i("Added)e(an)h(optimization)d -(pass")j(backend.c)0 1932 y Fm(2.3)68 b(Cleaning)32 b(up)125 -2214 y Fs(Before)i(y)m(ou)f(turn)g(to)h(other)f(tasks)h(y)m(ou)f +b(If)32 b(b)s(oth)g Fn($CVSEDITOR)f Fs(and)0 1288 y Fn($EDITOR)24 +b Fs(are)i(not)g(set)g(then)f(there)h(is)f(a)h(default)f(whic)m(h)f +(will)f(v)-5 b(ary)26 b(with)e(y)m(our)i(op)s(erating)f(system,)i(for)e +(example)0 1413 y Fn(vi)30 b Fs(for)g(unix)e(or)j Fn(notepad)d +Fs(for)i(Windo)m(ws)g(NT/95.)125 1687 y(When)c Fr(cvs)g +Fs(starts)h(the)g(editor,)h(it)e(includes)e(a)k(list)d(of)i(\014les)f +(whic)m(h)g(are)h(mo)s(di\014ed.)37 b(F)-8 b(or)28 b(the)f +Fr(cvs)f Fs(clien)m(t,)h(this)0 1811 y(list)j(is)g(based)i(on)f +(comparing)g(the)g(mo)s(di\014cation)f(time)h(of)h(the)f(\014le)g +(against)g(the)h(mo)s(di\014cation)e(time)h(that)h(the)0 +1936 y(\014le)j(had)g(when)g(it)g(w)m(as)h(last)g(gotten)h(or)f(up)s +(dated.)56 b(Therefore,)37 b(if)e(a)h(\014le's)f(mo)s(di\014cation)f +(time)i(has)f(c)m(hanged)0 2060 y(but)d(its)h(con)m(ten)m(ts)i(ha)m(v)m +(e)f(not,)g(it)f(will)d(sho)m(w)j(up)f(as)h(mo)s(di\014ed.)47 +b(The)33 b(simplest)e(w)m(a)m(y)j(to)g(handle)d(this)h(is)g(simply)0 +2185 y(not)i(to)g(w)m(orry)f(ab)s(out)g(it|if)f(y)m(ou)i(pro)s(ceed)f +(with)g(the)g(commit)h Fr(cvs)e Fs(will)f(detect)k(that)f(the)g(con)m +(ten)m(ts)h(are)f(not)0 2309 y(mo)s(di\014ed)29 b(and)i(treat)i(it)e +(as)g(an)h(unmo)s(di\014ed)c(\014le.)43 b(The)31 b(next)g +Fn(update)f Fs(will)f(clue)i Fr(cvs)f Fs(in)h(to)h(the)f(fact)i(that)f +(the)0 2434 y(\014le)e(is)g(unmo)s(di\014ed,)e(and)i(it)h(will)d(reset) +j(its)f(stored)h(timestamp)g(so)g(that)g(the)h(\014le)d(will)g(not)i +(sho)m(w)g(up)e(in)h(future)0 2558 y(editor)g(sessions.)125 +2832 y(If)k(y)m(ou)i(w)m(an)m(t)g(to)g(a)m(v)m(oid)f(starting)g(an)g +(editor)g(y)m(ou)g(can)h(sp)s(ecify)d(the)j(log)f(message)h(on)f(the)h +(command)f(line)0 2957 y(using)29 b(the)h(`)p Fn(-m)p +Fs(')h(\015ag)f(instead,)g(lik)m(e)g(this:)240 3210 y +Fn($)47 b(cvs)g(commit)f(-m)i("Added)e(an)h(optimization)d(pass")j +(backend.c)0 3642 y Fm(2.3)68 b(Cleaning)32 b(up)125 +3916 y Fs(Before)i(y)m(ou)f(turn)g(to)h(other)f(tasks)h(y)m(ou)f (decide)g(to)h(remo)m(v)m(e)h(y)m(our)e(w)m(orking)g(cop)m(y)h(of)f -(tc.)50 b(One)33 b(acceptable)0 2339 y(w)m(a)m(y)e(to)g(do)g(that)g(is) -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 +(tc.)50 b(One)33 b(acceptable)0 4041 y(w)m(a)m(y)e(to)g(do)g(that)g(is) +e(of)i(course)240 4294 y Fn($)47 b(cd)h(..)240 4398 y($)f(rm)h(-r)f(tc) +0 4672 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 -(118\):)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\)) -e(module)i(`tc':)f(n)240 3870 y(**)h(`release')e(aborted)h(by)h(user)g -(choice.)125 4153 y Fs(The)41 b Fn(release)f Fs(command)h(c)m(hec)m(ks) -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 -(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 -Fs(command)h(wrote)h(a)g(couple)e(of)i(lines)e(of)h(output.)53 -b(`)p Fn(?)30 b(tc)p Fs(')k(means)0 4966 y(that)23 b(the)f(\014le)g(`)p -Fn(tc)p Fs(')g(is)f(unkno)m(wn)g(to)i Fr(cvs)p Fs(.)37 -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 -(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(119,)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 +(120\):)240 4925 y Fn($)47 b(cd)h(..)240 5029 y($)f(cvs)g(release)f(-d) +h(tc)240 5132 y(M)g(driver.c)240 5236 y(?)g(tc)240 5340 +y(You)g(have)g([1])f(altered)g(files)h(in)g(this)f(repository.)p +eop %%Page: 11 13 11 12 bop 0 -116 a Fs(Chapter)30 b(2:)41 b(A)30 b(sample)g(session)2672 -b(11)125 366 y(`)p Fn(M)30 b(driver.c)p Fs(')g(is)i(more)g(serious.)46 -b(It)33 b(means)f(that)h(the)g(\014le)f(`)p Fn(driver.c)p -Fs(')e(has)j(b)s(een)e(mo)s(di\014ed)g(since)h(it)g(w)m(as)0 -491 y(c)m(hec)m(k)m(ed)g(out.)125 765 y(The)27 b Fn(release)g -Fs(command)h(alw)m(a)m(ys)h(\014nishes)d(b)m(y)i(telling)f(y)m(ou)h(ho) -m(w)h(man)m(y)f(mo)s(di\014ed)e(\014les)i(y)m(ou)g(ha)m(v)m(e)i(in)d(y) -m(our)0 890 y(w)m(orking)g(cop)m(y)h(of)f(the)h(sources,)g(and)f(then)g -(asks)g(y)m(ou)h(for)f(con\014rmation)f(b)s(efore)h(deleting)f(an)m(y)i -(\014les)e(or)i(making)0 1014 y(an)m(y)j(note)g(in)e(the)h(history)g -(\014le.)125 1288 y(Y)-8 b(ou)30 b(decide)g(to)h(pla)m(y)f(it)g(safe)h -(and)f(answ)m(er)g Fn(n)g(RET)g Fs(when)f Fn(release)f -Fs(asks)j(for)f(con\014rmation.)0 1736 y Fm(2.4)68 b(Viewing)31 -b(di\013erences)125 2010 y Fs(Y)-8 b(ou)27 b(do)g(not)g(remem)m(b)s(er) -g(mo)s(difying)d(`)p Fn(driver.c)p Fs(',)i(so)i(y)m(ou)f(w)m(an)m(t)h -(to)g(see)f(what)g(has)g(happ)s(ened)e(to)j(that)g(\014le.)240 -2264 y Fn($)47 b(cd)h(tc)240 2367 y($)f(cvs)g(diff)g(driver.c)125 -2641 y Fs(This)26 b(command)j(runs)e Fn(diff)h Fs(to)h(compare)g(the)g -(v)m(ersion)g(of)f(`)p Fn(driver.c)p Fs(')f(that)j(y)m(ou)f(c)m(hec)m -(k)m(ed)i(out)e(with)e(y)m(our)0 2766 y(w)m(orking)e(cop)m(y)-8 +b(11)240 366 y Fn(Are)47 b(you)g(sure)f(you)h(want)g(to)g(release)f +(\(and)h(delete\))e(module)i(`tc':)f(n)240 470 y(**)h(`release')e +(aborted)h(by)h(user)g(choice.)125 748 y Fs(The)41 b +Fn(release)f Fs(command)h(c)m(hec)m(ks)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 872 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(151.)125 +1149 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 1427 y(In)33 b(the)i(example)f(ab)s(o)m(v)m(e,)j +(the)d Fn(release)f Fs(command)h(wrote)h(a)g(couple)e(of)i(lines)e(of)h +(output.)53 b(`)p Fn(?)30 b(tc)p Fs(')k(means)0 1551 +y(that)23 b(the)f(\014le)g(`)p Fn(tc)p Fs(')g(is)f(unkno)m(wn)g(to)i +Fr(cvs)p Fs(.)37 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 +1676 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 +(150,)i(for)d(information)0 1800 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(121,)j(for)c(a)0 +1925 y(complete)31 b(explanation)e(of)i(all)e(p)s(ossible)f(output)i +(from)g Fn(release)p Fs(.)125 2202 y(`)p Fn(M)g(driver.c)p +Fs(')g(is)i(more)g(serious.)46 b(It)33 b(means)f(that)h(the)g(\014le)f +(`)p Fn(driver.c)p Fs(')e(has)j(b)s(een)e(mo)s(di\014ed)g(since)h(it)g +(w)m(as)0 2327 y(c)m(hec)m(k)m(ed)g(out.)125 2604 y(The)27 +b Fn(release)g Fs(command)h(alw)m(a)m(ys)h(\014nishes)d(b)m(y)i +(telling)f(y)m(ou)h(ho)m(w)h(man)m(y)f(mo)s(di\014ed)e(\014les)i(y)m +(ou)g(ha)m(v)m(e)i(in)d(y)m(our)0 2728 y(w)m(orking)g(cop)m(y)h(of)f +(the)h(sources,)g(and)f(then)g(asks)g(y)m(ou)h(for)f(con\014rmation)f +(b)s(efore)h(deleting)f(an)m(y)i(\014les)e(or)i(making)0 +2853 y(an)m(y)j(note)g(in)e(the)h(history)g(\014le.)125 +3130 y(Y)-8 b(ou)30 b(decide)g(to)h(pla)m(y)f(it)g(safe)h(and)f(answ)m +(er)g Fn(n)g(RET)g Fs(when)f Fn(release)f Fs(asks)j(for)f +(con\014rmation.)0 3608 y Fm(2.4)68 b(Viewing)31 b(di\013erences)125 +3886 y Fs(Y)-8 b(ou)27 b(do)g(not)g(remem)m(b)s(er)g(mo)s(difying)d(`)p +Fn(driver.c)p Fs(',)i(so)i(y)m(ou)f(w)m(an)m(t)h(to)g(see)f(what)g(has) +g(happ)s(ened)e(to)j(that)g(\014le.)240 4142 y Fn($)47 +b(cd)h(tc)240 4246 y($)f(cvs)g(diff)g(driver.c)125 4523 +y Fs(This)26 b(command)j(runs)e Fn(diff)h Fs(to)h(compare)g(the)g(v)m +(ersion)g(of)f(`)p Fn(driver.c)p Fs(')f(that)j(y)m(ou)f(c)m(hec)m(k)m +(ed)i(out)e(with)e(y)m(our)0 4648 y(w)m(orking)e(cop)m(y)-8 b(.)41 b(When)26 b(y)m(ou)g(see)h(the)f(output)g(y)m(ou)g(remem)m(b)s (er)g(that)g(y)m(ou)h(added)e(a)i(command)e(line)g(option)g(that)0 -2890 y(enabled)k(the)i(optimization)e(pass.)41 b(Y)-8 +4772 y(enabled)k(the)i(optimization)e(pass.)41 b(Y)-8 b(ou)30 b(c)m(hec)m(k)i(it)e(in,)g(and)f(release)i(the)g(mo)s(dule.)240 -3144 y Fn($)47 b(cvs)g(commit)f(-m)i("Added)e(an)h(optimization)d -(pass")j(driver.c)240 3247 y(Checking)f(in)h(driver.c;)240 -3351 y(/usr/local/cvsroot/tc/dr)o(iver)o(.c,v)89 b(<--)94 -b(driver.c)240 3455 y(new)47 b(revision:)e(1.2;)i(previous)e(revision:) -h(1.1)240 3559 y(done)240 3662 y($)h(cd)h(..)240 3766 -y($)f(cvs)g(release)f(-d)h(tc)240 3870 y(?)g(tc)240 3974 -y(You)g(have)g([0])f(altered)g(files)h(in)g(this)f(repository.)240 -4078 y(Are)h(you)g(sure)f(you)h(want)g(to)g(release)f(\(and)h(delete\)) -e(module)i(`tc':)f(y)p eop +5029 y Fn($)47 b(cvs)g(commit)f(-m)i("Added)e(an)h(optimization)d +(pass")j(driver.c)240 5132 y(Checking)f(in)h(driver.c;)240 +5236 y(/usr/local/cvsroot/tc/dr)o(iver)o(.c,v)89 b(<--)94 +b(driver.c)240 5340 y(new)47 b(revision:)e(1.2;)i(previous)e(revision:) +h(1.1)p eop %%Page: 12 14 12 13 bop 0 -116 a Fs(12)2411 b(CVS|Concurren)m(t)29 -b(V)-8 b(ersions)30 b(System)p eop +b(V)-8 b(ersions)30 b(System)240 366 y Fn(done)240 470 +y($)47 b(cd)h(..)240 574 y($)f(cvs)g(release)f(-d)h(tc)240 +678 y(?)g(tc)240 782 y(You)g(have)g([0])f(altered)g(files)h(in)g(this)f +(repository.)240 885 y(Are)h(you)g(sure)f(you)h(want)g(to)g(release)f +(\(and)h(delete\))e(module)i(`tc':)f(y)p eop %%Page: 13 15 13 14 bop 0 -116 a Fs(Chapter)30 b(3:)41 b(The)30 b(Rep)s(ository)2725 b(13)0 366 y Fp(3)80 b(The)30 b(Rep)t(ository)125 743 @@ -2790,7 +2845,7 @@ b(F)-8 b(or)25 b(example,)h(the)f(access)h(metho)s(d)0 (ository)f(is)g(in)g(`)p Fn(/usr/local/cvsroot)p Fs(')c(on)27 b(the)g(computer)g(running)d Fr(cvs)p Fs(.)39 b(F)-8 b(or)28 b(informa-)0 2538 y(tion)i(on)g(other)h(access)g(metho)s(ds,)f -(see)h(Section)g(3.6)g([Remote)h(rep)s(ositories],)d(page)i(19.)125 +(see)h(Section)g(3.7)g([Remote)h(rep)s(ositories],)d(page)i(22.)125 2812 y(If)37 b(the)h(access)h(metho)s(d)e(is)g(omitted,)j(then)d(if)g (the)h(rep)s(ository)f(do)s(es)g(not)h(con)m(tain)h(`)p Fn(:)p Fs(',)h(then)d Fn(:local:)f Fs(is)0 2937 y(assumed.)61 @@ -2861,7 +2916,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(5.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(3.2.1)63 b(Where)30 b(\014les)h(are)f(stored)h(within)f(the)h(rep) @@ -2922,14 +2977,14 @@ Fr(cvs)g Fs(or)g Fr(r)n(cs)f Fs(can)i(at)g(least)g(imp)s(ort)d(history) i(\014les)f(in)g(this)g(format.)125 1556 y(The)f Fr(r)n(cs)g 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(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(6.4)g([T)-8 b(ags],)0 1929 y(page)31 b(47.)0 2429 y -Fk(3.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 +(di\013erence)0 1680 y(is)h(magic)h(branc)m(hes;)g(for)g(more)g +(information)e(see)j(Section)e(6.8)i([Magic)g(branc)m(h)f(n)m(um)m(b)s +(ers],)f(page)h(55.)44 b(Also)30 b(in)0 1805 y Fr(cvs)k +Fs(the)g(v)-5 b(alid)33 b(tag)j(names)e(are)h(a)g(subset)f(of)g(what)h +Fr(r)n(cs)e Fs(accepts;)38 b(for)d Fr(cvs)p Fs('s)e(rules)g(see)j +(Section)e(6.4)h([T)-8 b(ags],)0 1929 y(page)31 b(49.)0 +2429 y Fk(3.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) d(of)k(those)g(\014les.)38 b(The)0 2837 y(directories)29 b(inside)e(the)j(rep)s(ository)f(should)f(b)s(e)h(writable)g(b)m(y)g @@ -2945,7 +3000,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(5.5)h([Concurrency],)f(page)i(38\).)125 4185 +(Section)e(5.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 @@ -2971,69 +3026,285 @@ eop %%Page: 17 19 17 18 bop 0 -116 a Fs(Chapter)30 b(3:)41 b(The)30 b(Rep)s(ository)2725 b(17)0 366 y(on)33 b(w)m(atc)m(hes,)j(Section)d(5.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(93;)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(3.6)i([Remote)g(rep)s(ositories],)e(page) -h(19\),)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) +(w)m(atc)m(h],)i(page)e(42;)h(-r,)g(Section)e(A.3)h([Global)e +(options],)i(page)g(95;)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(153\).)125 +769 y(Note)i(that)g(using)e(the)i(clien)m(t/serv)m(er)g +Fr(cvs)e Fs(\(see)j(Section)e(3.7)i([Remote)g(rep)s(ositories],)e(page) +h(22\),)h(there)f(is)0 893 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 +1018 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 +g(for)0 1142 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 +(of)i Fr(cvs)p Fs(;)h(do)e(not)h(rely)e(on)i(the)0 1267 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 +(no)g(e\013ect.)125 1544 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 +(it)h(setuid.)39 b(Y)-8 b(ou)31 b(cannot)g(use)0 1669 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(3.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 +Fr(cvs)p Fs(.)0 2116 y Fk(3.2.3)63 b(The)30 b(attic)125 +2393 y Fs(Y)-8 b(ou)35 b(will)d(notice)j(that)g(sometimes)g +Fr(cvs)f Fs(stores)h(an)f Fr(r)n(cs)g Fs(\014le)g(in)f(the)i +Fn(Attic)p Fs(.)53 b(F)-8 b(or)35 b(example,)h(if)e(the)h +Fr(cvs-)0 2518 y(r)n(oot)41 b Fs(is)h(`)p Fn(/usr/local/cvsroot)p +Fs(')c(and)j(w)m(e)i(are)g(talking)e(ab)s(out)i(the)f(\014le)g(`)p +Fn(backend.c)p Fs(')e(in)h(the)h(directory)0 2642 y(`)p +Fn(yoyodyne/tc)p Fs(',)28 b(then)i(the)h(\014le)e(normally)g(w)m(ould)g +(b)s(e)h(in)240 2899 y Fn(/usr/local/cvsroot/yoyod)o(yne/)o(tc/b)o(ack) +o(end.)o(c,v)125 3176 y Fs(but)f(if)h(it)f(go)s(es)i(in)f(the)g(attic,) +h(it)f(w)m(ould)g(b)s(e)f(in)240 3433 y Fn(/usr/local/cvsroot/yoyod)o +(yne/)o(tc/A)o(tti)o(c/ba)o(cken)o(d.c)o(,v)125 3711 +y Fs(instead.)39 b(It)30 b(should)e(not)i(matter)h(from)e(a)h(user)f(p) +s(oin)m(t)g(of)h(view)f(whether)g(a)h(\014le)f(is)g(in)g(the)h(attic;)h +Fr(cvs)d Fs(k)m(eeps)0 3835 y(trac)m(k)37 b(of)g(this)e(and)g(lo)s(oks) +h(in)e(the)j(attic)g(when)e(it)g(needs)h(to.)59 b(But)36 +b(in)f(case)i(y)m(ou)f(w)m(an)m(t)h(to)g(kno)m(w,)h(the)e(rule)f(is)0 +3960 y(that)29 b(the)g(R)m(CS)f(\014le)g(is)f(stored)i(in)e(the)i +(attic)g(if)f(and)g(only)f(if)h(the)h(head)f(revision)f(on)h(the)h +(trunk)f(has)g(state)i Fn(dead)p Fs(.)0 4084 y(A)h Fn(dead)g +Fs(state)h(means)g(that)g(\014le)e(has)h(b)s(een)g(remo)m(v)m(ed,)i(or) +e(nev)m(er)h(added,)f(for)g(that)h(revision.)42 b(F)-8 +b(or)32 b(example,)g(if)0 4209 y(y)m(ou)h(add)f(a)h(\014le)f(on)h(a)g +(branc)m(h,)g(it)f(will)e(ha)m(v)m(e)k(a)f(trunk)e(revision)g(in)h +Fn(dead)f Fs(state,)k(and)d(a)h(branc)m(h)f(revision)f(in)h(a)0 +4333 y(non-)p Fn(dead)d Fs(state.)0 4813 y Fm(3.3)68 +b(Ho)l(w)31 b(data)g(is)g(stored)g(in)f(the)h(w)l(orking)g(directory) +125 5091 y Fs(While)h(w)m(e)i(are)h(discussing)c Fr(cvs)i +Fs(in)m(ternals)f(whic)m(h)h(ma)m(y)h(b)s(ecome)g(visible)e(from)h +(time)h(to)g(time,)h(w)m(e)f(migh)m(t)0 5215 y(as)g(w)m(ell)f(talk)i +(ab)s(out)e(what)i Fr(cvs)e Fs(puts)g(in)g(the)h(`)p +Fn(CVS)p Fs(')g(directories)f(in)g(the)h(w)m(orking)g(directories.)51 +b(As)34 b(with)f(the)0 5340 y(rep)s(ository)-8 b(,)40 +b Fr(cvs)d Fs(handles)f(this)h(information)g(and)g(one)h(can)h(usually) +d(access)j(it)f(via)f Fr(cvs)g Fs(commands.)64 b(But)p +eop +%%Page: 18 20 +18 19 bop 0 -116 a Fs(18)2411 b(CVS|Concurren)m(t)29 +b(V)-8 b(ersions)30 b(System)0 366 y(in)h(some)i(cases)g(it)f(ma)m(y)h +(b)s(e)f(useful)f(to)i(lo)s(ok)f(at)h(it,)g(and)e(other)i(programs,)g +(suc)m(h)f(as)h(the)f Fn(jCVS)f Fs(graphical)h(user)0 +491 y(in)m(terface)37 b(or)f(the)h Fn(VC)f Fs(pac)m(k)-5 +b(age)38 b(for)e(emacs,)j(ma)m(y)e(need)f(to)h(lo)s(ok)f(at)h(it.)58 +b(Suc)m(h)36 b(programs)g(should)e(follo)m(w)i(the)0 +616 y(recommendations)g(in)e(this)h(section)i(if)e(they)h(hop)s(e)f(to) +i(b)s(e)e(able)h(to)h(w)m(ork)f(with)f(other)h(programs)f(whic)m(h)g +(use)0 740 y(those)j(\014les,)g(including)c(future)j(v)m(ersions)g(of)g +(the)h(programs)f(just)g(men)m(tioned)g(and)f(the)i(command-line)e +Fr(cvs)0 865 y Fs(clien)m(t.)125 1139 y(The)j(`)p Fn(CVS)p +Fs(')h(directory)f(con)m(tains)i(sev)m(eral)f(\014les.)69 +b(Programs)40 b(whic)m(h)f(are)h(reading)f(this)g(directory)h(should)0 +1263 y(silen)m(tly)d(ignore)i(\014les)f(whic)m(h)g(are)i(in)d(the)j +(directory)e(but)h(whic)m(h)f(are)h(not)g(do)s(cumen)m(ted)g(here,)j +(to)e(allo)m(w)e(for)0 1388 y(future)29 b(expansion.)0 +1683 y(`)p Fn(Root)p Fs(')238 b(This)27 b(\014le)g(con)m(tains)i(the)f +(curren)m(t)g Fr(cvs)g Fs(ro)s(ot,)h(as)g(describ)s(ed)d(in)h(Section)h +(3.1)h([Sp)s(ecifying)e(a)h(rep)s(os-)480 1807 y(itory],)i(page)i(13.)0 +1974 y(`)p Fn(Repository)p Fs(')480 2099 y(This)f(\014le)g(con)m(tains) +i(the)f(directory)g(within)e(the)j(rep)s(ository)e(whic)m(h)g(the)i +(curren)m(t)f(directory)g(cor-)480 2223 y(resp)s(onds)k(with.)60 +b(F)-8 b(or)39 b(historical)c(reasons)j(it)f(is)f(an)i(absolute)f +(pathname,)i(although)e(it)g(w)m(ould)480 2348 y(mak)m(e)31 +b(more)g(sense)f(for)g(it)g(to)h(b)s(e)f(relativ)m(e)h(to)g(the)f(ro)s +(ot.)41 b(F)-8 b(or)31 b(example,)g(after)g(the)f(command)720 +2473 y Fn(cvs)47 b(-d)g(:local:/usr/local/cvsroot)41 +b(checkout)46 b(yoyodyne/tc)480 2618 y Fs(`)p Fn(Root)p +Fs(')30 b(will)d(con)m(tain)720 2743 y Fn(:local:/usr/local/cvsroo)o(t) +480 2889 y Fs(and)j(`)p Fn(Repository)p Fs(')e(will)g(con)m(tain)720 +3014 y Fn(/usr/local/cvsroot/yoydy)o(ne/t)o(c)0 3180 +y Fs(`)p Fn(Entries)p Fs(')94 b(This)23 b(\014le)i(lists)e(the)j +(\014les)e(and)g(directories)h(in)f(the)h(w)m(orking)f(directory)-8 +b(.)39 b(It)26 b(is)e(a)h(text)i(\014le)d(according)480 +3305 y(to)g(the)g(con)m(v)m(en)m(tions)h(appropriate)d(for)i(the)g(op)s +(erating)f(system)g(in)g(question.)37 b(The)23 b(\014rst)g(c)m +(haracter)480 3429 y(of)29 b(eac)m(h)h(line)e(indicates)g(what)h(sort)g +(of)g(line)f(it)g(is.)40 b(If)28 b(the)i(c)m(haracter)g(is)e +(unrecognized,)h(programs)480 3554 y(reading)g(the)i(\014le)f(should)e +(silen)m(tly)h(skip)f(that)j(line,)e(to)i(allo)m(w)f(for)g(future)g +(expansion.)480 3700 y(If)g(the)g(\014rst)g(c)m(haracter)i(is)d(`)p +Fn(/)p Fs(',)i(then)f(the)h(format)g(is:)720 3824 y Fn(/)p +Fo(name)5 b Fn(/)p Fo(revision)p Fn(/)p Fo(timestamp)s +Fn([+)p Fo(con\015ict)r Fn(]/)p Fo(options)t Fn(/)p Fo(tagdate)480 +3970 y Fs(where)26 b(`)p Fn([)p Fs(')g(and)f(`)p Fn(])p +Fs(')h(are)h(not)f(part)g(of)g(the)g(en)m(try)-8 b(,)28 +b(but)d(instead)h(indicate)f(that)h(the)h(`)p Fn(+)p +Fs(')f(and)f(con\015ict)480 4095 y(mark)m(er)32 b(are)f(optional.)43 +b Fo(name)36 b Fs(is)31 b(the)g(name)h(of)f(the)h(\014le)e(within)f +(the)i(directory)-8 b(.)44 b Fo(revision)29 b Fs(is)i(the)480 +4219 y(revision)24 b(that)j(the)f(\014le)f(in)g(the)h(w)m(orking)f +(deriv)m(es)h(from,)h(or)f(`)p Fn(0)p Fs(')g(for)g(an)g(added)f +(\014le,)h(or)g(`)p Fn(-)p Fs(')g(follo)m(w)m(ed)480 +4344 y(b)m(y)g(a)g(revision)e(for)h(a)h(remo)m(v)m(ed)h(\014le.)38 +b Fo(timestamp)29 b Fs(is)24 b(the)i(timestamp)g(of)g(the)g(\014le)e +(at)j(the)f(time)f(that)480 4468 y Fr(cvs)30 b Fs(created)i(it;)f(if)f +(the)h(timestamp)g(di\013ers)f(with)f(the)j(actual)f(mo)s(di\014cation) +e(time)i(of)g(the)g(\014le)f(it)480 4593 y(means)c(the)h(\014le)e(has)i +(b)s(een)e(mo)s(di\014ed.)37 b Fo(con\015ict)29 b Fs(indicates)c(that)i +(there)g(w)m(as)f(a)h(con\015ict;)h(if)d(it)h(is)g(the)480 +4717 y(same)f(as)f(the)h(actual)g(mo)s(di\014cation)d(time)j(of)f(the)h +(\014le)e(it)h(means)g(that)h(the)g(user)f(has)g(ob)m(viously)f(not)480 +4842 y(resolv)m(ed)36 b(the)g(con\015ict.)57 b Fo(options)39 +b Fs(con)m(tains)d(stic)m(ky)g(options)g(\(for)g(example)f(`)p +Fn(-kb)p Fs(')h(for)f(a)i(binary)480 4966 y(\014le\).)i +Fo(tagdate)34 b Fs(con)m(tains)27 b(`)p Fn(T)p Fs(')f(follo)m(w)m(ed)h +(b)m(y)f(a)h(tag)h(name,)g(or)f(`)p Fn(D)p Fs(')g(for)f(a)h(date,)i +(follo)m(w)m(ed)d(b)m(y)h(a)g(stic)m(ky)480 5091 y(tag)e(or)e(date.)40 +b(Note)25 b(that)f(if)e Fo(timestamp)k Fs(con)m(tains)e(a)g(pair)f(of)g +(timestamps)g(separated)i(b)m(y)e(a)h(space,)480 5215 +y(rather)29 b(than)f(a)h(single)f(timestamp,)h(y)m(ou)g(are)g(dealing)e +(with)h(a)h(v)m(ersion)f(of)h Fr(cvs)f Fs(earlier)f(than)i +Fr(cvs)480 5340 y Fs(1.5)i(\(not)g(do)s(cumen)m(ted)g(here\).)p +eop +%%Page: 19 21 +19 20 bop 0 -116 a Fs(Chapter)30 b(3:)41 b(The)30 b(Rep)s(ository)2725 +b(19)480 366 y(If)26 b(the)h(\014rst)f(c)m(haracter)i(of)f(a)g(line)e +(in)g(`)p Fn(Entries)p Fs(')g(is)h(`)p Fn(D)p Fs(',)i(then)e(it)g +(indicates)g(a)g(sub)s(directory)-8 b(.)38 b(`)p Fn(D)p +Fs(')27 b(on)480 491 y(a)e(line)f(all)g(b)m(y)g(itself)g(indicates)g +(that)i(the)f(program)g(whic)m(h)e(wrote)j(the)f(`)p +Fn(Entries)p Fs(')e(\014le)h(do)s(es)h(record)480 616 +y(sub)s(directories)31 b(\(therefore,)k(if)d(there)i(is)e(suc)m(h)h(a)h +(line)e(and)g(no)i(other)f(lines)f(b)s(eginning)e(with)j(`)p +Fn(D)p Fs(',)480 740 y(one)e(kno)m(ws)f(there)g(are)h(no)g(sub)s +(directories\).)38 b(Otherwise,)29 b(the)i(line)e(lo)s(oks)g(lik)m(e:) +720 876 y Fn(D/)p Fo(name)5 b Fn(/)p Fo(\014ller1)i Fn(/)p +Fo(\014ller2)g Fn(/)p Fo(\014ller3)g Fn(/)p Fo(\014l)o(ler4)480 +1033 y Fs(where)31 b Fo(name)36 b Fs(is)30 b(the)i(name)f(of)h(the)f +(sub)s(directory)-8 b(,)30 b(and)h(all)f(the)h Fo(\014ller)36 +b Fs(\014elds)30 b(should)f(b)s(e)i(silen)m(tly)480 1157 +y(ignored,)37 b(for)e(future)g(expansion.)56 b(Programs)36 +b(whic)m(h)f(mo)s(dify)f Fn(Entries)g Fs(\014les)h(should)f(preserv)m +(e)480 1282 y(these)d(\014elds.)0 1471 y(`)p Fn(Entries.Log)p +Fs(')480 1595 y(This)24 b(\014le)i(do)s(es)f(not)i(record)f(an)m(y)g +(information)f(b)s(ey)m(ond)g(that)i(in)e(`)p Fn(Entries)p +Fs(',)h(but)f(it)h(do)s(es)g(pro)m(vide)480 1720 y(a)37 +b(w)m(a)m(y)g(to)f(up)s(date)g(the)g(information)f(without)g(ha)m(ving) +g(to)i(rewrite)f(the)g(en)m(tire)g(`)p Fn(Entries)p Fs(')f(\014le,)480 +1844 y(including)24 b(the)j(abilit)m(y)f(to)i(preserv)m(e)f(the)h +(information)d(ev)m(en)j(if)f(the)g(program)g(writing)e(`)p +Fn(Entries)p Fs(')480 1969 y(and)31 b(`)p Fn(Entries.Log)p +Fs(')d(abruptly)i(ab)s(orts.)43 b(The)31 b(format)h(of)f(a)h(line)d(in) +h(`)p Fn(Entries.Log)p Fs(')f(is)i(a)g(single)480 2094 +y(c)m(haracter)36 b(command)e(follo)m(w)m(ed)g(b)m(y)g(a)h(space)f +(follo)m(w)m(ed)g(b)m(y)g(a)h(line)e(in)g(the)h(format)h(sp)s +(eci\014ed)d(for)480 2218 y(a)h(line)e(in)g(`)p Fn(Entries)p +Fs('.)46 b(The)32 b(single)g(c)m(haracter)i(command)e(is)g(`)p +Fn(A)p Fs(')h(to)g(indicate)f(that)h(the)g(en)m(try)g(is)480 +2343 y(b)s(eing)j(added,)i(`)p Fn(R)p Fs(')f(to)h(indicate)e(that)i +(the)f(en)m(try)h(is)e(b)s(eing)f(remo)m(v)m(ed,)40 b(or)e(an)m(y)f +(other)g(c)m(haracter)480 2467 y(to)32 b(indicate)e(that)i(the)f(en)m +(tire)g(line)e(in)h(`)p Fn(Entries.Log)p Fs(')f(should)g(b)s(e)h(silen) +m(tly)f(ignored)i(\(for)g(future)480 2592 y(expansion\).)39 +b(If)29 b(the)g(second)g(c)m(haracter)i(of)e(the)g(line)f(in)f(`)p +Fn(Entries.Log)p Fs(')g(is)h(not)h(a)h(space,)g(then)e(it)480 +2716 y(w)m(as)j(written)e(b)m(y)h(an)h(older)e(v)m(ersion)h(of)h +Fr(cvs)e Fs(\(not)i(do)s(cumen)m(ted)f(here\).)0 2905 +y(`)p Fn(Entries.Backup)p Fs(')480 3030 y(This)50 b(is)h(a)i(temp)s +(orary)e(\014le.)105 b(Recommended)52 b(usage)h(is)e(to)i(write)e(a)i +(new)e(en)m(tries)h(\014le)f(to)480 3154 y(`)p Fn(Entries.Backup)p +Fs(',)27 b(and)j(then)g(to)h(rename)g(it)f(\(atomically)-8 +b(,)30 b(where)g(p)s(ossible\))f(to)i(`)p Fn(Entries)p +Fs('.)0 3343 y(`)p Fn(Entries.Static)p Fs(')480 3468 +y(The)i(only)f(relev)-5 b(an)m(t)33 b(thing)f(ab)s(out)h(this)f(\014le) +g(is)h(whether)f(it)h(exists)f(or)h(not.)50 b(If)32 b(it)h(exists,)h +(then)e(it)480 3592 y(means)d(that)h(only)e(part)i(of)f(a)h(directory)e +(w)m(as)i(gotten)h(and)d Fr(cvs)h Fs(will)d(not)k(create)h(additional)c +(\014les)480 3717 y(in)e(that)i(directory)-8 b(.)39 b(T)-8 +b(o)26 b(clear)h(it,)f(use)g(the)h Fn(update)d Fs(command)i(with)f(the) +h(`)p Fn(-d)p Fs(')g(option,)h(whic)m(h)e(will)480 3841 +y(get)32 b(the)e(additional)e(\014les)i(and)f(remo)m(v)m(e)j(`)p +Fn(Entries.Static)p Fs('.)0 4030 y(`)p Fn(Tag)p Fs(')286 +b(This)38 b(\014le)h(con)m(tains)h(p)s(er-directory)e(stic)m(ky)i(tags) +h(or)f(dates.)69 b(The)39 b(\014rst)g(c)m(haracter)i(is)e(`)p +Fn(T)p Fs(')h(for)g(a)480 4155 y(branc)m(h)35 b(tag,)j(`)p +Fn(N)p Fs(')e(for)f(a)h(non-branc)m(h)f(tag,)j(or)e(`)p +Fn(D)p Fs(')g(for)f(a)h(date,)i(or)e(another)f(c)m(haracter)j(to)e +(mean)480 4279 y(the)d(\014le)e(should)g(b)s(e)h(silen)m(tly)e +(ignored,)j(for)f(future)g(expansion.)46 b(This)30 b(c)m(haracter)k(is) +e(follo)m(w)m(ed)g(b)m(y)480 4404 y(the)k(tag)g(or)f(date.)57 +b(Note)37 b(that)e(p)s(er-directory)g(stic)m(ky)g(tags)i(or)e(dates)h +(are)g(used)e(for)h(things)g(lik)m(e)480 4528 y(applying)j(to)k +(\014les)d(whic)m(h)g(are)i(newly)f(added;)45 b(they)c(migh)m(t)f(not)h +(b)s(e)e(the)i(same)g(as)g(the)g(stic)m(ky)480 4653 y(tags)32 +b(or)e(dates)h(on)g(individual)25 b(\014les.)41 b(F)-8 +b(or)31 b(general)f(information)f(on)i(stic)m(ky)f(tags)i(and)e(dates,) +h(see)480 4777 y(Section)f(6.7)i([Stic)m(ky)e(tags],)i(page)f(54.)0 +4966 y(`)p Fn(Checkin.prog)p Fs(')0 5091 y(`)p Fn(Update.prog)p +Fs(')480 5215 y(These)26 b(\014les)f(store)i(the)f(programs)g(sp)s +(eci\014ed)e(b)m(y)i(the)h(`)p Fn(-i)p Fs(')f(and)f(`)p +Fn(-u)p Fs(')i(options)e(in)g(the)h(mo)s(dules)f(\014le,)480 +5340 y(resp)s(ectiv)m(ely)-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)0 366 y(`)p Fn(Notify)p +Fs(')142 b(This)25 b(\014le)g(stores)i(noti\014cations)f(\(for)g +(example,)h(for)f Fn(edit)f Fs(or)i Fn(unedit)p Fs(\))e(whic)m(h)g(ha)m +(v)m(e)j(not)e(y)m(et)i(b)s(een)480 491 y(sen)m(t)j(to)g(the)g(serv)m +(er.)41 b(Its)30 b(format)h(is)e(not)i(y)m(et)g(do)s(cumen)m(ted)f +(here.)0 692 y(`)p Fn(Notify.tmp)p Fs(')480 817 y(This)23 +b(\014le)i(is)f(to)i(`)p Fn(Notify)p Fs(')e(as)i(`)p +Fn(Entries.Backup)p Fs(')c(is)i(to)i(`)p Fn(Entries)p +Fs('.)38 b(That)25 b(is,)g(to)h(write)f(`)p Fn(Notify)p +Fs(',)480 941 y(\014rst)42 b(write)f(the)i(new)f(con)m(ten)m(ts)i(to)f +(`)p Fn(Notify.tmp)p Fs(')d(and)i(then)g(\(atomically)g(where)g(p)s +(ossible\),)480 1066 y(rename)30 b(it)g(to)h(`)p Fn(Notify)p +Fs('.)0 1267 y(`)p Fn(Base)p Fs(')238 b(If)29 b(w)m(atc)m(hes)i(are)f +(in)e(use,)i(then)f(an)h Fn(edit)e Fs(command)i(stores)g(the)f +(original)f(cop)m(y)i(of)g(the)g(\014le)e(in)h(the)480 +1391 y(`)p Fn(Base)p Fs(')35 b(directory)-8 b(.)56 b(This)34 +b(allo)m(ws)h(the)h Fn(unedit)e Fs(command)h(to)i(op)s(erate)f(ev)m(en) +h(if)d(it)h(is)g(unable)f(to)480 1516 y(comm)m(unicate)d(with)e(the)i +(serv)m(er.)0 1717 y(`)p Fn(Template)p Fs(')480 1841 +y(This)25 b(\014le)i(con)m(tains)g(the)h(template)f(sp)s(eci\014ed)f(b) +m(y)h(the)g(`)p Fn(rcsinfo)p Fs(')f(\014le)h(\(see)h(Section)f(C.8)g +([rcsinfo],)480 1966 y(page)34 b(150\).)52 b(It)33 b(is)g(only)g(used)f +(b)m(y)i(the)f(clien)m(t;)i(the)f(non-clien)m(t/serv)m(er)f +Fr(cvs)g Fs(consults)f(`)p Fn(rcsinfo)p Fs(')480 2090 +y(directly)-8 b(.)0 2658 y Fm(3.4)68 b(The)30 b(administrativ)l(e)j +(\014les)125 2946 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 2970 y(istrativ)m(e)35 -b(\014les],)i(page)f(137,)i(for)d(a)h(complete)g(description.)54 +Fs(.)38 b(See)26 b(App)s(endix)c(C)j([Admin-)0 3070 y(istrativ)m(e)35 +b(\014les],)i(page)f(139,)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 3094 y(but)30 b(some)g(commands)g(w)m(ork)h(b)s(etter)f +g(\014les,)0 3195 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 3407 y(The)f(most)i(imp)s(ortan)m(t)e(of)h(these) +(erly)e(set)j(up.)125 3482 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 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 +b(.)0 3606 y(This)29 b(is)g(a)i(sample)e(`)p Fn(modules)p +Fs(')g(\014le.)240 3873 y Fn(CVSROOT)428 b(CVSROOT)240 +3977 y(modules)g(CVSROOT)45 b(modules)240 4081 y(cvs)620 +b(gnu/cvs)240 4184 y(rcs)g(gnu/rcs)240 4288 y(diff)572 +b(gnu/diff)240 4392 y(tc)668 b(yoyodyne/tc)125 4679 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 4779 y(mo)s(dule,)31 b(whitespace,)i(and)f +(the)g(name)g(of)g(the)0 4804 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 -4903 y(to)f Fn($CVSROOT)p Fs(.)39 b(The)29 b(last)i(four)e(lines)g(in)g +4928 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 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 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 +(page)i(139,)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: 18 20 -18 19 bop 0 -116 a Fs(18)2411 b(CVS|Concurren)m(t)29 -b(V)-8 b(ersions)30 b(System)0 366 y Fk(3.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 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 -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 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(3.4)68 b(Multiple)31 b(rep)t(ositories)125 +%%Page: 21 23 +21 22 bop 0 -116 a Fs(Chapter)30 b(3:)41 b(The)30 b(Rep)s(ository)2725 +b(21)0 366 y Fk(3.4.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 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 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 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(3.5)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 2293 y(ha)m(v)m(e)37 @@ -3061,7 +3332,7 @@ 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 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 4316 y Fm(3.5)68 b(Creating)32 b(a)f(rep)t(ository) +(rep)s(ositories.)0 4316 y Fm(3.6)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 @@ -3080,31 +3351,32 @@ 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 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\).)p eop -%%Page: 19 21 -19 20 bop 0 -116 a Fs(Chapter)30 b(3:)41 b(The)30 b(Rep)s(ository)2725 -b(19)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(5.5)h([Concurrency],)0 1518 -y(page)31 b(38\).)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 +%%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)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(5.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(3)g([Rep)s(ository],)h(page)g(13\).)42 b(F)-8 b(or)31 b(example,)240 2182 y Fn(cvs)47 b(-d)g @@ -3116,8 +3388,8 @@ Fs(is)f(careful)h(to)i(nev)m(er)f(o)m(v)m(erwrite)g(an)m(y)g(existing)e 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 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(3.6)68 b(Remote)32 b(rep)t(ositories)125 3774 +b(See)31 b(Section)f(C.10)h([history)f(\014le],)g(page)h(151.)0 +3494 y Fm(3.7)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 3898 y Fs(in)k(this)g(manner)g @@ -3138,40 +3410,40 @@ b Fn(@)p Fo(hostname)e Fn(:/path/to/repos)o(itor)o(y)125 (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 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(3.6.2)h([Connecting) -e(via)h(rsh],)0 5340 y(page)31 b(20.)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(3.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(b)s(oth)40 b(are)i(describ)s(ed)e(in)g(Section)i(3.7.2)h([Connecting) +e(via)h(rsh],)0 5340 y(page)31 b(23.)p eop +%%Page: 23 25 +23 24 bop 0 -116 a Fs(Chapter)30 b(3:)41 b(The)30 b(Rep)s(ository)2725 +b(23)0 366 y Fk(3.7.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(3.6.2)63 b(Connecting)30 +(e)i(little)f(trouble.)0 3078 y Fk(3.7.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 @@ -3196,26 +3468,27 @@ Fn(rsh)g Fs(prin)m(ted)g(in)g(the)h(ab)s(o)m(v)m(e)h(example)f 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)p eop -%%Page: 21 23 -21 22 bop 0 -116 a Fs(Chapter)30 b(3:)41 b(The)30 b(Rep)s(ository)2725 -b(21)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 +%%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(.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 1662 y(it;)34 b(for)f(example)g(the)h(Windo)m(ws)e(NT)h @@ -3240,7 +3513,7 @@ Fn(chainsaw.brickyard.com)p Fs(',)25 b(y)m(ou)31 b(are)g(ready)f(to)h (.com)o(:/us)o(r/l)o(ocal)o(/cvs)o(roo)o(t)42 b(checkout)j(foo)125 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.\))0 3615 y Fk(3.6.3)63 b(Direct)29 +(and)f(remote)j(hosts.\))0 3615 y Fk(3.7.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 @@ -3250,7 +3523,7 @@ Fn(rsh)g Fs(is)g(not)i(feasible)e(\(for)i(example,)f(the)h(serv)m(er)f 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(3.6.3.1)63 b(Setting)31 b(up)f(the)h(serv)m +4537 y(sides.)0 4941 y Fk(3.7.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 @@ -3258,14 +3531,14 @@ 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: 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)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 +%%Page: 25 27 +25 26 bop 0 -116 a Fs(Chapter)30 b(3:)41 b(The)30 b(Rep)s(ository)2725 +b(25)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 @@ -3285,14 +3558,14 @@ 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 (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 -(3.6.3.3)0 3419 y([P)m(assw)m(ord)27 b(authen)m(tication)h(securit)m -(y],)f(page)h(24,)h(for)e(details\),)g(a)g(separate)h +(3.7.3.3)0 3419 y([P)m(assw)m(ord)27 b(authen)m(tication)h(securit)m +(y],)f(page)h(27,)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 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)0 3668 y(`)p Fn($CVSROOT/CVSROOT/passwd) -p Fs(')d(\(see)39 b(Section)e(3.3)h([In)m(tro)g(administrativ)m(e)e -(\014les],)i(page)g(17\).)63 b(Its)37 b(format)h(is)0 +p Fs(')d(\(see)39 b(Section)e(3.4)h([In)m(tro)g(administrativ)m(e)e +(\014les],)i(page)g(20\).)63 b(Its)37 b(format)h(is)0 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 4053 y Fn(bach:ULtgRLXo7NRxs)240 @@ -3315,43 +3588,43 @@ 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)p eop -%%Page: 23 25 -23 24 bop 0 -116 a Fs(Chapter)30 b(3:)41 b(The)30 b(Rep)s(ository)2725 -b(23)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 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 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 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 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 -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 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 -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 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 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 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 3451 y(ular,)i(see)i(See)f(Section)f(3.7)i([Read-only)f -(access],)i(page)f(26\);)h(ho)m(w)m(ev)m(er,)g(also)d(See)i(Section)e -(3.6.3.3)k([P)m(assw)m(ord)0 3576 y(authen)m(tication)42 -b(securit)m(y],)i(page)e(24.)74 b(An)m(y)42 b(sort)f(of)h(rep)s +%%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)0 366 y(this)k(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 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 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 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 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 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 +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 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 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 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 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 3451 y(ular,)i(see)i(See)f(Section)f(3.8)i +([Read-only)f(access],)i(page)f(29\);)h(ho)m(w)m(ev)m(er,)g(also)d(See) +i(Section)e(3.7.3.3)k([P)m(assw)m(ord)0 3576 y(authen)m(tication)42 +b(securit)m(y],)i(page)e(27.)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 @@ -3359,7 +3632,7 @@ b(securit)m(y],)i(page)e(24.)74 b(An)m(y)42 b(sort)f(of)h(rep)s 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 -4563 y Fk(3.6.3.2)63 b(Using)32 b(the)e(clien)m(t)f(with)h(passw)m(ord) +4563 y Fk(3.7.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 @@ -3371,16 +3644,16 @@ b Fn(cvs)30 b(login)j Fs(command)i(needs)g(to)h(kno)m(w)f(the)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 5340 y(v)-5 b(ariable.)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)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 +%%Page: 27 29 +27 28 bop 0 -116 a Fs(Chapter)30 b(3:)41 b(The)30 b(Rep)s(ository)2725 +b(27)125 366 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 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 1568 y(with)d(the)i(stored)f(passw)m(ord:)240 @@ -3389,7 +3662,7 @@ Fs(is)g(in)m(teractiv)m(e)j(|)e(it)g(prompts)f(for)h(a)h(passw)m(ord:) 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 2252 y(with)g(the)i(serv)m(er)g -(\(see)h(Section)f(3.6.2)h([Connecting)f(via)f(rsh],)h(page)h(20\).)49 +(\(see)h(Section)f(3.7.2)h([Connecting)f(via)f(rsh],)h(page)h(23\).)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 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 @@ -3418,7 +3691,7 @@ 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(3.6.3.3)63 b(Securit)m(y)30 b(considerations)h(with)f(passw)m +4676 y Fk(3.7.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 5091 y(in)36 @@ -3428,19 +3701,19 @@ b(the)h(same)g(enco)s(ding.)59 b(The)37 b(enco)s(ding)f(is)f(done)i (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 5340 y(attac)m(k)m(er)33 b(from)d(gaining)f(the)i(passw)m(ord.)p eop -%%Page: 25 27 -25 26 bop 0 -116 a Fs(Chapter)30 b(3:)41 b(The)30 b(Rep)s(ository)2725 -b(25)125 366 y(The)32 b(separate)j Fr(cvs)d Fs(passw)m(ord)h(\014le)g -(\(see)h(Section)f(3.6.3.1)j([P)m(assw)m(ord)e(authen)m(tication)g -(serv)m(er],)h(page)f(21\))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 +%%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)125 366 y(The)i(separate)j +Fr(cvs)d Fs(passw)m(ord)h(\014le)g(\(see)h(Section)f(3.7.3.1)j([P)m +(assw)m(ord)e(authen)m(tication)g(serv)m(er],)h(page)f(24\))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 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 @@ -3454,7 +3727,7 @@ 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 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 2284 y Fk(3.6.4)63 b(Direct)29 +b(,)30 b(get)i(Kerb)s(eros.)0 2284 y Fk(3.7.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 2706 @@ -3490,39 +3763,38 @@ Fs(,)f(get)i(a)g(tic)m(k)m(et)g(in)e(the)h(usual)e(w)m(a)m(y)j 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.)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)0 366 y Fm(3.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 801 y(serv)m(er)i(\(see)h -(Section)e(3.6.3)j([P)m(assw)m(ord)e(authen)m(ticated],)i(page)f(21\).) -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 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 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 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 -(3.6.3.1)k([P)m(assw)m(ord)0 1859 y(authen)m(tication)32 -b(serv)m(er],)g(page)g(21\).)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 1984 y(securit)m(y)e(considerations)f(in)g(See)i(Section)f -(3.6.3.3)j([P)m(assw)m(ord)e(authen)m(tication)f(securit)m(y],)h(page)g -(24.)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 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 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 +%%Page: 29 31 +29 30 bop 0 -116 a Fs(Chapter)30 b(3:)41 b(The)30 b(Rep)s(ository)2725 +b(29)0 366 y Fm(3.8)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 801 y(serv)m(er)i(\(see)h(Section)e(3.7.3)j([P)m(assw)m(ord) +e(authen)m(ticated],)i(page)f(24\).)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 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 +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 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(3.7.3.1)k +([P)m(assw)m(ord)0 1859 y(authen)m(tication)32 b(serv)m(er],)g(page)g +(24\).)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 1984 y(securit)m(y)e +(considerations)f(in)g(See)i(Section)f(3.7.3.3)j([P)m(assw)m(ord)e +(authen)m(tication)f(securit)m(y],)h(page)g(27.)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 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 +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 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 @@ -3538,8 +3810,8 @@ 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 4656 y(tion)41 b(3.6.3.1)i([P)m(assw)m(ord)f(authen)m -(tication)f(serv)m(er],)k(page)c(21\),)46 b(mak)m(e)c(sure)e(y)m(ou)i +(\(see)i(Sec-)0 4656 y(tion)41 b(3.7.3.1)i([P)m(assw)m(ord)f(authen)m +(tication)f(serv)m(er],)k(page)c(24\),)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 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 @@ -3549,28 +3821,26 @@ 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 (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 5340 y(or)30 b(read-write)g(access:)p eop -%%Page: 27 29 -27 28 bop 0 -116 a Fs(Chapter)30 b(3:)41 b(The)30 b(Rep)s(ository)2725 -b(27)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: 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)p eop -%%Page: 29 31 -29 30 bop 0 -116 a Fs(Chapter)30 b(4:)41 b(Starting)30 -b(a)g(pro)5 b(ject)31 b(with)e(CVS)2212 b(29)0 366 y +%%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)125 366 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 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: 31 33 +31 32 bop 0 -116 a Fs(Chapter)30 b(4:)41 b(Starting)30 +b(a)g(pro)5 b(ject)31 b(with)e(CVS)2212 b(31)0 366 y Fp(4)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 @@ -3582,7 +3852,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(13)h([Mo)m(ving)0 1247 y(\014les],)30 -b(page)h(71.)125 1523 y(What)g(to)g(do)f(next)h(dep)s(ends)d(on)i(the)h +b(page)h(73.)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(4.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 @@ -3613,15 +3883,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(12)i([T)-8 b(rac)m(king)0 4602 y(sources],)31 -b(page)g(67,)g(for)g(more)f(information)f(ab)s(out)h(them.)125 +b(page)g(69,)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 @@ -3645,7 +3915,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(139.)0 +b(See)30 b(Section)g(C.2)h([W)-8 b(rapp)s(ers],)30 b(page)h(141.)0 2856 y Fk(4.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 @@ -3685,9 +3955,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(4:)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(4:)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 @@ -3723,13 +3993,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(3.3)h([In)m(tro)g(administrativ)m(e)180 -491 y(\014les],)31 b(page)h(17,)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(137,)h(for)e(a)h +s(dule.)53 b(See)35 b(Section)g(3.4)h([In)m(tro)g(administrativ)m(e)180 +491 y(\014les],)31 b(page)h(20,)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(139,)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 @@ -3739,9 +4009,9 @@ 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(5:)41 b(Multiple)28 -b(dev)m(elop)s(ers)2565 b(33)0 366 y Fp(5)80 b(Multiple)32 +%%Page: 35 37 +35 36 bop 0 -116 a Fs(Chapter)30 b(5:)41 b(Multiple)28 +b(dev)m(elop)s(ers)2565 b(35)0 366 y Fp(5)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 868 @@ -3756,7 +4026,7 @@ 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(97\).)0 1366 y(This)29 b(is)g(not)i(as)g +([admin)d(options],)j(page)f(99\).)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 @@ -3802,8 +4072,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 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 @@ -3827,7 +4097,7 @@ b(is)h(lik)m(e)g(Lo)s(cally)f(Mo)s(di\014ed,)i(except)h(that)f(a)g 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(5.3)480 2448 y([Con\015icts)30 b(example],)g(page) -h(35.)0 2626 y(Unkno)m(wn)103 b Fr(Cvs)33 b Fs(do)s(esn't)g(kno)m(w)g +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 2750 y(and)d(ha)m(v)m(e)h(not)g(run)e Fn(add)p Fs(.)125 @@ -3839,12 +4109,12 @@ Fn(Repository)27 b(revision)38 b Fs(whic)m(h)g(is)h(the)0 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(121.)42 b(F)-8 b(or)32 b(information)0 +([status],)h(page)f(123.)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(6.7)h([Stic)m(ky)f(tags],)i(page)f(52.)41 +Fs(output,)h(see)h(Section)f(6.7)h([Stic)m(ky)f(tags],)i(page)f(54.)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(123.)0 4290 +(A.18.1)j([up)s(date)c(options],)i(page)g(125.)0 4290 y Fm(5.2)68 b(Bringing)31 b(a)f(\014le)h(up)f(to)h(date)125 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 @@ -3861,9 +4131,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(5:)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(5:)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 @@ -3878,7 +4148,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(123,)0 +b(See)24 b(Section)f(A.18)h([up)s(date],)h(page)e(125,)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(5.3)68 b(Con\015icts)31 b(example)125 1965 y Fs(Supp)s(ose)d(revision)h(1.4)i(of)g(`)p @@ -3896,8 +4166,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 @@ -3926,9 +4196,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(5:)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(5:)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 @@ -3958,8 +4228,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 @@ -3987,7 +4257,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 -(137.)43 b(See)31 b(Section)f(C.7)h([loginfo],)g(page)g(145.)43 +(139.)43 b(See)31 b(Section)f(C.7)h([loginfo],)g(page)g(147.)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 @@ -4016,10 +4286,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(5)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(5:)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(5:)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 @@ -4063,8 +4333,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(5.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) @@ -4115,9 +4385,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(5:)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(5:)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 @@ -4144,11 +4414,11 @@ Fn(cvs)h(watch)g(add)p Fs(;)g(the)g(argumen)m(ts)g(are)g(the)240 (noti\014cation,)j Fr(cvs)c Fs(calls)g(the)i(`)p Fn(notify)p Fs(')e(administrativ)m(e)f(\014le.)81 b(Edit)0 2895 y(`)p Fn(notify)p Fs(')41 b(as)i(one)f(edits)g(the)g(other)h(administrativ)m -(e)d(\014les)i(\(see)h(Section)f(3.3)h([In)m(tro)g(administrativ)m(e)d -(\014les],)0 3020 y(page)28 b(17\).)41 b(This)26 b(\014le)g(follo)m(ws) +(e)d(\014les)i(\(see)h(Section)f(3.4)h([In)m(tro)g(administrativ)m(e)d +(\014les],)0 3020 y(page)28 b(20\).)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(141\),)j(where)c(eac)m(h)i(line)d(is)h(a)h(regular)e +y(page)24 b(143\),)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 @@ -4180,8 +4450,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 @@ -4242,9 +4512,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(5:)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(5:)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) @@ -4294,8 +4564,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(5.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 @@ -4349,7 +4619,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(5.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 @@ -4363,9 +4633,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(6:)41 b(Revisions)29 -b(and)g(branc)m(hes)2417 b(45)0 366 y Fp(6)80 b(Revisions)31 +%%Page: 47 49 +47 48 bop 0 -116 a Fs(Chapter)30 b(6:)41 b(Revisions)29 +b(and)g(branc)m(hes)2417 b(47)0 366 y Fp(6)80 b(Revisions)31 b(and)f(branc)l(hes)125 884 y Fs(F)-8 b(or)28 b(man)m(y)f(uses)g(of)g Fr(cvs)p Fs(,)g(one)h(do)s(esn't)f(need)g(to)h(w)m(orry)f(to)s(o)h(m)m (uc)m(h)f(ab)s(out)g(revision)e(n)m(um)m(b)s(ers;)i Fr(cvs)g @@ -4419,8 +4689,8 @@ b(branc)m(h)h(fork)m(ed)h(o\013.)40 b(Ha)m(ving)26 b(branc)m(h)f(n)m (um)m(b)s(ers)f(allo)m(ws)h(more)h(than)g(one)g(branc)m(h)f(to)i(b)s(e) e(fork)m(ed)0 5340 y(o\013)31 b(from)f(a)g(certain)h(revision.)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)125 617 y(All)c(revisions)g(on)h(a)i (branc)m(h)e(ha)m(v)m(e)i(revision)d(n)m(um)m(b)s(ers)g(formed)h(b)m(y) h(app)s(ending)d(an)j(ordinal)e(n)m(um)m(b)s(er)g(to)j(the)0 @@ -4451,10 +4721,10 @@ s(er)g(it)g(pic)m(ks)g(the)0 3420 y(\014rst)26 b(un)m(used)g(ev)m(en)i 3544 y(will)e(b)s(e)j(n)m(um)m(b)s(ered)e(6.4.2.)42 b(All)28 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 -3669 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(155\).)42 b(The)29 b(branc)m(h)h(1.1.1)i(has)d(a)i -(sp)s(ecial)d(meaning.)0 3793 y(See)j(Chapter)e(12)j([T)-8 -b(rac)m(king)30 b(sources],)h(page)g(67.)0 4488 y Fm(6.2)68 +3669 y Fr(cvs)33 b Fs(\(see)h(Section)g(6.8)h([Magic)f(branc)m(h)f(n)m +(um)m(b)s(ers],)h(page)g(55\).)52 b(The)33 b(branc)m(h)g(1.1.1)j(has)d +(a)h(sp)s(ecial)e(meaning.)0 3793 y(See)f(Chapter)e(12)j([T)-8 +b(rac)m(king)30 b(sources],)h(page)g(69.)0 4488 y Fm(6.2)68 b(V)-11 b(ersions,)31 b(revisions)g(and)f(releases)125 4790 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 @@ -4468,105 +4738,108 @@ h(sense)0 5340 y(are)k(called)e Fo(releases)p Fs(.)41 b(T)-8 b(o)31 b(a)m(v)m(oid)g(confusion,)e(the)i(w)m(ord)f Fo(v)m(ersion)g Fs(is)f(almost)i(nev)m(er)f(used)g(in)f(this)g(do)s (cumen)m(t.)p eop -%%Page: 47 49 -47 48 bop 0 -116 a Fs(Chapter)30 b(6:)41 b(Revisions)29 -b(and)g(branc)m(hes)2417 b(47)0 366 y Fm(6.3)68 b(Assigning)31 -b(revisions)125 642 y Fs(By)k(default,)g Fr(cvs)f Fs(will)e(assign)i(n) +%%Page: 49 51 +49 50 bop 0 -116 a Fs(Chapter)30 b(6:)41 b(Revisions)29 +b(and)g(branc)m(hes)2417 b(49)0 366 y Fm(6.3)68 b(Assigning)31 +b(revisions)125 640 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 767 y(men)m(ting)30 +s(er)g(the)h(same)g(and)g(incre-)0 765 y(men)m(ting)30 b(the)h(second)f(n)m(um)m(b)s(er.)39 b(F)-8 b(or)32 b(example,)e Fn(1.1)p Fs(,)g Fn(1.2)p Fs(,)f Fn(1.3)p Fs(,)h(etc.)125 -1042 y(When)g(adding)g(a)h(new)g(\014le,)f(the)h(second)g(n)m(um)m(b)s +1039 y(When)g(adding)g(a)h(new)g(\014le,)f(the)h(second)g(n)m(um)m(b)s (er)f(will)e(alw)m(a)m(ys)k(b)s(e)e(one)i(and)e(the)h(\014rst)f(n)m(um) -m(b)s(er)g(will)e(equal)0 1167 y(the)33 b(highest)f(\014rst)g(n)m(um)m +m(b)s(er)g(will)e(equal)0 1163 y(the)33 b(highest)f(\014rst)g(n)m(um)m (b)s(er)f(of)i(an)m(y)h(\014le)d(in)h(that)h(directory)-8 b(.)48 b(F)-8 b(or)34 b(example,)f(the)g(curren)m(t)f(directory)h(con)m -(tains)0 1292 y(\014les)27 b(whose)h(highest)f(n)m(um)m(b)s(ered)g +(tains)0 1288 y(\014les)27 b(whose)h(highest)f(n)m(um)m(b)s(ered)g (revisions)f(are)j Fn(1.7)p Fs(,)e Fn(3.1)p Fs(,)h(and)g Fn(4.12)p Fs(,)f(then)h(an)g(added)g(\014le)f(will)e(b)s(e)j(giv)m(en)g -(the)0 1416 y(n)m(umeric)h(revision)g Fn(4.1)p Fs(.)125 -1692 y(Normally)k(there)j(is)e(no)h(reason)g(to)h(care)g(ab)s(out)f +(the)0 1413 y(n)m(umeric)h(revision)g Fn(4.1)p Fs(.)125 +1687 y(Normally)k(there)j(is)e(no)h(reason)g(to)h(care)g(ab)s(out)f (the)g(revision)e(n)m(um)m(b)s(ers|it)g(is)i(easier)g(to)g(treat)i -(them)e(as)0 1816 y(in)m(ternal)28 b(n)m(um)m(b)s(ers)g(that)i +(them)e(as)0 1811 y(in)m(ternal)28 b(n)m(um)m(b)s(ers)g(that)i Fr(cvs)f Fs(main)m(tains,)f(and)h(tags)i(pro)m(vide)d(a)i(b)s(etter)g (w)m(a)m(y)g(to)g(distinguish)c(b)s(et)m(w)m(een)k(things)0 -1941 y(lik)m(e)35 b(release)i(1)f(v)m(ersus)g(release)g(2)g(of)h(y)m +1936 y(lik)m(e)35 b(release)i(1)f(v)m(ersus)g(release)g(2)g(of)h(y)m (our)f(pro)s(duct)e(\(see)j(Section)f(6.4)h([T)-8 b(ags],)39 -b(page)e(47\).)59 b(Ho)m(w)m(ev)m(er,)40 b(if)35 b(y)m(ou)0 -2065 y(w)m(an)m(t)c(to)g(set)g(the)g(n)m(umeric)e(revisions,)g(the)h(`) -p Fn(-r)p Fs(')h(option)e(to)j Fn(cvs)d(commit)g Fs(can)h(do)h(that.) -125 2341 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 2466 y(c)m(hanged\),)32 -b(y)m(ou)e(migh)m(t)g(in)m(v)m(ok)m(e:)240 2721 y Fn($)47 -b(cvs)g(commit)f(-r)i(3.0)125 2996 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 -3121 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 -3245 y(releases)31 b(in)e(parallel,)f(y)m(ou)j(need)f(to)h(use)f(a)h +b(page)e(49\).)59 b(Ho)m(w)m(ev)m(er,)40 b(if)35 b(y)m(ou)0 +2060 y(w)m(an)m(t)40 b(to)h(set)f(the)f(n)m(umeric)g(revisions,)h(the)f +(`)p Fn(-r)p Fs(')h(option)f(to)h Fn(cvs)29 b(commit)38 +b Fs(can)i(do)f(that.)69 b(The)39 b(`)p Fn(-r)p Fs(')g(option)0 +2185 y(implies)32 b(the)j(`)p Fn(-f)p Fs(')f(option,)i(in)d(the)i +(sense)f(that)h(it)g(causes)g(the)f(\014les)g(to)h(b)s(e)f(committed)h +(ev)m(en)g(if)f(they)h(are)g(not)0 2309 y(mo)s(di\014ed.)125 +2583 y(F)-8 b(or)36 b(example,)g(to)g(bring)e(all)g(y)m(our)h(\014les)f +(up)g(to)i(revision)e(3.0)i(\(including)c(those)k(that)g(ha)m(v)m(en't) +h(c)m(hanged\),)0 2708 y(y)m(ou)31 b(migh)m(t)f(in)m(v)m(ok)m(e:)240 +2961 y Fn($)47 b(cvs)g(commit)f(-r)i(3.0)125 3235 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 3359 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 3484 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(6)h([Revisions)e(and)h(branc)m(hes],)g -(page)h(45\).)0 3709 y Fm(6.4)68 b(T)-11 b(ags{Sym)l(b)t(olic)31 -b(revisions)125 3985 y Fs(The)26 b(revision)g(n)m(um)m(b)s(ers)g(liv)m +(page)h(47\).)0 3920 y Fm(6.4)68 b(T)-11 b(ags{Sym)l(b)t(olic)31 +b(revisions)125 4194 y Fs(The)26 b(revision)g(n)m(um)m(b)s(ers)g(liv)m (e)g(a)i(life)e(of)h(their)f(o)m(wn.)40 b(They)27 b(need)g(not)g(ha)m (v)m(e)i(an)m(ything)d(at)i(all)f(to)h(do)f(with)f(the)0 -4110 y(release)36 b(n)m(um)m(b)s(ers)e(of)i(y)m(our)f(soft)m(w)m(are)i +4319 y(release)36 b(n)m(um)m(b)s(ers)e(of)i(y)m(our)f(soft)m(w)m(are)i (pro)s(duct.)56 b(Dep)s(ending)34 b(on)h(ho)m(w)h(y)m(ou)g(use)f -Fr(cvs)g Fs(the)h(revision)d(n)m(um)m(b)s(ers)0 4234 +Fr(cvs)g Fs(the)h(revision)d(n)m(um)m(b)s(ers)0 4443 y(migh)m(t)25 b(c)m(hange)g(sev)m(eral)h(times)e(b)s(et)m(w)m(een)h(t)m (w)m(o)h(releases.)39 b(As)25 b(an)g(example,)h(some)f(of)g(the)g -(source)g(\014les)f(that)h(mak)m(e)0 4359 y(up)k Fr(r)n(cs)h +(source)g(\014les)f(that)h(mak)m(e)0 4568 y(up)k Fr(r)n(cs)h Fs(5.6)h(ha)m(v)m(e)h(the)e(follo)m(wing)f(revision)g(n)m(um)m(b)s -(ers:)240 4614 y Fn(ci.c)572 b(5.21)240 4717 y(co.c)g(5.9)240 -4821 y(ident.c)428 b(5.3)240 4925 y(rcs.c)524 b(5.12)240 -5029 y(rcsbase.h)332 b(5.11)240 5132 y(rcsdiff.c)g(5.10)240 -5236 y(rcsedit.c)g(5.11)240 5340 y(rcsfcmp.c)g(5.9)p +(ers:)240 4821 y Fn(ci.c)572 b(5.21)240 4925 y(co.c)g(5.9)240 +5029 y(ident.c)428 b(5.3)240 5132 y(rcs.c)524 b(5.12)240 +5236 y(rcsbase.h)332 b(5.11)240 5340 y(rcsdiff.c)g(5.10)p eop -%%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)240 366 y Fn(rcsgen.c)380 -b(5.10)240 470 y(rcslex.c)g(5.11)240 574 y(rcsmap.c)g(5.2)240 -678 y(rcsutil.c)332 b(5.10)125 1049 y Fs(Y)-8 b(ou)23 +%%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)240 366 y Fn(rcsedit.c)332 +b(5.11)240 470 y(rcsfcmp.c)g(5.9)240 574 y(rcsgen.c)380 +b(5.10)240 678 y(rcslex.c)g(5.11)240 782 y(rcsmap.c)g(5.2)240 +885 y(rcsutil.c)332 b(5.10)125 1205 y Fs(Y)-8 b(ou)23 b(can)h(use)e(the)i Fn(tag)e Fs(command)h(to)h(giv)m(e)f(a)h(sym)m(b)s (olic)d(name)i(to)h(a)g(certain)f(revision)e(of)i(a)h(\014le.)37 -b(Y)-8 b(ou)24 b(can)f(use)0 1174 y(the)i(`)p Fn(-v)p +b(Y)-8 b(ou)24 b(can)f(use)0 1330 y(the)i(`)p Fn(-v)p Fs(')g(\015ag)g(to)h(the)f Fn(status)f Fs(command)g(to)i(see)g(all)e (tags)i(that)f(a)h(\014le)e(has,)i(and)e(whic)m(h)g(revision)f(n)m(um)m -(b)s(ers)h(they)0 1299 y(represen)m(t.)42 b(T)-8 b(ag)31 +(b)s(ers)h(they)0 1454 y(represen)m(t.)42 b(T)-8 b(ag)31 b(names)g(m)m(ust)g(start)g(with)e(an)i(upp)s(ercase)f(or)h(lo)m(w)m (ercase)h(letter)f(and)f(can)h(con)m(tain)g(upp)s(ercase)0 -1423 y(and)26 b(lo)m(w)m(ercase)i(letters,)g(digits,)f(`)p +1579 y(and)26 b(lo)m(w)m(ercase)i(letters,)g(digits,)f(`)p Fn(-)p Fs(',)h(and)e(`)p Fn(_)p Fs('.)40 b(The)26 b(t)m(w)m(o)i(tag)g (names)f Fn(BASE)f Fs(and)g Fn(HEAD)g Fs(are)h(reserv)m(ed)g(for)g(use) -f(b)m(y)0 1548 y Fr(cvs)p Fs(.)38 b(It)26 b(is)e(exp)s(ected)i(that)g +f(b)m(y)0 1703 y Fr(cvs)p Fs(.)38 b(It)26 b(is)e(exp)s(ected)i(that)g (future)f(names)g(whic)m(h)f(are)i(sp)s(ecial)e(to)i Fr(cvs)f Fs(will)e(b)s(e)h(sp)s(ecially)g(named,)i(for)f(example)0 -1672 y(b)m(y)g(starting)g(with)f(`)p Fn(.)p Fs(',)j(rather)e(than)g(b)s +1828 y(b)m(y)g(starting)g(with)f(`)p Fn(.)p Fs(',)j(rather)e(than)g(b)s (eing)f(named)h(analogously)f(to)i Fn(BASE)f Fs(and)f Fn(HEAD)p Fs(,)i(to)g(a)m(v)m(oid)f(con\015icts)g(with)0 -1797 y(actual)31 b(tag)g(names.)125 2168 y(Y)-8 b(ou'll)27 +1952 y(actual)31 b(tag)g(names.)125 2272 y(Y)-8 b(ou'll)27 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 (naming)f(tags,)j(based)e(on)h(information)d(suc)m(h)j(as)f(the)h(name) -0 2293 y(of)34 b(the)h(program)f(and)f(the)i(v)m(ersion)e(n)m(um)m(b)s +0 2397 y(of)34 b(the)h(program)f(and)f(the)i(v)m(ersion)e(n)m(um)m(b)s (er)g(of)h(the)h(release.)52 b(F)-8 b(or)35 b(example,)g(one)g(migh)m -(t)e(tak)m(e)j(the)f(name)f(of)0 2417 y(the)k(program,)i(immediately)c +(t)e(tak)m(e)j(the)f(name)f(of)0 2521 y(the)k(program,)i(immediately)c (follo)m(w)m(ed)i(b)m(y)g(the)g(v)m(ersion)g(n)m(um)m(b)s(er)e(with)h (`)p Fn(.)p Fs(')h(c)m(hanged)h(to)g(`)p Fn(-)p Fs(',)h(so)e(that)h -(CVS)0 2542 y(1.9)45 b(w)m(ould)e(b)s(e)g(tagged)j(with)d(the)h(name)g +(CVS)0 2646 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)0 2666 +(t)f(con)m(v)m(en)m(tion,)49 b(then)44 b(y)m(ou)0 2770 y(w)m(on't)33 b(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 2791 +b(Y)-8 b(ou)33 b(migh)m(t)g(ev)m(en)g(w)m(an)m(t)0 2895 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(15.3)h([user-de\014ned)e -(logging],)0 2916 y(page)31 b(77\).)125 3287 y(The)h(follo)m(wing)g +(logging],)0 3019 y(page)31 b(79\).)125 3339 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 -3412 y(inside)e(y)m(our)i(w)m(orking)f(cop)m(y)i(of)g(the)f(mo)s(dule.) +3464 y(inside)e(y)m(our)i(w)m(orking)f(cop)m(y)i(of)g(the)f(mo)s(dule.) 47 b(That)33 b(is,)g(y)m(ou)h(should)d(issue)h(the)h(command)g(in)f -(the)h(directory)0 3536 y(where)d(`)p Fn(backend.c)p +(the)h(directory)0 3588 y(where)d(`)p Fn(backend.c)p Fs(')e(resides.)240 3887 y Fn($)47 b(cvs)g(tag)g(release-0-4)e (backend.c)240 3991 y(T)i(backend.c)240 4095 y($)g(cvs)g(status)f(-v)i (backend.c)240 4198 y(========================)o(====)o(====)o(===)o @@ -4579,9 +4852,9 @@ b(/usr/local/cvsroot/yoyody)o(ne/t)o(c/ba)o(cke)o(nd.c)o(,v)431 b(Date:)380 b(\(none\))431 4925 y(Sticky)46 b(Options:)236 b(\(none\))431 5132 y(Existing)45 b(Tags:)622 5236 y(release-0-4)999 b(\(revision:)45 b(1.4\))p eop -%%Page: 49 51 -49 50 bop 0 -116 a Fs(Chapter)30 b(6:)41 b(Revisions)29 -b(and)g(branc)m(hes)2417 b(49)125 366 y(There)29 b(is)h(seldom)f +%%Page: 51 53 +51 52 bop 0 -116 a Fs(Chapter)30 b(6:)41 b(Revisions)29 +b(and)g(branc)m(hes)2417 b(51)125 366 y(There)29 b(is)h(seldom)f (reason)i(to)g(tag)h(a)f(\014le)e(in)g(isolation.)40 b(A)30 b(more)h(common)g(use)f(is)f(to)i(tag)h(all)d(the)i(\014les)e (that)0 491 y(constitute)37 b(a)h(mo)s(dule)d(with)h(the)h(same)g(tag)i @@ -4596,7 +4869,7 @@ b(y)m(ou)h(giv)m(e)h Fr(cvs)d Fs(a)j(directory)e(as)h(argumen)m(t,)h (\014les)0 1953 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(8)0 -2078 y([Recursiv)m(e)30 b(b)s(eha)m(vior],)g(page)h(59.\))125 +2078 y([Recursiv)m(e)30 b(b)s(eha)m(vior],)g(page)h(61.\))125 2383 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 2508 y(This)h(\015ag)i(mak)m(es)h @@ -4610,7 +4883,7 @@ b(is)h(useful,)h(for)g(instance,)h(if)e(someone)i(claims)e(that)h (cop)m(y)-8 b(.)125 3653 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 3777 -y(options],)30 b(page)h(102.)125 4083 y(When)j(y)m(ou)h(tag)h(more)f +y(options],)30 b(page)h(104.)125 4083 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 4207 y(dra)m(wn)e(through)h(a)g(matrix)f(of)i(\014lename)e(vs.)52 @@ -4622,8 +4895,8 @@ b(TAG)622 4928 y(1.2*-)142 b(1.2)237 b(1.2)191 b(-1.2*-)622 5032 y(1.3)94 b(\\-)48 b(1.3*-)141 b(1.3)i(/)47 b(1.3)622 5135 y(1.4)476 b(\\)95 b(1.4)g(/)g(1.4)1290 5239 y(\\-1.5*-)141 b(1.5)1385 5343 y(1.6)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)125 366 y(A)m(t)38 b(some)f(time)g(in)f (the)i(past,)h(the)f Fn(*)e Fs(v)m(ersions)h(w)m(ere)h(tagged.)63 b(Y)-8 b(ou)38 b(can)f(think)f(of)h(the)h(tag)g(as)g(a)f(handle)0 @@ -4647,7 +4920,7 @@ y Fm(6.5)68 b(What)31 b(branc)l(hes)f(are)h(go)t(o)t(d)f(for)125 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)0 2992 y(fatal)27 b(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(6.4)h([T)-8 b(ags],)29 b(page)f(47\))g(and)f(\014nd)e(the)j +(Section)f(6.4)h([T)-8 b(ags],)29 b(page)f(49\))g(and)f(\014nd)e(the)j (bug)e(\(whic)m(h)g(turns)0 3116 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 @@ -4668,14 +4941,14 @@ 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 4954 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(120.) +(the)h(mo)s(dule.)38 b(See)29 b(Section)g(A.15)h([rtag],)h(page)e(122.) 0 5078 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(122\).)240 +Fs(command;)i(see)g(Section)f(A.17)i([tag],)g(page)f(124\).)240 5340 y Fn($)47 b(cvs)g(rtag)g(-b)g(-r)g(release-1-0)e (release-1-0-patches)e(tc)p eop -%%Page: 51 53 -51 52 bop 0 -116 a Fs(Chapter)30 b(6:)41 b(Revisions)29 -b(and)g(branc)m(hes)2417 b(51)125 366 y(The)40 b(`)p +%%Page: 53 55 +53 54 bop 0 -116 a Fs(Chapter)30 b(6:)41 b(Revisions)29 +b(and)g(branc)m(hes)2417 b(53)125 366 y(The)40 b(`)p Fn(-b)p Fs(')h(\015ag)g(mak)m(es)h Fn(rtag)d Fs(create)k(a)e(branc)m(h) f(\(rather)h(than)g(just)f(a)h(sym)m(b)s(olic)f(revision)f(name\).)72 b(`)p Fn(-r)0 491 y(release-1-0)p Fs(')44 b(sa)m(ys)k(that)f(this)f @@ -4724,10 +4997,10 @@ h(on.)62 b(\(If)37 b(`)p Fn(release-1-0)p Fs(')e(corresp)s(onds)h(to)i (er)g(will)g(b)s(e)h(1.4.2.)62 b(F)-8 b(or)38 b(obscure)f(reasons)g Fr(cvs)f Fs(alw)m(a)m(ys)h(giv)m(es)h(branc)m(hes)e(ev)m(en)0 5340 y(n)m(um)m(b)s(ers,)29 b(starting)h(at)h(2.)42 b(See)30 -b(Section)g(6.1)i([Revision)d(n)m(um)m(b)s(ers],)g(page)j(45.\).)p +b(Section)g(6.1)i([Revision)d(n)m(um)m(b)s(ers],)g(page)j(47.\).)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)0 366 y Fm(6.7)68 b(Stic)l(ky)31 b(tags)125 697 y Fs(The)40 b(`)p Fn(-r)30 b(release-1-0-patches)p Fs(')36 b(\015ag)42 b(that)g(w)m(as)f(giv)m(en)g(to)h @@ -4738,7 +5011,7 @@ b(.)44 b(If)31 b(y)m(ou)h(commit)f(an)m(y)h(mo)s(di\014-)0 946 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 1071 y(trunk.)40 b(See)30 b(Chapter)g(7)h -([Merging],)g(page)g(55.)125 1401 y(Y)-8 b(ou)30 b(can)h(use)f(the)h +([Merging],)g(page)g(57.)125 1401 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 1711 y Fn($)47 b(vi)h(driver.c)141 b(#)47 b Fs(Fix)30 b(the)h(bugs)240 1815 y Fn($)47 b(cvs)g(commit)f(-m) @@ -4783,9 +5056,9 @@ Fn(-D)p Fs(')g(option)f(to)i Fn(update)d Fs(or)i Fn(checkout)d Fs(sets)j(a)h Fo(stic)m(ky)0 5340 y(date)p Fs(,)e(whic)m(h,)f (similarly)-8 b(,)27 b(causes)k(that)g(date)g(to)g(b)s(e)f(used)f(for)i (future)e(retriev)-5 b(als.)p eop -%%Page: 53 55 -53 54 bop 0 -116 a Fs(Chapter)30 b(6:)41 b(Revisions)29 -b(and)g(branc)m(hes)2417 b(53)125 366 y(Man)m(y)32 b(times)g(y)m(ou)h +%%Page: 55 57 +55 56 bop 0 -116 a Fs(Chapter)30 b(6:)41 b(Revisions)29 +b(and)g(branc)m(hes)2417 b(55)125 366 y(Man)m(y)32 b(times)g(y)m(ou)h (will)d(w)m(an)m(t)j(to)g(retriev)m(e)f(an)g(old)g(v)m(ersion)g(of)g(a) h(\014le)e(without)g(setting)i(a)f(stic)m(ky)h(tag.)47 b(The)0 491 y(w)m(a)m(y)31 b(to)g(do)f(that)h(is)e(with)g(the)h(`)p @@ -4799,26 +5072,63 @@ Fn(file1)p Fs(')g(whic)m(h)f(existed)i(as)g(revision)0 b(supp)s(ose)d(y)m(ou)i(w)m(an)m(t)h(to)f(add)f(it)0 865 y(again,)f(with)e(the)h(same)h(con)m(ten)m(ts)h(it)e(had)g (previously)-8 b(.)39 b(Here)31 b(is)e(ho)m(w)h(to)i(do)e(it:)240 -1118 y Fn($)47 b(cvs)g(update)f(-p)i(-r)f(1.1)g(file1)f(>file1)240 -1222 y(========================)o(====)o(====)o(===)o(====)o(====)o -(===)o(====)o(====)o(===)o(====)o(====)o(==)240 1325 -y(Checking)g(out)g(file1)240 1429 y(RCS:)94 b +1140 y Fn($)47 b(cvs)g(update)f(-p)i(-r)f(1.1)g(file1)f(>file1)240 +1244 y(========================)o(====)o(====)o(===)o(====)o(====)o +(===)o(====)o(====)o(===)o(====)o(====)o(==)240 1347 +y(Checking)g(out)g(file1)240 1451 y(RCS:)94 b (/tmp/cvs-sanity/cvsroot/fi)o(rst)o(-dir)o(/Att)o(ic/)o(file)o(1,v)240 -1533 y(VERS:)46 b(1.1)240 1637 y(***************)240 -1740 y($)h(cvs)g(add)g(file1)240 1844 y(cvs)g(add:)g(re-adding)e(file)h +1555 y(VERS:)46 b(1.1)240 1659 y(***************)240 +1762 y($)h(cvs)g(add)g(file1)240 1866 y(cvs)g(add:)g(re-adding)e(file)h (file1)h(\(in)g(place)f(of)h(dead)g(revision)e(1.2\))240 -1948 y(cvs)i(add:)g(use)f('cvs)h(commit')f(to)h(add)g(this)g(file)f -(permanently)240 2052 y($)h(cvs)g(commit)f(-m)i(test)240 -2156 y(Checking)e(in)h(file1;)240 2259 y(/tmp/cvs-sanity/cvsroot/)o +1970 y(cvs)i(add:)g(use)f('cvs)h(commit')f(to)h(add)g(this)g(file)f +(permanently)240 2074 y($)h(cvs)g(commit)f(-m)i(test)240 +2178 y(Checking)e(in)h(file1;)240 2281 y(/tmp/cvs-sanity/cvsroot/)o (firs)o(t-di)o(r/f)o(ile1)o(,v)89 b(<--)95 b(file1)240 -2363 y(new)47 b(revision:)e(1.3;)i(previous)e(revision:)h(1.2)240 -2467 y(done)240 2571 y($)p eop -%%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)p eop -%%Page: 55 57 -55 56 bop 0 -116 a Fs(Chapter)30 b(7:)41 b(Merging)3018 -b(55)0 366 y Fp(7)80 b(Merging)125 788 y Fs(Y)-8 b(ou)22 +2385 y(new)47 b(revision:)e(1.3;)i(previous)e(revision:)h(1.2)240 +2489 y(done)240 2593 y($)0 3238 y Fm(6.8)68 b(Magic)31 +b(branc)l(h)f(n)l(um)l(b)t(ers)125 3534 y Fs(This)j(section)i(describ)s +(es)f(a)h Fr(cvs)f Fs(feature)i(called)e Fo(magic)i(branc)m(hes)p +Fs(.)54 b(F)-8 b(or)36 b(most)g(purp)s(oses,)e(y)m(ou)i(need)f(not)0 +3658 y(w)m(orry)26 b(ab)s(out)g(magic)g(branc)m(hes;)i +Fr(cvs)d Fs(handles)f(them)i(for)g(y)m(ou.)40 b(Ho)m(w)m(ev)m(er,)29 +b(they)e(are)f(visible)e(to)j(y)m(ou)f(in)f(certain)0 +3783 y(circumstances,)30 b(so)h(it)f(ma)m(y)h(b)s(e)f(useful)e(to)j(ha) +m(v)m(e)h(some)f(idea)f(of)g(ho)m(w)g(it)g(w)m(orks.)125 +4079 y(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(decimal)e +(in)m(tegers.)61 b(See)0 4203 y(Section)40 b(6.1)i([Revision)e(n)m(um)m +(b)s(ers],)i(page)f(47.)73 b(That)40 b(is)g(not)h(the)g(whole)f(truth,) +i(ho)m(w)m(ev)m(er.)73 b(F)-8 b(or)42 b(e\016ciency)0 +4328 y(reasons)32 b Fr(cvs)f Fs(sometimes)h(inserts)e(an)i(extra)h(0)f +(in)e(the)i(second)g(righ)m(tmost)g(p)s(osition)e(\(1.2.3)k(b)s(ecomes) +e(1.2.0.3,)0 4452 y(8.9.10.11.12)j(b)s(ecomes)c(8.9.10.11.0.12)k(and)30 +b(so)h(on\).)125 4748 y Fr(cvs)j Fs(do)s(es)i(a)g(prett)m(y)h(go)s(o)s +(d)f(job)f(at)i(hiding)c(these)k(so)f(called)f(magic)h(branc)m(hes,)h +(but)e(in)g(a)h(few)g(places)g(the)0 4873 y(hiding)28 +b(is)h(incomplete:)75 5169 y Fq(\017)60 b Fs(The)30 b(magic)g(branc)m +(h)g(n)m(um)m(b)s(er)f(app)s(ears)h(in)f(the)i(output)f(from)f +Fn(cvs)h(log)p Fs(.)75 5340 y Fq(\017)60 b Fs(Y)-8 b(ou)31 +b(cannot)g(sp)s(ecify)e(a)i(sym)m(b)s(olic)d(branc)m(h)i(name)h(to)g +Fn(cvs)e(admin)p Fs(.)p eop +%%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)125 366 y(Y)-8 b(ou)24 b(can)g(use)g(the)g +Fn(admin)e Fs(command)i(to)g(reassign)g(a)g(sym)m(b)s(olic)e(name)i(to) +h(a)f(branc)m(h)f(the)h(w)m(a)m(y)h Fr(r)n(cs)e Fs(exp)s(ects)h(it)0 +491 y(to)e(b)s(e.)37 b(If)20 b Fn(R4patches)f Fs(is)h(assigned)g(to)i +(the)f(branc)m(h)g(1.4.2)h(\(magic)g(branc)m(h)e(n)m(um)m(b)s(er)g +(1.4.0.2\))k(in)c(\014le)g(`)p Fn(numbers.c)p Fs(')0 +616 y(y)m(ou)31 b(can)f(do)h(this:)240 869 y Fn($)47 +b(cvs)g(admin)g(-NR4patches:1.4.2)c(numbers.c)125 1143 +y Fs(It)25 b(only)g(w)m(orks)g(if)f(at)j(least)e(one)h(revision)e(is)g +(already)h(committed)h(on)f(the)h(branc)m(h.)38 b(Be)26 +b(v)m(ery)g(careful)f(so)g(that)0 1267 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 1392 y(y)m(esterda)m(y\).)p eop +%%Page: 57 59 +57 58 bop 0 -116 a Fs(Chapter)30 b(7:)41 b(Merging)3018 +b(57)0 366 y Fp(7)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 @@ -4858,10 +5168,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(5.3)i([Con\015icts)d(example],)i(page)g(35.)p +b(See)31 b(Section)f(5.3)i([Con\015icts)d(example],)i(page)g(37.)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)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 @@ -4907,9 +5217,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: 57 59 -57 58 bop 0 -116 a Fs(Chapter)30 b(7:)41 b(Merging)3018 -b(57)240 366 y Fn(cvs)47 b(update)f(-j)h(1.2.2.2)f(-j)h(R1fix)g(m.c)190 +%%Page: 59 61 +59 60 bop 0 -116 a Fs(Chapter)30 b(7:)41 b(Merging)3018 +b(59)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 @@ -4948,16 +5258,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: 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 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: 59 61 -59 60 bop 0 -116 a Fs(Chapter)30 b(8:)41 b(Recursiv)m(e)30 -b(b)s(eha)m(vior)2591 b(59)0 366 y Fp(8)80 b(Recursiv)l(e)30 +%%Page: 61 63 +61 62 bop 0 -116 a Fs(Chapter)30 b(8:)41 b(Recursiv)m(e)30 +b(b)s(eha)m(vior)2591 b(61)0 366 y Fp(8)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 @@ -4993,12 +5303,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: 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)p eop -%%Page: 61 63 -61 62 bop 0 -116 a Fs(Chapter)30 b(9:)41 b(Adding)29 -b(\014les)g(to)i(a)g(directory)2297 b(61)0 366 y Fp(9)80 +%%Page: 63 65 +63 64 bop 0 -116 a Fs(Chapter)30 b(9:)41 b(Adding)29 +b(\014les)g(to)i(a)g(directory)2297 b(63)0 366 y Fp(9)80 b(Adding)30 b(\014les)g(to)g(a)h(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 @@ -5011,7 +5321,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(17)h([Binary)f(\014les],)g(page)h(83\).)75 +(Chapter)f(17)h([Binary)f(\014les],)g(page)h(85\).)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 @@ -5035,7 +5345,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(112.)240 3914 y(The)h(added)g(\014les)g(are)i +([imp)s(ort],)f(page)h(114.)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 @@ -5043,24 +5353,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(10)j([Remo)m(ving)e -(\014les],)g(page)h(63,)h(for)e(an)g(example.)240 4565 +(\014les],)g(page)h(65,)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(16.4)i -([Substitution)c(mo)s(des],)i(page)h(81.)240 4966 y(The)41 +([Substitution)c(mo)s(des],)i(page)h(83.)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(149\).)60 b(It)36 +(C.10)h([history)e(\014le],)i(page)g(151\).)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: 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)240 366 y(See)c(Section)h(A.5)g([admin],)f -(page)h(97.)40 b(If)26 b(y)m(ou)g(omit)g(the)h(`)p Fn(-m)j +(page)h(99.)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 @@ -5071,13 +5381,13 @@ y Fn($)47 b(cvs)g(add)g(backend.c)240 1172 y($)g(cvs)g(commit)f(-m)i 1446 y Fs(When)33 b(y)m(ou)i(add)e(a)i(\014le)e(it)h(is)f(added)g(only) h(on)g(the)g(branc)m(h)g(whic)m(h)e(y)m(ou)j(are)f(w)m(orking)g(on)g (\(see)h(Chapter)f(6)0 1570 y([Revisions)h(and)h(branc)m(hes],)j(page)e -(45\).)61 b(Y)-8 b(ou)37 b(can)g(later)f(merge)h(the)g(additions)e(to)i +(47\).)61 b(Y)-8 b(ou)37 b(can)g(later)f(merge)h(the)g(additions)e(to)i (another)g(branc)m(h)f(if)g(y)m(ou)0 1695 y(w)m(an)m(t)31 b(\(see)h(Section)e(7.4)h([Merging)g(adds)e(and)h(remo)m(v)-5 -b(als],)31 b(page)g(57\).)p eop -%%Page: 63 65 -63 64 bop 0 -116 a Fs(Chapter)30 b(10:)41 b(Remo)m(ving)31 -b(\014les)2720 b(63)0 366 y Fp(10)80 b(Remo)l(ving)29 +b(als],)31 b(page)g(59\).)p eop +%%Page: 65 67 +65 66 bop 0 -116 a Fs(Chapter)30 b(10:)41 b(Remo)m(ving)31 +b(\014les)2720 b(65)0 366 y Fp(10)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 @@ -5134,8 +5444,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: 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(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 @@ -5153,14 +5463,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)21 b(y)m(ou)i(remo)m(v)m(e)h(a)e (\014le)f(it)h(is)f(remo)m(v)m(ed)i(only)f(on)g(the)g(branc)m(h)g(whic) m(h)e(y)m(ou)j(are)f(w)m(orking)g(on)g(\(see)h(Chapter)f(6)0 -2936 y([Revisions)36 b(and)i(branc)m(hes],)h(page)g(45\).)64 +2936 y([Revisions)36 b(and)i(branc)m(hes],)h(page)g(47\).)64 b(Y)-8 b(ou)38 b(can)g(later)g(merge)g(the)g(remo)m(v)-5 b(als)38 b(to)h(another)f(branc)m(h)f(if)g(y)m(ou)0 3061 y(w)m(an)m(t)31 b(\(see)h(Section)e(7.4)h([Merging)g(adds)e(and)h(remo) -m(v)-5 b(als],)31 b(page)g(57\).)p eop -%%Page: 65 67 -65 66 bop 0 -116 a Fs(Chapter)30 b(11:)41 b(Remo)m(ving)31 -b(directories)2462 b(65)0 366 y Fp(11)80 b(Remo)l(ving)29 +m(v)-5 b(als],)31 b(page)g(59\).)p eop +%%Page: 67 69 +67 68 bop 0 -116 a Fs(Chapter)30 b(11:)41 b(Remo)m(ving)31 +b(directories)2462 b(67)0 366 y Fp(11)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 @@ -5187,12 +5497,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: 66 68 -66 67 bop 0 -116 a Fs(66)2411 b(CVS|Concurren)m(t)29 +%%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(12:)41 b(T)-8 b(rac)m(king)31 -b(third-part)m(y)e(sources)2168 b(67)0 366 y Fp(12)80 +%%Page: 69 71 +69 70 bop 0 -116 a Fs(Chapter)30 b(12:)41 b(T)-8 b(rac)m(king)31 +b(third-part)m(y)e(sources)2168 b(69)0 366 y Fp(12)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 @@ -5228,7 +5538,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(113.\).)50 +3683 y(Section)j(A.11.1)h([imp)s(ort)e(options],)h(page)g(115.\).)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 @@ -5250,8 +5560,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: 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)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 @@ -5282,7 +5592,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(5.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 @@ -5302,68 +5612,66 @@ 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: 69 71 -69 70 bop 0 -116 a Fs(Chapter)30 b(12:)41 b(T)-8 b(rac)m(king)31 -b(third-part)m(y)e(sources)2168 b(69)240 366 y Fn($)47 +%%Page: 71 73 +71 72 bop 0 -116 a Fs(Chapter)30 b(12:)41 b(T)-8 b(rac)m(king)31 +b(third-part)m(y)e(sources)2168 b(71)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(97.)0 1317 y Fm(12.4)68 b(Ho)l(w)31 b(to)g(handle)g +869 y(page)31 b(99.)0 1317 y Fm(12.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(139.)p eop -%%Page: 70 72 -70 71 bop 0 -116 a Fs(70)2411 b(CVS|Concurren)m(t)29 +y(page)31 b(141.)p eop +%%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(13:)41 b(Mo)m(ving)31 -b(and)f(renaming)f(\014les)2244 b(71)0 366 y Fp(13)80 +%%Page: 73 75 +73 74 bop 0 -116 a Fs(Chapter)30 b(13:)41 b(Mo)m(ving)31 +b(and)f(renaming)f(\014les)2244 b(73)0 366 y Fp(13)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(14)h([Mo)m(ving)g -(directories],)f(page)h(75.\).)125 1266 y(The)e(examples)h(b)s(elo)m(w) +(directories],)f(page)h(77.\).)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(13.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 (\014le)f(is)g(to)h(cop)m(y)g Fo(old)j Fs(to)d Fo(new)p Fs(,)g(and)f(then)g(issue)f(the)i(normal)f Fr(cvs)f Fs(commands)0 -2119 y(to)35 b(remo)m(v)m(e)h Fo(old)h Fs(from)c(the)i(rep)s(ository)-8 -b(,)34 b(and)g(add)g Fo(new)41 b Fs(to)35 b(it.)52 b(\(Both)35 -b Fo(old)i Fs(and)d Fo(new)41 b Fs(could)33 b(con)m(tain)i(relativ)m(e) -0 2243 y(paths,)30 b(for)g(example)g(`)p Fn(foo/bar.c)p -Fs('\).)240 2497 y Fn($)47 b(mv)h Fo(old)i(new)240 2601 -y Fn($)d(cvs)g(remove)f Fo(old)240 2705 y Fn($)h(cvs)g(add)g -Fo(new)240 2808 y Fn($)g(cvs)g(commit)f(-m)i("Renamed)d -Fo(old)51 b Fn(to)c Fo(new)8 b Fn(")47 b Fo(old)j(new)125 -3083 y Fs(This)24 b(is)h(the)h(simplest)f(w)m(a)m(y)i(to)g(mo)m(v)m(e)g -(a)g(\014le,)f(it)g(is)f(not)h(error-prone,)h(and)e(it)h(preserv)m(es)g -(the)h(history)e(of)h(what)0 3207 y(w)m(as)36 b(done.)56 -b(Note)37 b(that)f(to)g(access)h(the)f(history)e(of)i(the)g(\014le)e(y) -m(ou)i(m)m(ust)g(sp)s(ecify)e(the)i(old)e(or)i(the)g(new)f(name,)0 -3332 y(dep)s(ending)f(on)i(what)h(p)s(ortion)e(of)h(the)h(history)e(y)m -(ou)i(are)g(accessing.)59 b(F)-8 b(or)38 b(example,)g -Fn(cvs)29 b(log)g Fo(old)40 b Fs(will)33 b(giv)m(e)0 -3457 y(the)e(log)f(up)f(un)m(til)g(the)i(time)f(of)g(the)h(rename.)125 -3731 y(When)e Fo(new)36 b Fs(is)29 b(committed)g(its)g(revision)e(n)m -(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(104\))0 4309 y Fm(13.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 -4708 y(en)m(tire)c(section)h(b)s(efore)f(trying)f(it)h(out!)240 -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: 72 74 -72 73 bop 0 -116 a Fs(72)2411 b(CVS|Concurren)m(t)29 +2119 y(to)k(remo)m(v)m(e)h Fo(old)h Fs(from)d(the)h(rep)s(ository)-8 +b(,)30 b(and)f(add)h Fo(new)38 b Fs(to)31 b(it.)240 2373 +y Fn($)47 b(mv)h Fo(old)i(new)240 2476 y Fn($)d(cvs)g(remove)f +Fo(old)240 2580 y Fn($)h(cvs)g(add)g Fo(new)240 2684 +y Fn($)g(cvs)g(commit)f(-m)i("Renamed)d Fo(old)51 b Fn(to)c +Fo(new)8 b Fn(")47 b Fo(old)j(new)125 2958 y Fs(This)24 +b(is)h(the)h(simplest)f(w)m(a)m(y)i(to)g(mo)m(v)m(e)g(a)g(\014le,)f(it) +g(is)f(not)h(error-prone,)h(and)e(it)h(preserv)m(es)g(the)h(history)e +(of)h(what)0 3083 y(w)m(as)36 b(done.)56 b(Note)37 b(that)f(to)g +(access)h(the)f(history)e(of)i(the)g(\014le)e(y)m(ou)i(m)m(ust)g(sp)s +(ecify)e(the)i(old)e(or)i(the)g(new)f(name,)0 3207 y(dep)s(ending)f(on) +i(what)h(p)s(ortion)e(of)h(the)h(history)e(y)m(ou)i(are)g(accessing.)59 +b(F)-8 b(or)38 b(example,)g Fn(cvs)29 b(log)g Fo(old)40 +b Fs(will)33 b(giv)m(e)0 3332 y(the)e(log)f(up)f(un)m(til)g(the)i(time) +f(of)g(the)h(rename.)125 3607 y(When)f Fo(new)37 b Fs(is)30 +b(committed)g(its)g(revision)f(n)m(um)m(b)s(ers)g(will)e(start)k +(again,)g(usually)d(at)j(1.1,)h(so)e(if)g(that)h(b)s(others)0 +3731 y(y)m(ou,)d(use)f(the)g(`)p Fn(-r)j(rev)p Fs(')d(option)f(to)i +(commit.)40 b(F)-8 b(or)27 b(more)h(information)d(see)j(Section)f(6.3)h +([Assigning)d(revisions],)0 3856 y(page)31 b(49.)0 4309 +y Fm(13.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 4708 y(en)m(tire)c(section)h(b)s(efore)f +(trying)f(it)h(out!)240 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: 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)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) @@ -5407,29 +5715,25 @@ 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: 73 75 -73 74 bop 0 -116 a Fs(Chapter)30 b(13:)41 b(Mo)m(ving)31 -b(and)f(renaming)f(\014les)2244 b(73)0 366 y(Disadv)-5 +%%Page: 75 77 +75 76 bop 0 -116 a Fs(Chapter)30 b(13:)41 b(Mo)m(ving)31 +b(and)f(renaming)f(\014les)2244 b(75)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(104\))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: 74 76 -74 75 bop 0 -116 a Fs(74)2411 b(CVS|Concurren)m(t)29 +(see)i(the)g(history)e(of)i(the)f(\014le)g(across)h(the)f(rename.)p +eop +%%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)p eop -%%Page: 75 77 -75 76 bop 0 -116 a Fs(Chapter)30 b(14:)41 b(Mo)m(ving)31 -b(and)f(renaming)f(directories)1986 b(75)0 366 y Fp(14)80 +%%Page: 77 79 +77 78 bop 0 -116 a Fs(Chapter)30 b(14:)41 b(Mo)m(ving)31 +b(and)f(renaming)f(directories)1986 b(77)0 366 y Fp(14)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(13.1)i -([Outside],)e(page)h(71.)44 b(Then)30 b(c)m(hec)m(k)j(out)f(with)e(the) +([Outside],)e(page)h(73.)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(11)h([Remo)m(ving)g(directories],)f(page)h(65.)125 +989 y(Chapter)h(11)h([Remo)m(ving)g(directories],)f(page)h(67.)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 @@ -5457,12 +5761,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: 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)p eop -%%Page: 77 79 -77 78 bop 0 -116 a Fs(Chapter)30 b(15:)41 b(History)30 -b(bro)m(wsing)2622 b(77)0 366 y Fp(15)80 b(History)31 +%%Page: 79 81 +79 80 bop 0 -116 a Fs(Chapter)30 b(15:)41 b(History)30 +b(bro)m(wsing)2622 b(79)0 366 y Fp(15)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 @@ -5474,14 +5778,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(114\).)0 2445 y Fm(15.2)68 +(Section)f(A.12)i([log],)f(page)g(116\).)0 2445 y Fm(15.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(149\))h(to)f(log)f(v)-5 +([history)f(\014le],)g(page)h(151\))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(110\).)0 3421 y Fm(15.3)68 +2969 y([history],)g(page)h(112\).)0 3421 y Fm(15.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 @@ -5494,7 +5798,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 -(145\).)59 b(T)-8 b(o)36 b(log)g(commits,)h(c)m(hec)m(k)m(outs,)j(exp)s +(147\).)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 @@ -5504,21 +5808,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(5.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(137\),)h(where)d +([Administrativ)m(e)0 5215 y(\014les],)35 b(page)h(139\),)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: 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 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 @@ -5546,16 +5850,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(106\).)125 3276 y(The)i(options)h(to) +2953 y([di\013)7 b(],)30 b(page)h(108\).)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(127,)h(and)e(can)h(b)s(e)0 +(v)m(oking)h(CVS],)f(page)h(129,)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 -(94.)p eop -%%Page: 79 81 -79 80 bop 0 -116 a Fs(Chapter)30 b(16:)41 b(Keyw)m(ord)30 -b(substitution)2437 b(79)0 366 y Fp(16)80 b(Keyw)l(ord)29 +(96.)p eop +%%Page: 81 83 +81 82 bop 0 -116 a Fs(Chapter)30 b(16:)41 b(Keyw)m(ord)30 +b(substitution)2437 b(81)0 366 y Fp(16)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 @@ -5578,16 +5882,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/03/29 04:45:27 $)192 b Fs(The)30 +(in)c(the)h(revision.)0 2743 y Fn($Date: 1997/04/21 04:33:40 $)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: /home/cvs/src/gnu/usr.bin/cvs/doc/cvs.ps,v 1.1.1.8 1997/03/29 04:45:27 tholo Exp $)96 b Fs(A)33 b(standard)g(header)g(con)m +(ed)h(in.)0 2918 y Fn($Header: /home/cvs/src/gnu/usr.bin/cvs/doc/cvs.ps,v 1.1.1.9 1997/04/21 04:33:40 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.8 1997/03/29 04:45:27 tholo Exp $)288 b -Fs(Same)30 b(as)h Fn($Header: /home/cvs/src/gnu/usr.bin/cvs/doc/cvs.ps,v 1.1.1.8 1997/03/29 04:45:27 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.9 1997/04/21 04:33:40 tholo Exp $)288 b +Fs(Same)30 b(as)h Fn($Header: /home/cvs/src/gnu/usr.bin/cvs/doc/cvs.ps,v 1.1.1.9 1997/04/21 04:33:40 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 @@ -5595,8 +5899,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.8 1997/03/29 04:45:27 tholo -(using)e Fr(cvs)p Fs(\).)0 3993 y Fn(Latest release from Cyclic Software +(using)e Fr(cvs)p Fs(\).)0 3993 y Fn(Revision 1.1.1.9 1997/04/21 04:33:40 tholo +(using)e Fr(cvs)p Fs(\).)0 3993 y Fn(Missing files from 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 @@ -5609,29 +5913,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(97.)480 4616 y(This)28 b(k)m(eyw)m(ord)i(is)f +(options],)j(page)f(99.)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(16.5)i([Log)f(k)m -(eyw)m(ord],)g(page)h(82.)0 4916 y Fn($RCSfile: cvs.ps,v $)480 5040 +(eyw)m(ord],)g(page)h(84.)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.8 $)480 5340 y Fs(The)f(revision)e(n)m(um)m(b)s(er)i +5215 y Fn($Revision: 1.1.1.9 $)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: 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)0 366 y Fn($Source: /home/cvs/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(97.)0 1124 y Fm(16.2)68 b(Using)31 +(options],)h(page)h(99.)0 1124 y Fm(16.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.8 1997/03/29 04:45:27 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.9 1997/04/21 04:33:40 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.8 1997/03/29 04:45:27 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.9 1997/04/21 04:33:40 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 @@ -5657,7 +5961,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.8 1997/03/29 04:45:27 tholo Exp $)240 +y($Id: cvs.ps,v 1.1.1.9 1997/04/21 04:33:40 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 @@ -5671,10 +5975,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: 81 83 -81 82 bop 0 -116 a Fs(Chapter)30 b(16:)41 b(Keyw)m(ord)30 -b(substitution)2437 b(81)240 366 y Fn(static)46 b(char)h(*id="@\(#\))e -($Id: cvs.ps,v 1.1.1.8 1997/03/29 04:45:27 tholo Exp $";)0 +%%Page: 83 85 +83 84 bop 0 -116 a Fs(Chapter)30 b(16:)41 b(Keyw)m(ord)30 +b(substitution)2437 b(83)240 366 y Fn(static)46 b(char)h(*id="@\(#\))e +($Id: cvs.ps,v 1.1.1.9 1997/04/21 04:33:40 tholo Exp $";)0 786 y Fm(16.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) @@ -5686,7 +5990,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(16.4)g([Substitution)d(mo)s(des],)j -(page)g(81\))g(to)g(turn)f(o\013)h(k)m(eyw)m(ord)f(substitution)e(en)m +(page)g(83\))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 @@ -5706,7 +6010,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(17)j([Binary)d(\014les],)h(page)h(83.)125 +b(examples,)f(See)h(Chapter)e(17)j([Binary)d(\014les],)h(page)h(85.)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 @@ -5720,8 +6024,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.8 $)f Fs(instead)h(of)i -Fn($Revision: 1.1.1.8 $)p Fs(.)480 4806 y(This)c(option)g(is)h(useful)e +(generate)h(the)f(string)e Fn($Revision: 1.1.1.9 $)f Fs(instead)h(of)i +Fn($Revision: 1.1.1.9 $)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 @@ -5729,12 +6033,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.8 $)c Fs(instead)480 5340 y(of)31 -b Fn($Revision: 1.1.1.8 $)g Fs(if)f(that)i(is)e(ho)m(w)i(the)f(string)g +Fn($Revision: 1.1.1.9 $)c Fs(instead)480 5340 y(of)31 +b Fn($Revision: 1.1.1.9 $)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: 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)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 @@ -5745,12 +6049,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(17)h([Binary)f(\014les],)g(page)h(83.)0 +865 y(Chapter)f(17)h([Binary)f(\014les],)g(page)h(85.)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.8 $)p Fs(.)38 +Fs(instead)h(of)g Fn($Revision: 1.1.1.9 $)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 @@ -5760,23 +6064,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(108.)480 1811 +b(Section)i(A.9)h([exp)s(ort],)h(page)e(110.)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(16.5)68 b(Problems)31 b(with)g(the)g($Log: cvs.ps,v $ -b(.)0 2259 y Fm(16.5)68 b(Problems)31 b(with)g(the)g(Revision 1.1.1.8 1997/03/29 04:45:27 tholo -b(.)0 2259 y Fm(16.5)68 b(Problems)31 b(with)g(the)g(Latest release from Cyclic Software +b(.)0 2259 y Fm(16.5)68 b(Problems)31 b(with)g(the)g(Revision 1.1.1.9 1997/04/21 04:33:40 tholo +b(.)0 2259 y Fm(16.5)68 b(Problems)31 b(with)g(the)g(Missing files from import b(.)0 2259 y Fm(16.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.8 1997/03/29 04:45:27 tholo -(ord.)125 2533 y Fs(The)25 b Fn(Latest release from Cyclic Software +(ord.)125 2533 y Fs(The)25 b Fn(Revision 1.1.1.9 1997/04/21 04:33:40 tholo +(ord.)125 2533 y Fs(The)25 b Fn(Missing files from 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.8 1997/03/29 04:45:27 tholo -(en)h(if)e(y)m(ou)i(do)f(not)g(use)g(the)h Fn(Latest 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.9 1997/04/21 04:33:40 tholo +(en)h(if)e(y)m(ou)i(do)f(not)g(use)g(the)h Fn(Missing files from 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 @@ -5784,8 +6088,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.8 1997/03/29 04:45:27 tholo -b Fn(Latest release from Cyclic Software +b Fn(Revision 1.1.1.9 1997/04/21 04:33:40 tholo +b Fn(Missing files from 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 @@ -5798,17 +6102,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.8 1997/03/29 04:45:27 tholo -i(that)f(the)g Fn(Latest release from Cyclic Software +i(that)f(the)g Fn(Revision 1.1.1.9 1997/04/21 04:33:40 tholo +i(that)f(the)g Fn(Missing files from 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: 83 85 -83 84 bop 0 -116 a Fs(Chapter)30 b(17:)41 b(Handling)29 -b(binary)f(\014les)2469 b(83)0 366 y Fp(17)80 b(Handling)31 +%%Page: 85 87 +85 86 bop 0 -116 a Fs(Chapter)30 b(17:)41 b(Handling)29 +b(binary)f(\014les)2469 b(85)0 366 y Fp(17)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) @@ -5820,7 +6124,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(16)h([Keyw)m(ord)f(substitution],)f(page)i(79\),)h(so) +1639 y(Chapter)d(16)h([Keyw)m(ord)f(substitution],)f(page)i(81\),)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) @@ -5835,13 +6139,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.8 1997/03/29 04:45:27 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.9 1997/04/21 04:33:40 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.8 1997/03/29 04:45:27 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.9 1997/04/21 04:33:40 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 @@ -5864,8 +6168,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: 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)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 @@ -5883,11 +6187,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(139.)p eop -%%Page: 85 87 -85 86 bop 0 -116 a Fs(Chapter)30 b(18:)41 b(Ho)m(w)31 +1388 y([W)-8 b(rapp)s(ers],)30 b(page)i(141.)p eop +%%Page: 87 89 +87 88 bop 0 -116 a Fs(Chapter)30 b(18:)41 b(Ho)m(w)31 b(y)m(our)g(build)c(system)k(in)m(teracts)g(with)e(CVS)1586 -b(85)0 366 y Fp(18)80 b(Ho)l(w)29 b(y)l(our)h(build)h(system)d(in)l +b(87)0 366 y Fp(18)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 @@ -5927,7 +6231,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(6.4)g -([T)-8 b(ags],)32 b(page)f(47\).)125 3305 y(Using)f Fr(cvs)f +([T)-8 b(ags],)32 b(page)f(49\).)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 @@ -5954,17 +6258,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: 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(Chapter)30 b(19:)41 b(Compatibilit)m(y)28 -b(b)s(et)m(w)m(een)j(CVS)f(V)-8 b(ersions)1822 b(87)0 +%%Page: 89 91 +89 90 bop 0 -116 a Fs(Chapter)30 b(19:)41 b(Compatibilit)m(y)28 +b(b)s(et)m(w)m(een)j(CVS)f(V)-8 b(ersions)1822 b(89)0 366 y Fp(19)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(5.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) @@ -5985,12 +6289,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: 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)p eop -%%Page: 89 91 -89 90 bop 0 -116 a Fs(Chapter)30 b(20:)41 b(Revision)29 -b(managemen)m(t)2430 b(89)0 366 y Fp(20)80 b(Revision)31 +%%Page: 91 93 +91 92 bop 0 -116 a Fs(Chapter)30 b(20:)41 b(Revision)29 +b(managemen)m(t)2430 b(91)0 366 y Fp(20)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 @@ -6021,25 +6325,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(141\),)i(but)c(y)m +y(\(see)27 b(Section)f(C.4)h([commitinfo],)g(page)g(143\),)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: 90 92 -90 91 bop 0 -116 a Fs(90)2411 b(CVS|Concurren)m(t)29 +%%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)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)0 366 y Fp(App)t(endix)30 b(A)81 +%%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)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(127\).)0 +(endix)d(B)0 987 y([In)m(v)m(oking)h(CVS],)h(page)g(129\).)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 @@ -6077,8 +6381,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: 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)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 @@ -6119,88 +6423,90 @@ 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(93\).)42 +(Section)g(A.3)g([Global)0 4675 y(options],)30 b(page)h(95\).)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: 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)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 +%%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 Fm(A.3)67 b(Global)31 b(options)125 +640 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 +Fn(cvs_command)p Fs('\))d(are:)0 954 y Fn(-b)i Fo(bindir)113 b Fs(Use)41 b Fo(bindir)i Fs(as)d(the)g(directory)g(where)g Fr(r)n(cs)f Fs(programs)h(are)g(lo)s(cated.)71 b(Ov)m(errides)38 -b(the)j(setting)480 1092 y(of)34 b(the)h Fn($RCSBIN)d +b(the)j(setting)480 1079 y(of)34 b(the)h Fn($RCSBIN)d Fs(en)m(vironmen)m(t)i(v)-5 b(ariable)33 b(and)g(an)m(y)i(precompiled)d -(directory)-8 b(.)52 b(This)32 b(parameter)480 1216 y(should)c(b)s(e)i -(sp)s(eci\014ed)f(as)h(an)h(absolute)f(pathname.)0 1392 -y Fn(-T)g Fo(temp)s(dir)480 1516 y Fs(Use)h Fo(temp)s(dir)36 +(directory)-8 b(.)52 b(This)32 b(parameter)480 1204 y(should)c(b)s(e)i +(sp)s(eci\014ed)f(as)h(an)h(absolute)f(pathname.)0 1368 +y Fn(-T)g Fo(temp)s(dir)480 1493 y Fs(Use)h Fo(temp)s(dir)36 b Fs(as)31 b(the)g(directory)g(where)g(temp)s(orary)f(\014les)g(are)i (lo)s(cated.)43 b(Ov)m(errides)30 b(the)h(setting)480 -1641 y(of)j(the)h Fn($TMPDIR)d Fs(en)m(vironmen)m(t)i(v)-5 +1617 y(of)j(the)h Fn($TMPDIR)d Fs(en)m(vironmen)m(t)i(v)-5 b(ariable)33 b(and)g(an)m(y)i(precompiled)d(directory)-8 -b(.)52 b(This)32 b(parameter)480 1766 y(should)c(b)s(e)i(sp)s -(eci\014ed)f(as)h(an)h(absolute)f(pathname.)0 1941 y -Fn(-d)g Fo(cvs_ro)s(ot_directory)480 2066 y Fs(Use)e -Fo(cvs)p 781 2066 28 4 v 33 w(ro)s(ot)p 978 2066 V 33 +b(.)52 b(This)32 b(parameter)480 1742 y(should)c(b)s(e)i(sp)s +(eci\014ed)f(as)h(an)h(absolute)f(pathname.)0 1906 y +Fn(-d)g Fo(cvs_ro)s(ot_directory)480 2031 y Fs(Use)e +Fo(cvs)p 781 2031 28 4 v 33 w(ro)s(ot)p 978 2031 V 33 w(directory)34 b Fs(as)28 b(the)f(ro)s(ot)h(directory)f(pathname)g(of)g (the)h(rep)s(ository)-8 b(.)39 b(Ov)m(errides)26 b(the)480 -2190 y(setting)k(of)h(the)g Fn($CVSROOT)d Fs(en)m(vironmen)m(t)i(v)-5 +2155 y(setting)k(of)h(the)g Fn($CVSROOT)d Fs(en)m(vironmen)m(t)i(v)-5 b(ariable.)39 b(See)31 b(Chapter)f(3)g([Rep)s(ository],)h(page)g(13.)0 -2366 y Fn(-e)f Fo(editor)121 b Fs(Use)32 b Fo(editor)38 +2320 y Fn(-e)f Fo(editor)121 b Fs(Use)32 b Fo(editor)38 b Fs(to)33 b(en)m(ter)f(revision)e(log)i(information.)44 b(Ov)m(errides)31 b(the)h(setting)g(of)g(the)g Fn($CVSEDITOR)480 -2491 y Fs(and)e Fn($EDITOR)e Fs(en)m(vironmen)m(t)i(v)-5 -b(ariables.)0 2666 y Fn(-f)384 b Fs(Do)37 b(not)f(read)g(the)g(`)p +2444 y Fs(and)21 b Fn($EDITOR)e Fs(en)m(vironmen)m(t)i(v)-5 +b(ariables.)37 b(F)-8 b(or)22 b(more)f(information,)h(see)g(Section)f +(2.2)i([Committing)480 2569 y(y)m(our)30 b(c)m(hanges],)i(page)f(9.)0 +2734 y Fn(-f)384 b Fs(Do)37 b(not)f(read)g(the)g(`)p Fn(~/.cvsrc)p Fs(')e(\014le.)57 b(This)34 b(option)h(is)g(most)i(often) -f(used)f(b)s(ecause)h(of)g(the)g(non-)480 2791 y(orthogonalit)m(y)f(of) +f(used)f(b)s(ecause)h(of)g(the)g(non-)480 2858 y(orthogonalit)m(y)f(of) g(the)g Fr(cvs)e Fs(option)h(set.)54 b(F)-8 b(or)35 b(example,)h(the)f (`)p Fn(cvs)29 b(log)p Fs(')34 b(option)g(`)p Fn(-N)p -Fs(')h(\(turn)f(o\013)480 2916 y(displa)m(y)27 b(of)j(tag)g(names\))f +Fs(')h(\(turn)f(o\013)480 2983 y(displa)m(y)27 b(of)j(tag)g(names\))f (do)s(es)g(not)h(ha)m(v)m(e)g(a)g(corresp)s(onding)d(option)h(to)i -(turn)e(the)h(displa)m(y)f(on.)40 b(So)480 3040 y(if)26 +(turn)e(the)h(displa)m(y)f(on.)40 b(So)480 3107 y(if)26 b(y)m(ou)h(ha)m(v)m(e)i(`)p Fn(-N)p Fs(')d(in)g(the)h(`)p Fn(~/.cvsrc)p Fs(')f(en)m(try)h(for)g(`)p Fn(log)p Fs(',)g(y)m(ou)g(ma) m(y)h(need)f(to)h(use)e(`)p Fn(-f)p Fs(')h(to)h(sho)m(w)f(the)480 -3165 y(tag)32 b(names.)0 3340 y Fn(-H)0 3465 y(--help)192 +3232 y(tag)32 b(names.)0 3396 y Fn(-H)0 3521 y(--help)192 b Fs(Displa)m(y)30 b(usage)i(information)d(ab)s(out)i(the)h(sp)s (eci\014ed)d(`)p Fn(cvs_command)p Fs(')f(\(but)j(do)g(not)h(actually)e -(ex-)480 3589 y(ecute)j(the)g(command\).)47 b(If)32 b(y)m(ou)g(don't)h +(ex-)480 3645 y(ecute)j(the)g(command\).)47 b(If)32 b(y)m(ou)g(don't)h (sp)s(ecify)e(a)h(command)g(name,)i(`)p Fn(cvs)29 b(-H)p -Fs(')j(displa)m(ys)f(o)m(v)m(erall)480 3714 y(help)e(for)h +Fs(')j(displa)m(ys)f(o)m(v)m(erall)480 3770 y(help)e(for)h 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(110,)h(for)e(information)f -(on)h(command)g(history)-8 b(.)0 4190 y Fn(-n)384 b Fs(Do)42 +3934 y Fn(-l)384 b Fs(Do)39 b(not)e(log)h(the)g(cvs)p +1248 3934 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 4059 +y(Section)30 b(A.10)i([history],)e(page)h(112,)h(for)e(information)f +(on)h(command)g(history)-8 b(.)0 4224 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 -(issue)480 4315 y(rep)s(orts;)30 b(do)g(not)h(remo)m(v)m(e,)h(up)s +(issue)480 4348 y(rep)s(orts;)30 b(do)g(not)h(remo)m(v)m(e,)h(up)s (date,)e(or)g(merge)h(an)m(y)g(existing)e(\014les,)h(or)g(create)i(an)m -(y)f(new)e(\014les.)0 4490 y Fn(-Q)384 b Fs(Cause)40 +(y)f(new)e(\014les.)0 4513 y Fn(-Q)384 b Fs(Cause)40 b(the)g(command)f(to)i(b)s(e)e(really)g(quiet;)44 b(the)c(command)g -(will)d(only)i(generate)j(output)d(for)480 4615 y(serious)29 -b(problems.)0 4791 y Fn(-q)384 b Fs(Cause)29 b(the)h(command)g(to)g(b)s +(will)d(only)i(generate)j(output)d(for)480 4637 y(serious)29 +b(problems.)0 4802 y Fn(-q)384 b Fs(Cause)29 b(the)h(command)g(to)g(b)s (e)f(somewhat)h(quiet;)f(informational)f(messages,)j(suc)m(h)e(as)h -(rep)s(orts)f(of)480 4915 y(recursion)g(through)h(sub)s(directories,)e +(rep)s(orts)f(of)480 4926 y(recursion)g(through)h(sub)s(directories,)e (are)i(suppressed.)0 5091 y Fn(-r)384 b Fs(Mak)m(e)40 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(151\).)49 b(The)33 b(default)e(is)h(to)480 5340 +b(page)g(153\).)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(5.6)h([W)-8 b(atc)m(hes],)30 -b(page)c(39\).)p eop -%%Page: 94 96 -94 95 bop 0 -116 a Fs(94)2411 b(CVS|Concurren)m(t)29 +b(page)c(41\).)p eop +%%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)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(150\).)0 662 y Fn(-t)384 b Fs(T)-8 +b(ariables],)30 b(page)h(152\).)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 @@ -6218,8 +6524,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(3.6.4)i([Kerb)s(eros)e(authen) -m(ticated],)50 b(page)c(25\).)86 b(Encryption)44 b(sup-)480 +1968 y(connection)45 b(\(see)h(Section)f(3.7.4)i([Kerb)s(eros)e(authen) +m(ticated],)50 b(page)c(28\).)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 @@ -6258,16 +6564,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 -(6.7)i([Stic)m(ky)e(tags],)i(page)f(52\).)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)480 366 y(`)p Fn(-D)p Fs(')30 b(is)f(a)m(v)-5 +(6.7)i([Stic)m(ky)e(tags],)i(page)f(54\).)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)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(110\).)480 +616 y(Section)30 b(A.10.1)j([history)c(options],)h(page)h(112\).)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 @@ -6319,10 +6625,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 -(104.)0 4717 y Fn(-k)f Fo(k\015ag)165 b Fs(Alter)30 b(the)h(default)e +(106.)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(16)h([Keyw)m(ord)g(substitution],)480 -4842 y(page)36 b(79,)i(for)d(the)h(meaning)f(of)h Fo(k\015ag)p +4842 y(page)36 b(81,)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 @@ -6333,8 +6639,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: 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(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 @@ -6358,7 +6664,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(137\);)480 +(database)i(\(see)g(Section)f(C.1)g([mo)s(dules],)g(page)h(139\);)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 @@ -6367,7 +6673,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(11)h([Remo)m(ving)g -(directories],)f(page)h(65.)0 2942 y Fn(-p)384 b Fs(Pip)s(e)38 +(directories],)f(page)h(67.)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 @@ -6398,10 +6704,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(6.7)i([Stic)m(ky)f(tags],)i(page)e(52\).)51 +4548 y(Section)i(6.7)i([Stic)m(ky)f(tags],)i(page)e(54\).)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(6.4)h([T)-8 -b(ags],)32 b(page)f(47.)480 4820 y(Sp)s(ecifying)23 b(the)j(`)p +b(ags],)32 b(page)f(49.)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 @@ -6410,9 +6716,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: 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)480 366 y(`)p Fn(-r)p Fs(')27 b(is)g(a)m(v)-5 +%%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)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 @@ -6456,25 +6762,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(6.7)h -([Stic)m(ky)f(tags],)k(page)c(52\))i(are)e(a)h(b)s(etter)f(w)m(a)m(y)h +([Stic)m(ky)f(tags],)k(page)c(54\))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(12.3)h([Rev)m(erting)e(lo)s(cal)g(c)m(hanges],)i -(page)f(68\).)0 5215 y Fn(-c)p Fo(string)155 b Fs(Useful)34 +(page)f(70\).)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.8 1997/03/29 04:45:27 tholo -(b)m(y)f(the)g(k)m(eyw)m(ord)g Fn(Latest release from Cyclic Software +(b)m(y)f(the)g(k)m(eyw)m(ord)g Fn(Revision 1.1.1.9 1997/04/21 04:33:40 tholo +(b)m(y)f(the)g(k)m(eyw)m(ord)g Fn(Missing files from import (b)m(y)f(the)g(k)m(eyw)m(ord)g Fn()f Fs(\(see)i(Chapter)e(16)i ([Keyw)m(ord)p eop -%%Page: 98 100 -98 99 bop 0 -116 a Fs(98)2411 b(CVS|Concurren)m(t)29 +%%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)480 366 y(substitution],)35 -b(page)i(79\).)58 b(This)33 b(is)i(useful)f(for)i(programming)e +b(page)i(81\).)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 @@ -6495,7 +6801,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(16)480 1890 y([Keyw)m(ord)39 -b(substitution],)g(page)g(79.)67 b(Giving)38 b(an)g(explicit)f(`)p +b(substitution],)g(page)g(81.)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 @@ -6555,9 +6861,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: 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(-o)p Fo(range)167 b Fs(P)m(oten)m +%%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(-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 @@ -6578,8 +6884,8 @@ Fo(rev)42 b Fs(to)35 b(the)g(end)f(of)h(the)g(branc)m(h)f(con)m (lo)s(c)m(ks.)480 1264 y(Due)38 b(to)g(the)g(w)m(a)m(y)g 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(155,)f(for)g(an)f(explanation.)480 +1389 y(branc)m(h.)j(See)31 b(Section)f(6.8)h([Magic)h(branc)m(h)e(n)m +(um)m(b)s(ers],)f(page)i(55,)h(for)e(an)g(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 @@ -6588,7 +6894,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(7.3)i([Merging)e(t)m(w)m(o)i(revisions],)d(page)i(57\).)0 +(Section)f(7.3)i([Merging)e(t)m(w)m(o)i(revisions],)d(page)i(59\).)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 @@ -6607,12 +6913,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 -(114\),)j(and)c(in)f(the)i(`)p Fn($Log: cvs.ps,v $ -(114\),)j(and)c(in)f(the)i(`)p Fn(Revision 1.1.1.8 1997/03/29 04:45:27 tholo -(114\),)j(and)c(in)f(the)i(`)p Fn(Latest release from Cyclic Software -(114\),)j(and)c(in)f(the)i(`)p Fn()p Fs(')f(and)480 +(116\),)j(and)c(in)f(the)i(`)p Fn($Log: cvs.ps,v $ +(116\),)j(and)c(in)f(the)i(`)p Fn(Revision 1.1.1.9 1997/04/21 04:33:40 tholo +(116\),)j(and)c(in)f(the)i(`)p Fn(Missing files from import +(116\),)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(16)i -([Keyw)m(ord)e(substitution],)f(page)j(79\).)45 b(Note)33 +([Keyw)m(ord)e(substitution],)f(page)j(81\).)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 @@ -6631,7 +6937,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(114\).)0 4364 y Fn(-t-)p Fo(string)107 +4187 y(page)e(116\).)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) @@ -6651,8 +6957,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: 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)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.) @@ -6704,8 +7010,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.8 1997/03/29 04:45:27 tholo -Fn(Latest release from Cyclic Software +Fn(Revision 1.1.1.9 1997/04/21 04:33:40 tholo +Fn(Missing files from 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) @@ -6713,9 +7019,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: 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)240 366 y Fn($)47 b(cvs)g(update)125 +%%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)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 @@ -6737,7 +7043,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(137.)125 +b(See)31 b(Section)f(C.1)h([mo)s(dules],)e(page)i(139.)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 @@ -6765,14 +7071,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 -(93\))i(is)d(sp)s(eci\014ed,)f(the)i Fn(CVSREAD)e Fs(en)m(vironmen)m(t) +(95\))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(151\),)j(or)d(a)g(w)m(atc)m(h)h(is)e(in)g(e\013ect)j(for)d +b(page)g(153\),)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(5.6)0 5340 y([W)-8 -b(atc)m(hes],)33 b(page)e(39\).)p eop -%%Page: 102 104 -102 103 bop 0 -116 a Fs(102)2366 b(CVS|Concurren)m(t)29 +b(atc)m(hes],)33 b(page)e(41\).)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(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 @@ -6781,18 +7087,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(123.)125 1017 y(F)-8 b(or)52 +740 y([up)s(date],)30 b(page)h(125.)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(125.)0 1584 y Fk(A.6.1)62 b(c)m(hec)m(k)m(out)28 +1142 y(page)31 b(127.)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(94,)0 1986 y(for)30 b(a)h(complete)g(description)d +(options],)i(page)g(96,)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(6.7)h([Stic)m(ky)g(tags],)h(page)f(52,)g(for)f(more)h +b(Section)f(6.7)h([Stic)m(ky)g(tags],)h(page)f(54,)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 @@ -6806,33 +7112,33 @@ 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(121.)0 +b(See)29 b(Section)f(A.16)i([status],)g(page)f(123.)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(137\).)0 3815 y Fn(-P)384 b Fs(Prune)29 b(empt)m(y)i +(page)i(139\).)0 3815 y Fn(-P)384 b Fs(Prune)29 b(empt)m(y)i (directories.)40 b(See)30 b(Chapter)g(14)h([Mo)m(ving)g(directories],)f -(page)h(75.)0 3996 y Fn(-p)384 b Fs(Pip)s(e)29 b(\014les)g(to)i(the)g +(page)h(77.)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(6.7)i([Stic)m(ky)e(tags],)480 4301 y(page)g(52,)h(for)e +b(Section)f(6.7)i([Stic)m(ky)e(tags],)480 4301 y(page)g(54,)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(6.7)h([Stic)m -(ky)f(tags],)h(page)g(52,)g(for)480 5035 y(more)h(information)d(on)i +(ky)f(tags],)h(page)g(54,)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: 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(-d)30 b Fo(dir)241 b +%%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)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 @@ -6859,7 +7165,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(7)i([Merging],)g(page)g(55.)0 +Fs('.)480 1859 y(See)31 b(Chapter)e(7)i([Merging],)g(page)g(57.)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 @@ -6870,7 +7176,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 -(137,)h(for)e(info)e(ab)s(out)i(the)g(`)p Fn(-s)p Fs(')g(option)f(that) +(139,)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 @@ -6890,8 +7196,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: 104 106 -104 105 bop 0 -116 a Fs(104)2366 b(CVS|Concurren)m(t)29 +%%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)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 @@ -6918,19 +7224,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(123\).)61 b Fn(commit)35 b Fs(do)s(es)h(not)h(call)f +(date],)g(page)g(125\).)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(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 +g([mo)s(dules],)g(page)h(139,)h(and)e(see)h(Section)f(C.7)g([loginfo],) +0 3233 y(page)26 b(147\))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(114.)47 b(Y)-8 b(ou)32 b(can)h(sp)s(ecify)d(the)i(log) +([log],)f(page)g(116.)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 @@ -6938,21 +7244,21 @@ 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(94,)0 +Fs(\(see)i(Section)f(A.4)h([Common)f(options],)g(page)h(96,)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: 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)0 366 y Fn(-r)30 b Fo(revision)480 +%%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(-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)i(is)e(higher)g(than)i(an)m(y)f (existing)g(revision)e(n)m(um)m(b)s(er)h(\(see)j(Section)e(6.3)h -([Assigning)e(revisions],)480 740 y(page)j(47\).)42 b(Y)-8 +([Assigning)e(revisions],)480 740 y(page)j(49\).)42 b(Y)-8 b(ou)31 b(cannot)g(commit)f(to)h(a)g(sp)s(eci\014c)e(revision)g(on)h(a) h(branc)m(h.)125 1045 y Fn(commit)d Fs(also)j(supp)s(orts)d(these)j (options:)0 1350 y Fn(-F)f Fo(\014le)237 b Fs(Read)31 @@ -6960,7 +7266,7 @@ 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 1531 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 -1655 y(tion)30 b(A.4)h([Common)f(options],)g(page)i(94.)480 +1655 y(tion)30 b(A.4)h([Common)f(options],)g(page)i(96.)480 1808 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 1933 y(If)e(the)g(curren)m(t)h(revision)d(of)j @@ -6982,8 +7288,8 @@ b(examples)0 3644 y(A.7.2.1)62 b(Committing)29 b(to)i(a)f(branc)m(h)125 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 4170 -y([tag],)43 b(page)d(122)g(or)f(see)g(Section)g(A.15)h([rtag],)j(page)c -(120\).)68 b(Then,)40 b(either)f Fn(checkout)d Fs(or)j +y([tag],)43 b(page)d(124)g(or)f(see)g(Section)g(A.15)h([rtag],)j(page)c +(122\).)68 b(Then,)40 b(either)f Fn(checkout)d Fs(or)j Fn(update)e Fs(can)j(b)s(e)0 4295 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 @@ -6999,8 +7305,8 @@ g(1.2)0 4669 y(v)m(ersion)g(of)g(the)h(pro)s(duct,)e(ev)m(en)i(though)g (-r)h(FCS1_2_Patch)e(product_module)240 5132 y($)i(cd)h(product_module) 240 5236 y([[)f(hack)g(away)f(]])240 5340 y($)h(cvs)g(commit)p eop -%%Page: 106 108 -106 107 bop 0 -116 a Fs(106)2366 b(CVS|Concurren)m(t)29 +%%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(This)f(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 835 y Fk(A.7.2.2)62 b(Creating)30 b(the)h(branc)m(h)e(after)h @@ -7047,9 +7353,9 @@ p Fh(:)15 b(:)g(:)p Fs(])75 5185 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(nothing.)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)125 366 y(The)41 b Fn(diff)f Fs(command)h(is)g +%%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(The)41 b 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 491 y(compare)32 b(y)m(our)f(w)m(orking)g(\014les)f(with)g(the)h(revisions)f(they)h(w)m @@ -7063,7 +7369,7 @@ 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 1413 y(an)m(y)g(error)f(o)s(ccurred.)0 1822 y Fk(A.8.1)62 b(di\013)30 b(options)125 2096 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(94,)g(for)0 +Fs(\(see)i(Section)e(A.4)i([Common)f(options],)g(page)h(96,)g(for)0 2220 y(a)i(complete)g(description)d(of)j(them\):)0 2518 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 @@ -7105,8 +7411,8 @@ b Fn(-I)30 b Fo(regexp)25 b Fn(-L)30 b Fo(lab)s(el)0 5340 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-)p eop -%%Page: 108 110 -108 109 bop 0 -116 a Fs(108)2366 b(CVS|Concurren)m(t)29 +%%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)0 366 y Fn(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 @@ -7152,9 +7458,9 @@ Fn(|)p Fs(-D)h(date])h([-k)e(subst])g([-d)g(dir])f(mo)s(dule)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(curren)m(t)31 b(directory)-8 b(.)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(This)28 b(command)i(is)g(a)h(v)-5 +%%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(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 491 y(without)f(the)h Fr(cvs)f Fs(administrativ)m(e)f(directories.)42 @@ -7181,7 +7487,7 @@ Fn(ident)f Fs(y)m(ou)i(m)m(ust)g(not)0 1645 y(use)d(`)p Fn(-kv)p Fs('.)0 2133 y Fk(A.9.1)62 b(exp)s(ort)31 b(options)125 2415 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 -(94,)0 2540 y(for)e(a)h(complete)g(description)d(of)j(them\):)0 +(96,)0 2540 y(for)e(a)h(complete)g(description)d(of)j(them\):)0 2855 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 3045 y Fn(-f)384 b Fs(If)30 b(no)h(matc)m(hing)g(revision)e(is)h(found,)g @@ -7202,15 +7508,15 @@ 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 4878 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(16.4)i([Substitution)c(mo)s(des],)i(page)h -(81\).)0 5068 y Fn(-N)384 b Fs(Only)21 b(useful)h(together)i(with)e(`)p +(83\).)0 5068 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 5193 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 5317 y(y)m(ou)d(sp)s(ecify)e(an)h (explicit)f(target)j(directory)-8 b(.\))p eop -%%Page: 110 112 -110 111 bop 0 -116 a Fs(110)2366 b(CVS|Concurren)m(t)29 +%%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 Fm(A.10)68 b(history|Sho)l(w)31 b(status)g(of)g(\014les)g(and)f(users)75 642 y Fq(\017)60 b Fs(Synopsis:)39 b(history)29 b([-rep)s(ort])h([-\015ags])i([-options) @@ -7229,7 +7535,7 @@ y(Logging)g(m)m(ust)g(b)s(e)g(enabled)g(b)m(y)g(creating)h(the)f 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 2044 y Fr(cvs)i Fs(\(see)j(Section)e(A.4)h -([Common)f(options],)g(page)i(94\).)0 2470 y Fk(A.10.1)62 +([Common)f(options],)g(page)i(96\).)0 2470 y Fk(A.10.1)62 b(history)31 b(options)125 2746 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 3047 y Fn(-c)384 @@ -7254,9 +7560,9 @@ y(Certain)h(commands)g(ha)m(v)m(e)h(a)g(single)e(record)h(t)m(yp)s(e:) (out)480 4986 y Fn(E)g Fs(exp)s(ort)480 5163 y Fn(T)g Fs(rtag)480 5340 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:)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)480 366 y Fn(C)432 b Fs(A)21 b(merge)g(w)m(as)f +%%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)480 366 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 491 y(ing\).)480 663 y Fn(G)432 b Fs(A)30 b(merge)h(w)m(as)g(necessary)g(and)f(it)g(succeeded.)480 @@ -7305,8 +7611,8 @@ 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 5168 y(faster.)0 5340 y Fn(-u)g Fo(name)142 b Fs(Sho)m(w)30 b(records)g(for)g(user)g Fo(name)p Fs(.)p eop -%%Page: 112 114 -112 113 bop 0 -116 a Fs(112)2366 b(CVS|Concurren)m(t)29 +%%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 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 646 y Fq(\017)60 b Fs(Synopsis:)39 b(imp)s(ort)28 b([-options])j(rep)s @@ -7322,7 +7628,7 @@ j(a)d(source)0 1391 y(v)m(endor\))d(in)m(to)h(y)m(our)f(source)g(rep)s 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(12)0 1640 y([T)-8 b(rac)m(king)31 -b(sources],)g(page)g(67,)g(for)f(a)h(discussion)d(on)i(this)f(sub)5 +b(sources],)g(page)g(69,)g(for)f(a)h(discussion)d(on)i(this)f(sub)5 b(ject.)125 1919 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 2044 @@ -7336,10 +7642,10 @@ i(branc)m(hes)e(of)g(dev)m(elopmen)m(t;)0 2572 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 2852 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 +(\(see)h(Section)g(C.9)g([cvsignore],)i(page)e(150\),)j(it)c(do)s(es)h (not)g(imp)s(ort)0 2976 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(113,)k(for)c(a)0 +(Section)e(A.11.2)j([imp)s(ort)c(output],)44 b(page)d(115,)k(for)c(a)0 3101 y(complete)31 b(description)d(of)j(the)f(output\).)125 3381 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 @@ -7347,7 +7653,7 @@ Fs(')27 b(exists,)34 b(an)m(y)f(\014le)f(whose)h(names)g(matc)m(h)h (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 3630 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 +(Section)f(C.2)h([W)-8 b(rapp)s(ers],)30 b(page)h(141.)125 3909 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 @@ -7371,12 +7677,12 @@ b(particular,)g(it)g(do)s(es)0 5091 y(not)d(set)h(up)e(that)i 5215 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(2.1)h ([Getting)f(the)g(source],)0 5340 y(page)h(9\).)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)0 366 y Fk(A.11.1)62 b(imp)s(ort)31 +%%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 Fk(A.11.1)62 b(imp)s(ort)31 b(options)125 643 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(94,)g(for)0 768 y(a)e(complete)g(description\):)0 +(page)h(96,)g(for)0 768 y(a)e(complete)g(description\):)0 1072 y Fn(-m)f Fo(message)480 1196 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 1500 y(There)f(are)i(three)g(additional)d(sp)s(ecial)h @@ -7396,7 +7702,7 @@ b(setting)h(will)e(apply)h(to)i(all)e(\014les)480 2482 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 2607 y(See)31 b(Section)f(16.4)i([Substitution)c(mo)s(des],)i -(page)h(81,)h(for)e(a)g(list)f(of)i(v)-5 b(alid)29 b(`)p +(page)h(83,)h(for)e(a)g(list)f(of)i(v)-5 b(alid)29 b(`)p Fn(-k)p Fs(')h(settings.)0 2786 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 @@ -7406,7 +7712,7 @@ b Fs(Sp)s(ecify)41 b(\014le)g(names)i(that)g(should)e(b)s(e)g(ignored)h 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 3312 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 3491 y +b(Section)f(C.9)g([cvsignore],)h(page)g(150.)0 3491 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 3616 y(rep)s(eatedly)-8 @@ -7414,7 +7720,7 @@ b(.)480 3768 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 3892 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 4331 y Fk(A.11.2)62 b(imp)s(ort)31 b(output)125 +b(page)h(141.)0 4331 y Fk(A.11.2)62 b(imp)s(ort)31 b(output)125 4607 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 4732 y(c)m(haracter)32 b(indicating)c(the)j @@ -7425,14 +7731,14 @@ b(a)43 b(new)480 5160 y(revision)29 b(has)h(b)s(een)f(created)j(\(if)e (necessary\).)0 5340 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(.)p eop -%%Page: 114 116 -114 115 bop 0 -116 a Fs(114)2366 b(CVS|Concurren)m(t)29 +%%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(C)g 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 491 y(merge)i(the)f(c)m(hanges.)0 664 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 +(ignored)g(\(see)j(Section)e(C.9)g([cvsignore],)h(page)g(150\).)0 836 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 961 @@ -7443,10 +7749,10 @@ y(suggest)37 b(that)g(this)e(b)s(eha)m(vior)g(should)f(b)s(e)h(c)m (the)h(`)p Fn(modules)p Fs(')480 1210 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 1335 y([mo)s(dules],)29 -b(page)i(137.\))0 1747 y Fk(A.11.3)62 b(imp)s(ort)31 +b(page)i(139.\))0 1747 y Fk(A.11.3)62 b(imp)s(ort)31 b(examples)125 2020 y Fs(See)f(Chapter)g(12)h([T)-8 b(rac)m(king)31 -b(sources],)g(page)g(67,)g(and)f(See)h(Section)f(4.1.1)i([F)-8 -b(rom)31 b(\014les],)f(page)h(29.)0 2466 y Fm(A.12)68 +b(sources],)g(page)g(69,)g(and)f(See)h(Section)f(4.1.1)i([F)-8 +b(rom)31 b(\014les],)f(page)h(31.)0 2466 y Fm(A.12)68 b(log|Prin)l(t)32 b(out)e(log)i(information)f(for)g(\014les)75 2740 y Fq(\017)60 b Fs(Synopsis:)39 b(log)30 b([options])g([\014les)p Fh(:)15 b(:)g(:)q Fs(])75 2888 y Fq(\017)60 b Fs(Requires:)40 @@ -7476,16 +7782,16 @@ b(ailable.)40 b(All)29 b(other)h(options)g(restrict)g(the)h(output.)0 (revisions)d(on)i(the)g(default)g(branc)m(h,)j(normally)43 b(the)j(highest)480 5340 y(branc)m(h)30 b(on)g(the)h(trunk.)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 Fn(-d)30 b Fo(dates)147 +%%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 Fn(-d)30 b 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 491 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 616 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(94\).)480 740 y(Dates)32 b(can)e(b)s(e)g(com)m(bined)g(in)m(to) +(page)f(96\).)480 740 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 921 y Fo(d1)7 b Fn(<)p Fo(d2)480 1046 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 @@ -7537,8 +7843,8 @@ 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 5340 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.)p eop -%%Page: 116 118 -116 117 bop 0 -116 a Fs(116)2366 b(CVS|Concurren)m(t)29 +%%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(-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 @@ -7589,12 +7895,12 @@ Fs(\014le.)125 5091 y(Note)34 b(that)g(if)e(the)i(soft)m(w)m(are)h 5340 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.)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.13.1)62 b(rdi\013)31 +%%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.13.1)62 b(rdi\013)31 b(options)125 642 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(94,)0 766 y(for)30 b(a)h(complete)g(description)d(of)j(them\):) +(page)h(96,)0 766 y(for)30 b(a)h(complete)g(description)d(of)j(them\):) 0 1068 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 1245 y Fn(-f)384 b Fs(If)30 b(no)h(matc)m(hing)g(revision)e(is)h(found,)g @@ -7640,8 +7946,8 @@ f(a)0 4982 y(command)f(suc)m(h)g(as)h(this:)240 5236 y Fn($)47 b(cvs)g(rdiff)g(-c)g(-r)g(FOO1_2)f(-r)h(FOO1_4)f(tc)i(|)f(\\) 240 5340 y($$)g(Mail)g(-s)g('The)g(patches)e(you)i(asked)g(for')f (foo@bar.com)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)125 366 y(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 @@ -7671,7 +7977,7 @@ 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 3005 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 +(page)h(151\))h(that)f(y)m(ou'v)m(e)h(abandoned)d(y)m(our)h(c)m(hec)m (k)m(out.)125 3281 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 @@ -7695,12 +8001,12 @@ Fs(command)i(deletes)g(all)f(directories)g(and)h(\014les)f(recursiv)m (ely)-8 b(.)78 b(This)480 5340 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)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)480 366 y(c)m(hec)m(k)m(ed-out)43 +%%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)480 366 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 491 y(Chapter)30 -b(9)h([Adding)e(\014les],)g(page)i(61\))h(will)c(b)s(e)h(silen)m(tly)g +b(9)h([Adding)e(\014les],)g(page)i(63\))h(will)c(b)s(e)h(silen)m(tly)g (deleted|ev)m(en)i(if)e(it)h(is)g(non-empt)m(y!)0 891 y Fk(A.14.2)62 b(release)31 b(output)125 1165 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 @@ -7710,7 +8016,7 @@ 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 1688 y(hierarc)m(h)m(y)36 b(with)f(the)h Fn(add)g Fs(command)g(\(see)h(Chapter)f(9)g([Adding)f(\014les],)i(page) -h(61\))f(will)d(b)s(e)h(silen)m(tly)g(ignored)0 1812 +h(63\))f(will)d(b)s(e)h(silen)m(tly)g(ignored)0 1812 y(\(and)30 b(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 2107 y Fn(U)g Fo(\014le)0 2232 y Fn(P)g Fo(\014le)285 b Fs(There)32 @@ -7729,7 +8035,7 @@ 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 b(has)h(not)h(y)m(et)480 2938 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 -3063 y(Section)30 b(A.7)h([commit],)g(page)h(103.)0 3230 +3063 y(Section)30 b(A.7)h([commit],)g(page)h(105.)0 3230 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 @@ -7740,7 +8046,7 @@ y Fn(?)30 b Fo(\014le)285 b(\014le)43 b Fs(is)38 b(in)f(y)m(our)i(w)m 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 3770 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 +([cvsignore],)i(page)e(150\).)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 3894 y(this)j(\014le)h(will)d(b)s(e)j (lost.)0 4294 y Fk(A.14.3)62 b(release)31 b(examples)125 4568 y Fs(Release)g(the)f(mo)s(dule,)f(and)h(delete)g(y)m(our)h(lo)s @@ -7753,8 +8059,8 @@ Fn(cvs)47 b(release)p Fs('.)240 5029 y Fn($)g(cvs)g(release)f(-d)h(tc) (repository.)240 5236 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 5340 y($)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 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 643 y Fq(\017)60 b Fs(rtag)31 b([-falnR])f([-b])h([-d])f([-r)h(tag)g @@ -7769,7 +8075,7 @@ b(can)h(use)f(this)g(command)g(to)h(assign)f(sym)m(b)s(olic)e(tags)k 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 1655 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(122\),)i(to)f(base)f(the)h(selection)f(of)g(revisions) +([tag],)g(page)e(124\),)i(to)f(base)f(the)h(selection)f(of)g(revisions) e(on)0 1779 y(the)j(con)m(ten)m(ts)h(of)e(y)m(our)h(w)m(orking)e (directory)-8 b(.)125 2056 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 @@ -7777,7 +8083,7 @@ e(on)0 1779 y(the)j(con)m(ten)m(ts)h(of)e(y)m(our)h(w)m(orking)e 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.)0 2623 y Fk(A.15.1)62 b(rtag)30 b(options)125 2900 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(94,)g +Fn(rtag)f Fs(\(see)i(Section)e(A.4)i([Common)f(options],)g(page)h(96,)g (for)0 3025 y(a)i(complete)g(description)d(of)j(them\):)0 3330 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 3510 @@ -7795,7 +8101,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 4425 y(\014le.)40 b(\(see)31 b(Section)f(C.1)h -([mo)s(dules],)e(page)i(137\).)0 4606 y Fn(-R)384 b Fs(Commit)30 +([mo)s(dules],)e(page)i(139\).)0 4606 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 4786 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 @@ -7806,20 +8112,20 @@ b(only)e(the)480 4911 y(\014les)h(iden)m(ti\014ed)g(b)m(y)h(the)g(old)g (tag.)125 5340 y(In)g(addition)g(to)i(the)f(ab)s(o)m(v)m(e)i(common)f (options,)f(these)g(options)g(are)h(a)m(v)-5 b(ailable:)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(-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(10)h([Remo)m(ving)f -(\014les],)480 491 y(page)c(63\))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 616 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 -740 y(\014les)k(get)j(remo)m(v)m(ed)f(from)f(the)h(up-coming)e +%%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(-a)384 b Fs(Use)27 b(the)g(`)p +Fn(-a)p Fs(')g(option)f(to)i(ha)m(v)m(e)g Fn(rtag)e Fs(lo)s(ok)g(in)g +(the)h(`)p Fn(Attic)p Fs(')f(\(see)i(Section)e(3.2.3)j([A)m(ttic],)g +(page)f(17\))480 491 y(for)35 b(remo)m(v)m(ed)i(\014les)d(that)j(con)m +(tain)e(the)h(sp)s(eci\014ed)e(tag.)58 b(The)35 b(tag)h(is)f(remo)m(v)m +(ed)i(from)e(these)h(\014les,)480 616 y(whic)m(h)26 b(mak)m(es)i(it)f +(con)m(v)m(enien)m(t)h(to)g(re-use)g(a)f(sym)m(b)s(olic)f(tag)i(as)g +(dev)m(elopmen)m(t)g(con)m(tin)m(ues)f(\(and)g(\014les)480 +740 y(get)32 b(remo)m(v)m(ed)f(from)f(the)g(up-coming)g (distribution\).)0 907 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(6)h([Revisions)e(and)g(branc) -m(hes],)i(page)g(45.)0 1074 y Fn(-d)384 b Fs(Delete)32 +m(hes],)i(page)g(47.)0 1074 y Fn(-d)384 b Fs(Delete)32 b(the)e(tag)i(instead)d(of)i(creating)g(it.)480 1220 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(b)s(e)480 @@ -7837,13 +8143,13 @@ y Fq(\017)60 b Fs(Changes:)40 b(nothing.)125 2887 y(Displa)m(y)33 b(a)i(brief)f(rep)s(ort)g(on)g(the)h(curren)m(t)g(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 3012 y(information)39 b(on)i(the)h(basic)e(output) -h(see)h(Section)f(5.1)h([File)e(status],)45 b(page)d(33.)73 +h(see)h(Section)f(5.1)h([File)e(status],)45 b(page)d(35.)73 b(F)-8 b(or)42 b(information)e(on)h(the)0 3136 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(6.7)i([Stic)m(ky)e(tags],)k(page)e(52.)60 +(Section)e(6.7)i([Stic)m(ky)e(tags],)k(page)e(54.)60 b(F)-8 b(or)37 b(information)e(on)0 3261 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(123.)125 3535 +(A.18.1)i([up)s(date)e(options],)g(page)h(125.)125 3535 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 3659 y(w)m(orking)25 @@ -7852,21 +8158,21 @@ b(source)g(directory|but)f(remem)m(b)s(er)h(that)h(things)e(migh)m(t)h 3784 y Fn(update)p Fs(.)0 4184 y Fk(A.16.1)62 b(status)31 b(options)125 4458 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(94,)0 4583 y(for)e(a)h(complete)g(description)d(of) +(options],)g(page)h(96,)0 4583 y(for)e(a)h(complete)g(description)d(of) j(them\):)0 4878 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 5045 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 5340 y(There)f(is)h(one)g(additional)f(option:)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 Fn(-v)384 b Fs(V)-8 b(erb)s(ose.)62 b(In)36 b(addition)g(to)i(the)f(information)f(normally) f(displa)m(y)m(ed,)j(prin)m(t)e(all)g(sym)m(b)s(olic)g(tags,)480 491 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 616 y(information,)29 b(see)i(Section)f(6.4)i -([T)-8 b(ags],)31 b(page)h(47)0 1134 y Fm(A.17)68 b(tag|Add)30 +([T)-8 b(ags],)31 b(page)h(49)0 1134 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 1415 y Fq(\017)60 b Fs(tag)32 b([-lR])e([-b])g([-c])i ([-d])f(sym)m(b)s(olic)p 1368 1415 28 4 v 31 w(tag)g([\014les)p @@ -7905,12 +8211,12 @@ b(See)28 b(the)g(options)0 4043 y(section)j(b)s(elo)m(w.)125 Fn(-F)p Fs(')g(option)g(to)h(force)g(the)g(new)f(tag)h(v)-5 b(alue.)0 4934 y Fk(A.17.1)62 b(tag)30 b(options)125 5215 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(94,)h +Fn(tag)g Fs(\(see)h(Section)g(A.4)g([Common)f(options],)g(page)h(96,)h (for)0 5340 y(a)e(complete)g(description)d(of)j(them\):)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 Fn(-F)384 b Fs(Ov)m(erwrite)28 +%%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 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 491 y(in)i Fr(cvs)g Fs(1.4.)42 b(The)30 b(old)g(b)s(eha)m(vior)f(is)h(matc) @@ -7921,7 +8227,7 @@ b(directories)f(recursiv)m(ely)-8 b(.)40 b(This)28 b(is)i(on)g(b)m(y)g (default.)125 1143 y(Tw)m(o)g(sp)s(ecial)f(options)h(are)g(a)m(v)-5 b(ailable:)0 1443 y Fn(-b)384 b Fs(The)37 b(-b)h(option)f(mak)m(es)i (the)f(tag)h(a)f(branc)m(h)g(tag)h(\(see)f(Chapter)g(6)g([Revisions)f -(and)g(branc)m(hes],)480 1567 y(page)29 b(45\),)i(allo)m(wing)c +(and)g(branc)m(hes],)480 1567 y(page)29 b(47\),)i(allo)m(wing)c (concurren)m(t,)i(isolated)f(dev)m(elopmen)m(t.)41 b(This)26 b(is)i(most)h(useful)d(for)j(creating)g(a)480 1692 y(patc)m(h)i(to)g(a) g(previously)d(released)i(soft)m(w)m(are)i(distribution.)0 @@ -7957,15 +8263,15 @@ g(with)f(an)m(y)h(revisions)e(applied)g(to)j(the)f(source)g(rep)s 4520 y(or)g(up)s(date.)0 4941 y Fk(A.18.1)62 b(up)s(date)31 b(options)125 5215 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(94,)0 5340 y(for)g(a)h(complete)g(description)d(of) +(options],)g(page)h(96,)0 5340 y(for)g(a)h(complete)g(description)d(of) j(them\):)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)0 366 y Fn(-D)g(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 491 y(See)31 -b(Section)f(6.7)h([Stic)m(ky)g(tags],)h(page)f(52,)g(for)f(more)h +b(Section)f(6.7)h([Stic)m(ky)g(tags],)h(page)f(54,)g(for)f(more)h (information)e(on)h(stic)m(ky)g(tags/dates.)0 665 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 @@ -7978,25 +8284,25 @@ b(option)h(is)g(stic)m(ky;)50 b(future)480 1088 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 1213 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(121.) +m(ky)g(options.)39 b(See)29 b(Section)f(A.16)i([status],)g(page)f(123.) 0 1387 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(8)h([Recursiv)m -(e)g(b)s(eha)m(vior],)480 1511 y(page)31 b(59.)0 1685 +(e)g(b)s(eha)m(vior],)480 1511 y(page)31 b(61.)0 1685 y Fn(-P)384 b Fs(Prune)29 b(empt)m(y)i(directories.)40 -b(See)30 b(Chapter)g(14)h([Mo)m(ving)g(directories],)f(page)h(75.)0 +b(See)30 b(Chapter)g(14)h([Mo)m(ving)g(directories],)f(page)h(77.)0 1859 y Fn(-p)384 b Fs(Pip)s(e)29 b(\014les)g(to)i(the)g(standard)e (output.)0 2033 y Fn(-R)384 b Fs(Op)s(erate)30 b(recursiv)m(ely)f (\(default\).)41 b(See)31 b(Chapter)e(8)i([Recursiv)m(e)f(b)s(eha)m -(vior],)g(page)i(59.)0 2207 y Fn(-r)e(tag)210 b Fs(Retriev)m(e)36 +(vior],)g(page)i(61.)0 2207 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(6.7)h([Stic)m(ky)480 2332 y(tags],)c(page)f(52,)h(for)e +b(Section)g(6.7)h([Stic)m(ky)480 2332 y(tags],)c(page)f(54,)h(for)e (more)g(information)f(on)h(stic)m(ky)h(tags/dates.)125 2602 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 2901 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(6.7)h([Stic)m(ky)f -(tags],)h(page)g(52,)g(for)480 3025 y(more)h(information)d(on)i(stic)m +(tags],)h(page)g(54,)g(for)480 3025 y(more)h(information)d(on)i(stic)m (ky)h(tags/dates.)0 3199 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 3324 y(directory)-8 @@ -8022,7 +8328,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 4643 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 4768 y(page)31 b(148,)h(for)e(other)h(w)m(a)m(ys)g +([cvsignore],)480 4768 y(page)31 b(150,)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 4942 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 @@ -8031,10 +8337,10 @@ b(.)480 5215 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 5340 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.)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 Fn(-j)p Fo(revision)76 b +b(page)h(141.)p eop +%%Page: 127 129 +127 128 bop 0 -116 a Fs(App)s(endix)28 b(A:)i(Guide)g(to)h(CVS)e +(commands)2210 b(127)0 366 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 491 y(option)30 b(to)h(the)g(revision)d @@ -8055,7 +8361,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 1427 28 4 v 31 w(T)-8 b(ag)8 b Fn(:)p Fo(Date)p 3386 1427 V 35 w(Sp)s(eci\014er)f -Fs('.)480 1583 y(See)31 b(Chapter)e(7)i([Merging],)g(page)g(55.)0 +Fs('.)480 1583 y(See)31 b(Chapter)e(7)i([Merging],)g(page)g(57.)0 2061 y Fk(A.18.2)62 b(up)s(date)31 b(output)125 2342 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(ting)f(a)i(line)d(for)j(eac)m(h) @@ -8102,8 +8408,8 @@ m(our)h(cop)m(y)-8 b(,)34 b(but)e(they)480 4934 y(w)m(ere)f(merged)f g Fn(update)p Fs(\))g(will)e(b)s(e)h(made.)48 b(The)32 b(exact)i(name)e(of)h(that)g(\014le)f(is)480 5340 y(prin)m(ted)d(while) f Fn(update)h Fs(runs.)p eop -%%Page: 126 128 -126 127 bop 0 -116 a Fs(126)2366 b(CVS|Concurren)m(t)29 +%%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)0 366 y Fn(C)g Fo(\014le)285 b Fs(A)34 b(con\015ict)f(w)m(as)h(detected)h(while)c(trying)i(to)h (merge)g(y)m(our)f(c)m(hanges)i(to)f Fo(\014le)k Fs(with)32 @@ -8118,7 +8424,7 @@ Fn(.)p Fo(revision)p Fs(')d(where)i Fo(revision)g Fs(is)g(the)480 865 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 989 y(Section)g(5.3)h([Con\015icts)f(example],)g -(page)h(35)g(\(Note)h(that)f(some)f(systems)g(automatically)h(purge)480 +(page)h(37)g(\(Note)h(that)f(some)f(systems)g(automatically)h(purge)480 1114 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 1238 @@ -8132,7 +8438,7 @@ b(in)f(y)m(our)i(w)m(orking)f(directory)-8 b(,)40 b(but)e(do)s(es)h 1662 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 1786 y(`)p Fn(-I)p Fs(')30 b(option,)g(and)g(see)h -(Section)f(C.9)h([cvsignore],)g(page)g(148\).)0 2201 +(Section)f(C.9)h([cvsignore],)g(page)g(150\).)0 2201 y Fk(A.18.3)62 b(up)s(date)31 b(examples)125 2475 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) @@ -8140,31 +8446,31 @@ b(follo)m(wing)f(line)g(will)f(displa)m(y)h(all)h(\014les)f(whic)m(h)h b(.)41 b(It)30 b(can)h(b)s(e)f(used)f(to)i(c)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 2853 y Fn($)47 b(cvs)g(-n)h(-q)f(update)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)0 366 y Fp(App)t(endix)30 +%%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)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(93\))h -(and)60 b([Index],)30 b(page)h(165.)0 1295 y Fn(add)e([)p +Fs(\(see)h(Section)g(A.3)0 994 y([Global)30 b(options],)g(page)h(95\))h +(and)60 b([Index],)30 b(page)h(167.)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(9)h([Adding)e(\014les],)g(page)i(61.)480 +b(.)40 b(See)31 b(Chapter)f(9)h([Adding)e(\014les],)g(page)i(63.)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(97.)480 +b(.)40 b(See)31 b(Section)f(A.5)h([admin],)f(page)h(99.)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(16)h([Keyw)m(ord)g -(substitution],)f(page)h(79.)480 2778 y Fn(-l[)p Fo(rev)8 +(substitution],)f(page)h(81.)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 @@ -8182,470 +8488,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(15.4)i([annotate],)g(page)f(78.)480 +b(See)30 b(Section)g(15.4)i([annotate],)g(page)f(80.)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(94.)480 +b(Section)f(A.4)960 5039 y([Common)30 b(options],)g(page)h(96.)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(94.)p eop -%%Page: 128 130 -128 129 bop 0 -116 a Fs(128)2366 b(CVS|Concurren)m(t)29 +5340 y(page)31 b(96.)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(-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(8)h([Recursiv)m(e)960 491 -y(b)s(eha)m(vior],)30 b(page)h(59.)480 670 y Fn(-r)f +y(b)s(eha)m(vior],)30 b(page)h(61.)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(94.)0 +b(See)31 b(Section)f(A.4)h([Common)f(options],)g(page)i(96.)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 -(101.)480 1154 y Fn(-A)384 b Fs(Reset)38 b(an)m(y)f(stic)m(ky)h +(103.)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(6.7)i([Stic)m(ky)e(tags],) -j(page)e(52)960 1278 y(and)30 b(Chapter)g(16)h([Keyw)m(ord)f -(substitution],)f(page)i(79.)480 1458 y Fn(-c)384 b Fs(Output)56 +j(page)e(54)960 1278 y(and)30 b(Chapter)g(16)h([Keyw)m(ord)f +(substitution],)f(page)i(81.)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(102.)480 +(hec)m(k)m(out)i(options],)960 1582 y(page)31 b(104.)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(94.)480 2066 y Fn(-d)f Fo(dir)241 b Fs(Chec)m(k)31 +b(page)h(96.)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(102.)480 2245 y Fn(-f)384 +(hec)m(k)m(out)i(options],)e(page)g(104.)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(94.)480 2549 y Fn(-j)f Fo(rev)230 b Fs(Merge)32 +y(page)31 b(96.)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(102.)480 2729 y Fn(-k)f Fo(k\015ag)165 +(options],)d(page)h(104.)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(16.4)h([Substitution)c(mo)s(des],)960 -2853 y(page)31 b(81.)480 3033 y Fn(-l)384 b Fs(Lo)s(cal;)45 +2853 y(page)31 b(83.)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(8)h([Recursiv)m(e)960 3157 -y(b)s(eha)m(vior],)30 b(page)h(59.)480 3337 y Fn(-N)384 +y(b)s(eha)m(vior],)30 b(page)h(61.)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 -3461 y(options],)30 b(page)h(102.)480 3641 y Fn(-n)384 +3461 y(options],)30 b(page)h(104.)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 -3765 y(page)i(102.)480 3945 y Fn(-P)384 b Fs(Prune)29 +3765 y(page)i(104.)480 3945 y Fn(-P)384 b Fs(Prune)29 b(empt)m(y)i(directories.)40 b(See)30 b(Chapter)g(14)h([Mo)m(ving)g -(directories],)f(page)h(75.)480 4124 y Fn(-p)384 b Fs(Chec)m(k)36 +(directories],)f(page)h(77.)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 4249 y([c)m(hec)m(k)m(out) -e(options],)d(page)h(102.)480 4428 y Fn(-r)f Fo(tag)229 +e(options],)d(page)h(104.)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 -4553 y(page)31 b(94.)480 4732 y Fn(-s)384 b Fs(Lik)m(e)35 +4553 y(page)31 b(96.)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 -4857 y(page)31 b(102.)0 5036 y Fn(commit)e([)p Fo(options)t +4857 y(page)31 b(104.)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(103.)480 +b(.)40 b(See)31 b(Section)f(A.7)h([commit],)g(page)g(105.)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(104.)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 +(page)g(106.)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(-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(104.)480 674 y Fn(-l)384 +491 y(mit)g(options],)g(page)h(106.)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(8)h([Recursiv)m(e)960 -798 y(b)s(eha)m(vior],)30 b(page)h(59.)480 981 y Fn(-m)f +798 y(b)s(eha)m(vior],)30 b(page)h(61.)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(104.)480 +b(See)30 b(Section)h(A.7.1)h([commit)e(options],)g(page)h(106.)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 -1288 y(page)g(104.)480 1471 y Fn(-R)384 b Fs(Op)s(erate)24 +1288 y(page)g(106.)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(8)h([Recursiv)m -(e)g(b)s(eha)m(vior],)g(page)h(59.)480 1653 y Fn(-r)30 +(e)g(b)s(eha)m(vior],)g(page)h(61.)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(104.)0 +b(Section)f(A.7.1)i([commit)f(options],)f(page)h(106.)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(106.)64 b(In)37 b(addition)f(to)480 +b(],)39 b(page)g(108.)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 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 -2517 y(page)i(107.)480 2700 y Fn(-D)f Fo(date2)138 b +2517 y(page)i(109.)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(107.)480 2882 y Fn(-l)384 b Fs(Lo)s(cal;)45 b(run)39 +(page)g(109.)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(8)h([Recursiv)m(e)960 3007 -y(b)s(eha)m(vior],)30 b(page)h(59.)480 3190 y Fn(-N)384 +y(b)s(eha)m(vior],)30 b(page)h(61.)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 -3314 y(page)g(107.)480 3497 y Fn(-r)f Fo(rev1)185 b Fs(Di\013)30 +3314 y(page)g(109.)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 -3621 y(page)i(107.)480 3804 y Fn(-r)f Fo(rev2)185 b Fs(Di\013)30 +3621 y(page)i(109.)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(107.)0 3987 y Fn(edit)d([)p Fo(options)t +d(options],)h(page)i(109.)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(5.6.3)j([Editing)28 b(\014les],)i(page)h(42.)480 +b(See)30 b(Section)g(5.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 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(5.6.3)j([Editing)28 b(\014les],)i(page)h -(42.)480 4601 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(8)h([Recursiv)m(e)960 4726 -y(b)s(eha)m(vior],)30 b(page)h(59.)0 4908 y Fn(editors)d([)p +y(b)s(eha)m(vior],)30 b(page)h(61.)0 4908 y Fn(editors)d([)p Fo(options)t Fn(])h([)p Fo(\014les)t Fh(:)15 b(:)g(:)p 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(5.6.4)i([W)-8 b(atc)m(h)33 -b(information],)c(page)i(43.)480 5215 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(8)h([Recursiv)m(e)960 5340 -y(b)s(eha)m(vior],)30 b(page)h(59.)p eop -%%Page: 130 132 -130 131 bop 0 -116 a Fs(130)2366 b(CVS|Concurren)m(t)29 +y(b)s(eha)m(vior],)30 b(page)h(61.)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)0 366 y Fn(export)f([)p Fo(options)t Fn(])g Fo(mo)s(dules)t Fh(:)15 b(:)g(:)480 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(108.)480 670 y Fn(-D)f Fo(date)183 +([exp)s(ort],)g(page)g(110.)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(94.)480 +Fs(.)39 b(See)23 b(Section)g(A.4)h([Common)f(options],)i(page)f(96.)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(109.)480 1029 y Fn(-f)384 b Fs(Use)21 b(head)g(revision)e(if)g +(page)h(111.)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(94.)480 1333 y Fn(-k)f +(options],)960 1154 y(page)31 b(96.)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(16.4)h([Substitution)c(mo)s -(des],)960 1458 y(page)31 b(81.)480 1637 y Fn(-l)384 +(des],)960 1458 y(page)31 b(83.)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(8)h([Recursiv)m(e)960 -1762 y(b)s(eha)m(vior],)30 b(page)h(59.)480 1941 y Fn(-N)384 +1762 y(b)s(eha)m(vior],)30 b(page)h(61.)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 -2066 y(tions],)d(page)h(109.)480 2245 y Fn(-n)384 b Fs(Do)35 +2066 y(tions],)d(page)h(111.)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 -2370 y(page)d(109.)480 2549 y Fn(-P)384 b Fs(Prune)29 +2370 y(page)d(111.)480 2549 y Fn(-P)384 b Fs(Prune)29 b(empt)m(y)i(directories.)40 b(See)30 b(Chapter)g(14)h([Mo)m(ving)g -(directories],)f(page)h(75.)480 2729 y Fn(-r)f Fo(tag)229 +(directories],)f(page)h(77.)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 -2853 y(page)31 b(94.)0 3033 y Fn(history)d([)p Fo(options)t +2853 y(page)31 b(96.)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(110.)480 +b(.)40 b(See)31 b(Section)f(A.10)h([history],)f(page)i(112.)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 -(110.)480 3516 y Fn(-b)f Fo(str)247 b Fs(Bac)m(k)46 b(to)e(record)g +(112.)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 3641 y([history)30 b(options],)g(page)h -(110.)480 3820 y Fn(-c)384 b Fs(Rep)s(ort)25 b(on)g(committed)g(\(mo)s +(112.)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 3945 y(page)31 b(110.)480 4124 y Fn(-D)f +(options],)960 3945 y(page)31 b(112.)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(110.)480 +b(Section)h(A.10.1)h([history)d(options],)i(page)g(112.)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(110.)480 +40 b(See)29 b(Section)g(A.10.1)i([history)d(options],)i(page)f(112.)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 -4608 y(options],)g(page)h(110.)480 4787 y Fn(-m)f Fo(mo)s(dule)960 +4608 y(options],)g(page)h(112.)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 -5036 y(page)31 b(110.)480 5215 y Fn(-n)f Fo(mo)s(dule)960 +5036 y(page)31 b(112.)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(110.)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 +([history)c(options],)i(page)g(112.)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(-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 -491 y(page)31 b(110.)480 668 y Fn(-r)f Fo(rev)230 b Fs(Since)29 +491 y(page)31 b(112.)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(110.)480 844 y Fn(-T)384 b Fs(Pro)s(duce)21 +(options],)i(page)g(112.)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(110.)480 1021 y Fn(-t)30 +i([history)e(options],)h(page)g(112.)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 -1145 y([history)30 b(options],)g(page)h(110.)480 1322 +1145 y([history)30 b(options],)g(page)h(112.)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(110.)480 1498 y Fn(-w)384 b Fs(W)-8 +(options],)g(page)g(112.)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 1623 y(page)31 -b(110.)480 1799 y Fn(-x)f Fo(t)m(yp)s(es)144 b Fs(Rep)s(ort)28 +b(112.)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 -1924 y(options],)g(page)h(110.)480 2101 y Fn(-z)f Fo(zone)178 +1924 y(options],)g(page)h(112.)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(110.)0 +b(See)29 b(Section)f(A.10.1)j([history)c(options],)i(page)g(112.)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 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 -(112.)480 2578 y Fn(-b)f Fo(bra)222 b Fs(Imp)s(ort)56 +(114.)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 2703 -y(page)31 b(113.)480 2879 y Fn(-d)384 b Fs(Use)32 b(the)g(\014le's)g +y(page)31 b(115.)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 3004 y([imp)s(ort)d(options],)h(page)h -(113.)480 3180 y Fn(-k)f Fo(k\015ag)165 b Fs(Set)36 b(default)f(R)m(CS) +(115.)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 3305 y(options],)30 -b(page)h(113.)480 3481 y Fn(-m)f Fo(msg)197 b Fs(Use)31 +b(page)h(115.)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(113.)480 +b(Section)f(A.11.1)j([imp)s(ort)c(options],)h(page)h(115.)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 3783 y(page)31 b(113.)480 3959 y Fn(-W)f +(options],)960 3783 y(page)31 b(115.)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(113.)0 +b(Section)h(A.11.1)h([imp)s(ort)d(options],)h(page)h(115.)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(3.5)i([Creating)f(a)g(rep) -s(ository],)480 4260 y(page)31 b(18.)0 4437 y Fn(log)e([)p +(do)s(esn't)f(exist.)63 b(See)39 b(Section)e(3.6)i([Creating)f(a)g(rep) +s(ository],)480 4260 y(page)31 b(21.)0 4437 y Fn(log)e([)p Fo(options)t Fn(])g([)p Fo(\014les)t Fh(:)15 b(:)g(:)p 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(114.)480 +(\014les.)40 b(See)30 b(Section)h(A.12)g([log],)g(page)h(116.)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 -4862 y(page)h(114.)480 5039 y Fn(-d)f Fo(dates)147 b +4862 y(page)h(116.)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 5163 y([log)31 b(options],)f(page)h -(114.)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(114.)p +(116.)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(116.)p eop -%%Page: 132 134 -132 133 bop 0 -116 a Fs(132)2366 b(CVS|Concurren)m(t)29 +%%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(-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(8)h([Recursiv)m(e)960 491 -y(b)s(eha)m(vior],)30 b(page)h(59.)480 668 y Fn(-N)384 +y(b)s(eha)m(vior],)30 b(page)h(61.)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(114.)480 844 y Fn(-R)384 b Fs(Only)29 +(options],)h(page)g(116.)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(114.)480 +b(Section)f(A.12.1)j([log)d(options],)g(page)i(116.)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(114.)480 1197 y Fn(-s)f Fo(states)127 b Fs(Only)33 +(page)h(116.)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(114.)480 1498 y Fn(-t)384 b Fs(Only)34 b(prin)m(t)g(header)i +y(page)c(116.)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(114.)480 1799 y Fn(-w)f +(options],)960 1623 y(page)31 b(116.)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(114.)0 2101 y +([log)960 1924 y(options],)30 b(page)h(116.)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(3.6.3.2)j([P)m(assw)m -(ord)e(authen-)480 2225 y(tication)e(clien)m(t],)h(page)g(23.)0 +(ticating)f(serv)m(er.)45 b(See)32 b(Section)f(3.7.3.2)j([P)m(assw)m +(ord)e(authen-)480 2225 y(tication)e(clien)m(t],)h(page)g(26.)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(3.6.3.2)j([P)m +g(authen)m(ticating)h(serv)m(er.)53 b(See)35 b(Section)f(3.7.3.2)j([P)m (assw)m(ord)e(au-)480 2526 y(then)m(tication)c(clien)m(t],)f(page)h -(23.)0 2703 y Fn(rdiff)e([)p Fo(options)t Fn(])g Fo(mo)s(dules)t +(26.)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(116.)480 3004 y Fn(-c)384 b Fs(Con)m(text)41 +b(],)29 b(page)j(118.)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(117.)480 3305 y Fn(-D)f Fo(date)183 b Fs(Select)23 +b(119.)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(94.)480 +b(Section)g(A.4)h([Common)f(options],)i(page)f(96.)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 -3606 y(page)31 b(94.)480 3783 y Fn(-l)384 b Fs(Lo)s(cal;)45 +3606 y(page)31 b(96.)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(8)h([Recursiv)m(e)960 3907 -y(b)s(eha)m(vior],)30 b(page)h(59.)480 4084 y Fn(-r)f +y(b)s(eha)m(vior],)30 b(page)h(61.)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(94.)480 4260 y Fn(-s)384 b Fs(Short)25 b(patc)m(h)h(-)f(one)h(liner)d +h(96.)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(117.)480 4437 y Fn(-t)384 b Fs(T)-8 +(options],)i(page)g(119.)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 -4561 y(page)31 b(107.)480 4738 y Fn(-u)384 b Fs(Unidi\013)28 +4561 y(page)31 b(109.)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(117.)480 4914 y Fn(-V)f Fo(v)m(ers)197 +(options],)h(page)h(119.)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 5039 y(options],)30 b(page)h(117.)0 5215 +([rdi\013)960 5039 y(options],)30 b(page)h(119.)0 5215 y Fn(release)d([)p Fo(options)t Fn(])h Fo(directory)480 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(118.)p +(use.)41 b(See)30 b(Section)h(A.14)g([release],)h(page)f(120.)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 +%%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(-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(118.)0 +b(Section)f(A.14.1)i([release)f(options],)f(page)i(120.)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(10)h([Remo)m -(ving)g(\014les],)f(page)h(63.)480 846 y Fn(-f)384 b +(ving)g(\014les],)f(page)h(65.)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(10)i([Remo)m(ving)f(\014les],)g(page)h(63.)480 +b(See)22 b(Chapter)g(10)i([Remo)m(ving)f(\014les],)g(page)h(65.)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(8)h([Recursiv)m -(e)960 1148 y(b)s(eha)m(vior],)30 b(page)h(59.)480 1326 +(e)960 1148 y(b)s(eha)m(vior],)30 b(page)h(61.)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(8)h([Recursiv)m(e)g(b)s(eha)m(vior],)g(page)h(59.) +b(See)24 b(Chapter)f(8)h([Recursiv)m(e)g(b)s(eha)m(vior],)g(page)h(61.) 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(120.)480 1805 y Fn(-a)384 b Fs(Clear)43 +([rtag],)g(page)f(122.)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(120.)480 2107 y +b(A.15.1)j([rtag)e(options],)f(page)h(122.)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(120.) +Fs(.)42 b(See)30 b(Section)g(A.15.1)j([rtag)e(options],)f(page)h(122.) 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(120.)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(120.) +(page)h(122.)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(122.) 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 -(120.)480 2817 y Fn(-f)384 b Fs(F)-8 b(orce)26 b(a)e(head)g(revision)f +(122.)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 2942 y(options],)k(page)h(120.)480 +b(Section)f(A.15.1)i([rtag)960 2942 y(options],)k(page)h(122.)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(8)h([Recursiv)m -(e)960 3244 y(b)s(eha)m(vior],)30 b(page)h(59.)480 3422 +(e)960 3244 y(b)s(eha)m(vior],)30 b(page)h(61.)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(120.)480 +b(See)31 b(Section)f(A.15.1)i([rtag)g(options],)e(page)h(122.)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(8)h([Recursiv)m(e)g(b)s(eha)m(vior],)g(page)h(59.) +b(See)24 b(Chapter)f(8)h([Recursiv)m(e)g(b)s(eha)m(vior],)g(page)h(61.) 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(120.)0 3954 y Fn(status)e([)p Fo(options)t Fn(])g +(page)h(122.)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(121.)480 +b(.)40 b(See)28 b(Section)h(A.16)g([status],)h(page)f(123.)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(8)h([Recursiv)m -(e)960 4381 y(b)s(eha)m(vior],)30 b(page)h(59.)480 4558 +(e)960 4381 y(b)s(eha)m(vior],)30 b(page)h(61.)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(8)h([Recursiv)m(e)g(b)s(eha)m(vior],)g(page)h(59.) +b(See)24 b(Chapter)f(8)h([Recursiv)m(e)g(b)s(eha)m(vior],)g(page)h(61.) 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 -4860 y(page)31 b(121.)0 5038 y Fn(tag)e([)p Fo(options)t +4860 y(page)31 b(123.)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 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(122.)480 5340 y Fn(-b)384 +b(Section)g(A.17)i([tag],)g(page)g(124.)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(122.)p +b(See)30 b(Section)g(A.17.1)j([tag)f(options],)e(page)h(124.)p eop -%%Page: 134 136 -134 135 bop 0 -116 a Fs(134)2366 b(CVS|Concurren)m(t)29 +%%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)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(122.)480 +b(See)31 b(Section)f(A.17.1)i([tag)g(options],)e(page)i(124.)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(122.)480 +b(See)31 b(Section)f(A.17.1)j([tag)e(options],)g(page)g(124.)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(122.)480 +41 b(See)30 b(Section)g(A.17.1)j([tag)f(options],)e(page)h(124.)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(122.)480 1187 y Fn(-l)384 b +1013 y(options],)h(page)h(124.)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(8)h([Recursiv)m(e)960 -1311 y(b)s(eha)m(vior],)30 b(page)h(59.)480 1485 y Fn(-n)384 +1311 y(b)s(eha)m(vior],)30 b(page)h(61.)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(122.)480 +b(Section)f(A.17.1)i([tag)g(options],)e(page)h(124.)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(8)h([Recursiv)m(e)g(b)s(eha)m(vior],)g(page)h(59.) +b(See)24 b(Chapter)f(8)h([Recursiv)m(e)g(b)s(eha)m(vior],)g(page)h(61.) 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(122.)0 2007 y Fn(unedit)e([)p Fo(options)t Fn(])g([)p +h(124.)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(5.6.3)i([Editing)d -(\014les],)h(page)h(42.)480 2306 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 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(5.6.3)j([Editing)28 -b(\014les],)i(page)h(42.)480 2604 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(8)h([Recursiv)m(e)960 2729 -y(b)s(eha)m(vior],)30 b(page)h(59.)0 2903 y Fn(update)e([)p +y(b)s(eha)m(vior],)30 b(page)h(61.)0 2903 y Fn(update)e([)p Fo(options)t Fn(])g([)p Fo(\014les)t Fh(:)15 b(:)g(:)o 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 -(123.)480 3201 y Fn(-A)384 b Fs(Reset)38 b(an)m(y)f(stic)m(ky)h +(125.)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(6.7)i([Stic)m(ky)e(tags],) -j(page)e(52)960 3326 y(and)30 b(Chapter)g(16)h([Keyw)m(ord)f -(substitution],)f(page)i(79.)480 3500 y Fn(-D)f Fo(date)183 +j(page)e(54)960 3326 y(and)30 b(Chapter)g(16)h([Keyw)m(ord)f +(substitution],)f(page)i(81.)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 3624 y(tions],)30 b(page)h(94.)480 3798 y Fn(-d)384 +(op-)960 3624 y(tions],)30 b(page)h(96.)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(123.)480 3972 y Fn(-f)384 +(date)e(options],)g(page)h(125.)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 4097 -y(page)31 b(94.)480 4271 y Fn(-I)f Fo(ign)232 b Fs(More)45 +y(page)31 b(96.)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 -4395 y(page)31 b(113.)480 4569 y Fn(-j)f Fo(rev)230 b +4395 y(page)31 b(115.)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(123.)480 4743 y Fn(-k)e Fo(k\015ag)165 +(date)e(options],)g(page)i(125.)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(16.4)h([Substitution)c(mo)s(des],)960 -4868 y(page)31 b(81.)480 5042 y Fn(-l)384 b Fs(Lo)s(cal;)45 +4868 y(page)31 b(83.)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(8)h([Recursiv)m(e)960 5166 -y(b)s(eha)m(vior],)30 b(page)h(59.)480 5340 y Fn(-P)384 +y(b)s(eha)m(vior],)30 b(page)h(61.)480 5340 y Fn(-P)384 b Fs(Prune)29 b(empt)m(y)i(directories.)40 b(See)30 b(Chapter)g(14)h -([Mo)m(ving)g(directories],)f(page)h(75.)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 +([Mo)m(ving)g(directories],)f(page)h(77.)p eop +%%Page: 137 139 +137 138 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(137)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 -491 y([up)s(date)e(options],)g(page)h(123.)480 665 y +491 y([up)s(date)e(options],)g(page)h(125.)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(8)h([Recursiv)m(e)g(b)s(eha)m(vior],)g(page)h(59.) +b(See)24 b(Chapter)f(8)h([Recursiv)m(e)g(b)s(eha)m(vior],)g(page)h(61.) 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 964 -y(page)31 b(94.)480 1139 y Fn(-W)f Fo(sp)s(ec)184 b Fs(More)31 +y(page)31 b(96.)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(113.)0 1313 y Fn(watch)e([on|off|add|remove])c([)p +h(page)h(115.)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(5.6.1)i -([Setting)e(a)g(w)m(atc)m(h],)480 1562 y(page)31 b(40.)480 +([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(5.6.2)i -([Getting)f(Noti\014ed],)480 1836 y(page)31 b(40.)480 +([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(5.6.3)j([Editing)28 b(\014les],)i(page)h -(42.)480 2309 y Fn(-l)384 b Fs(Lo)s(cal;)45 b(run)39 +(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(8)h([Recursiv)m(e)960 2434 -y(b)s(eha)m(vior],)30 b(page)h(59.)0 2608 y Fn(watchers)d([)p +y(b)s(eha)m(vior],)30 b(page)h(61.)0 2608 y Fn(watchers)d([)p Fo(options)t Fn(])h([)p Fo(\014les)t Fh(:)15 b(:)g(:)p 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(5.6.4)i([W)-8 b(atc)m(h)33 b(information],)c(page) -i(43.)480 2907 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(8)h([Recursiv)m(e)960 3031 -y(b)s(eha)m(vior],)30 b(page)h(59.)p eop -%%Page: 136 138 -136 137 bop 0 -116 a Fs(136)2366 b(CVS|Concurren)m(t)29 +y(b)s(eha)m(vior],)30 b(page)h(61.)p eop +%%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)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 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 @@ -8655,8 +8961,8 @@ b(Y)-8 b(ou)37 b(can)g(use)g Fr(cvs)f Fs(in)g(a)h(limited)e(fashion)h (without)g(an)m(y)h(of)h(them,)g(but)f(if)f(they)h(are)g(set)h(up)0 1010 y(prop)s(erly)24 b(they)j(can)g(help)e(mak)m(e)j(life)d(easier.)40 b(F)-8 b(or)27 b(a)g(discussion)d(of)j(ho)m(w)f(to)i(edit)e(them,)h -(See)g(Section)g(3.3)h([In)m(tro)0 1135 y(administrativ)m(e)h -(\014les],)h(page)h(17.)125 1413 y(The)38 b(most)h(imp)s(ortan)m(t)f +(See)g(Section)g(3.4)h([In)m(tro)0 1135 y(administrativ)m(e)h +(\014les],)h(page)h(20.)125 1413 y(The)38 b(most)h(imp)s(ortan)m(t)f (of)h(these)g(\014les)e(is)h(the)h(`)p Fn(modules)p Fs(')e(\014le,)j (whic)m(h)e(de\014nes)g(the)g(mo)s(dules)f(inside)g(the)0 1537 y(rep)s(ository)-8 b(.)0 2023 y Fm(C.1)68 b(The)30 @@ -8709,8 +9015,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: 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)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 @@ -8781,9 +9087,9 @@ 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: 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 +%%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 Fm(C.2)68 b(The)30 b(cvswrapp)t(ers)g(\014le)125 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 @@ -8814,7 +9120,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(17)h -([Binary)f(\014les],)g(page)h(83,)g(for)f(more)h(on)f(binary)f +([Binary)f(\014les],)g(page)h(85,)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 @@ -8849,8 +9155,8 @@ 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: 140 142 -140 141 bop 0 -116 a Fs(140)2366 b(CVS|Concurren)m(t)29 +%%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(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 @@ -8873,7 +9179,7 @@ b(If)26 b(CVS)g(erroneously)f(thinks)g(a)h(\014le)g(is)0 (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(104\).)125 +(A.7.1)0 1819 y([commit)g(options],)f(page)h(106\).)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 @@ -8883,7 +9189,7 @@ 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 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 +(C.1)g([mo)s(dules],)f(page)i(139\).)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 3929 y(There)h(are)g(three)h(kind)e @@ -8903,10 +9209,10 @@ b(the)f(log)g(message,)h(and)f(p)s(ossibly)d(v)m(erify)i(that)h(it)480 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 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 -(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 +(150\).)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)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 @@ -8914,7 +9220,7 @@ 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 +(150\).)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 1031 y(and)32 b(some)h(additional)d(information)h(and)h @@ -8959,8 +9265,8 @@ Fs(')e(\014le)h(consists)g(of)h(a)g(regular)g(expression)e(and)i(a)0 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)p eop -%%Page: 142 144 -142 143 bop 0 -116 a Fs(142)2366 b(CVS|Concurren)m(t)29 +%%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(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 @@ -8982,7 +9288,7 @@ 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(3.6)g([Remote)h(rep)s(ositories],)d(page)i(19\).)0 +f(\(see)i(Section)g(3.7)g([Remote)h(rep)s(ositories],)d(page)i(22\).)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) @@ -9015,9 +9321,9 @@ b(.)125 4939 y(If)30 b(the)g(rep)s(ository)g(name)g(do)s(es)h(not)f 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.)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 +%%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)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 @@ -9050,159 +9356,160 @@ 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 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(151\))p eop -%%Page: 144 146 -144 145 bop 0 -116 a Fs(144)2366 b(CVS|Concurren)m(t)29 +-5 b(ariables],)25 b(page)h(153\))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)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(93\).)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 +(page)h(95\).)49 b(See)33 b(Section)g(C.5)g([v)m(erifymsg],)0 +491 y(page)e(144,)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) +b(log)g(messages.)125 771 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 +Fs(')d(\014le)0 895 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 +b(program)i(could)f(b)s(e)h(a)g(custom-made)0 1020 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 +1144 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 +1424 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 +(the)h(en)m(vironmen)m(t)f(v)-5 b(ariable)0 1548 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 +b(ariable)32 b Fn($EDITOR)f Fs(is)0 1673 y(used)h(instead.)49 +b(If)33 b(that)h(v)-5 b(ariable)32 b(is)g(not)i(set)g(a)f(default)g +(will)d(b)s(e)j(used.)49 b(See)33 b(Section)g(2.2)i([Committing)d(y)m +(our)0 1797 y(c)m(hanges],)g(page)f(9.)125 2077 y(The)g(`)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 2201 y(sp)s(ecify)e(a)i(log)f(message)i(template.)125 +2481 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 2605 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 2730 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 3009 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 +3134 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 3259 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 +3538 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 3663 y(line)f(is)g(used,)h(if)f(it)h(is)g(sp) +s(eci\014ed.)125 3942 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 +4222 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 4346 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 4471 y(instead.)0 4936 y Fk(C.6.1)62 +b(Editinfo)30 b(example)125 5215 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 +5340 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-)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(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 +491 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 753 y Fn(BugId:)125 +1036 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 +1299 y Fn(#!/bin/sh)240 1402 y(#)240 1506 y(#)334 b(bugid.edit)45 +b(filename)240 1610 y(#)240 1714 y(#)95 b(Call)47 b($EDITOR)f(on)h +(FILENAME,)e(and)i(verify)f(that)h(the)240 1818 y(#)95 +b(resulting)45 b(file)i(contains)f(a)h(valid)f(bugid)h(on)g(the)g +(first)240 1921 y(#)95 b(line.)240 2025 y(if)47 b([)h("x$EDITOR")d(=)i +("x")g(];)g(then)g(EDITOR=vi;)e(fi)240 2129 y(if)i([)h("x$CVSEDITOR")c +(=)j("x")g(];)g(then)g(CVSEDITOR=$EDITOR;)c(fi)240 2233 +y($CVSEDITOR)i($1)240 2336 y(until)h(head)h(-1|grep)f('^BugId:[)f +(]*[0-9][0-9]*$')f(<)j($1)240 2440 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 2544 y(read)h(ans)431 2648 y(case)g(${ans})f(in)622 +2752 y(n*\))h(exit)f(1;;)431 2855 y(esac)431 2959 y($CVSEDITOR)f($1)240 +3063 y(done)125 3346 y Fs(The)29 b(`)p Fn(editinfo)p +Fs(')g(\014le)g(con)m(tains)i(this)e(line:)240 3608 y +Fn(^tc)238 b(/usr/cvssupport/bugid.ed)o(it)125 3891 y +Fs(The)29 b(`)p Fn(rcsinfo)p Fs(')g(\014le)h(con)m(tains)g(this)g +(line:)240 4153 y Fn(^tc)238 b(/usr/cvssupport/tc.templ)o(ate)0 +4683 y Fm(C.7)68 b(Loginfo)125 4966 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 4685 y(on)f(a)g(line)e(is)g(a)i +b(The)28 b(\014rst)g(en)m(try)0 5091 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 -4809 y(to,)30 b(relativ)m(e)f(to)g(the)g Fn($CVSROOT)p +5215 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 4934 +(of)h(the)h(line)e(is)h(a)h(\014lter)e(program)0 5340 y(that)k(should)d(exp)s(ect)j(log)g(information)d(on)j(its)e(standard)h -(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 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 -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 +(input.)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(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 +491 y(line)f(is)g(used,)h(if)f(it)h(is)g(sp)s(eci\014ed.)125 +785 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 909 y(\014rst)d(matc)m(hing)g(regular)g +(expression)f(or)h(`)p Fn(DEFAULT)p Fs('.)125 1203 y(The)f(\014rst)h +(matc)m(hing)g(regular)g(expression)f(is)h(used.)125 +1497 y(See)g(Section)g(C.3)h([commit)g(\014les],)e(page)i(142,)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 1791 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 1915 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 +2040 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 2378 y Fn(s)432 b Fs(\014le)29 b(name)0 2592 +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 2806 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 3145 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 3269 y(\014elds)k(are)i(still)d +(pro)m(vided\).)125 3563 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 3778 y(The)37 b(output)g(will)e(b)s(e)i(a)h +Fn(\045{sVv})p Fs('.)125 3857 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 3903 y(the)29 b(\014rst)f(tok)m(en)h(will)d(b)s(e)i(the) +b(,)39 b(the)0 3981 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 4027 y(the)j +(will)d(b)s(e)i(comma-delimited)g(lists)f(of)0 4106 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 4152 y(`)p Fn(\045{sVv})p +Fs(')e(is)i(the)h(rep)s(ository)-8 b(,)0 4230 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 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 +Fs(\))f(w)m(ere)i(mo)s(di\014ed,)f(the)0 4355 y(output)30 +b(migh)m(t)g(b)s(e:)240 4628 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 4922 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 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 5340 y(serv)m(er\))31 -b(side,)f(not)g(the)h(clien)m(t)f(side)f(\(see)i(Section)g(3.6)g -([Remote)h(rep)s(ositories],)d(page)i(19\).)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 +b(side,)f(not)g(the)h(clien)m(t)f(side)f(\(see)i(Section)g(3.7)g +([Remote)h(rep)s(ositories],)d(page)i(22\).)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)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 @@ -9244,8 +9551,8 @@ o(g)42 b(2>&1)125 5215 y Fs(This)c(will)g(cause)j(c)m(hec)m(kins)g(to)h 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 +%%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.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) @@ -9253,7 +9560,7 @@ 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) +f(143.)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 @@ -9271,7 +9578,7 @@ Fn(ALL)p Fs(')f(app)s(earing)g(as)h(a)g(regular)f(expression)g(are)h 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 +(page)g(144,)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 @@ -9290,7 +9597,7 @@ b(are)j(all)d(the)i(ob)5 b(ject)36 b(\014les)d(that)i(y)m(ou)g(get)h 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 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(125\).)125 +(\(see)g(Section)f(A.18.2)i([up)s(date)e(output],)h(page)g(127\).)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 4689 y Fn(import)h Fs(and)g @@ -9305,9 +9612,9 @@ Fr(cvs)h Fs(ad-)180 5091 y(ministration,)f(or)h(with)e(other)i(common)g (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:)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 +%%Page: 151 153 +151 152 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(151)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 @@ -9359,11 +9666,11 @@ 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 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 4568 y(\(see)34 b(Section)f(A.10)h -([history],)g(page)g(110\).)50 b(This)31 b(\014le)i(m)m(ust)g(b)s(e)f +([history],)g(page)g(112\).)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 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(3.5)h -([Creating)0 4817 y(a)g(rep)s(ository],)f(page)h(18\).)125 +(used)g(to)i(set)f(up)f(the)h(rep)s(ository)f(\(see)h(Section)g(3.6)h +([Creating)0 4817 y(a)g(rep)s(ository],)f(page)h(21\).)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 5215 y(generally)31 @@ -9371,8 +9678,8 @@ 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 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 +%%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 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 @@ -9388,8 +9695,8 @@ 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 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 1413 y(\(see)27 b(Section)e(3.6.3)j([P)m -(assw)m(ord)e(authen)m(ticated],)h(page)g(21\))g(is)d(in)h(used;)h +(expansion)g(if)g(pserv)m(er)0 1413 y(\(see)27 b(Section)e(3.7.3)j([P)m +(assw)m(ord)e(authen)m(ticated],)h(page)g(24\))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 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 @@ -9412,12 +9719,12 @@ b(See)37 b(Chapter)f(3)h([Rep)s(ository],)h(page)g(13,)h(for)e(a)480 (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(93,)h(for)e(a)h(description)d +([Global)480 2897 y(options],)d(page)h(95,)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(93,)h(for)e(ho)m(w)g(to)h(sp)s +b(A.3)h([Global)f(options],)g(page)h(95,)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 3903 y(If)i(y)m(ou)h(w)m(an)m @@ -9432,7 +9739,7 @@ b(o)29 b(set)g(a)f(user)g(v)-5 b(ariable,)28 b(sp)s(ecify)f(the)h (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 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(91\).) +Fs(')g(\(see)h(Section)f(A.2)h([)p Fn(~)p Fs(/.cvsrc],)h(page)f(93\).) 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 4675 y(a)43 b(user)f(v)-5 @@ -9446,21 +9753,21 @@ 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 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 +%%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)0 230 y Fp(App)t(endix)30 b(D)80 b(All)32 b(en)l(vironmen)l(t)c +b(153)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 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 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 1341 y(tion)30 -b(C.9)h([cvsignore],)g(page)g(148.)0 1523 y Fn($CVSWRAPPERS)480 +b(C.9)h([cvsignore],)g(page)g(150.)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 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 +b(page)g(141.)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 2078 y(directory)23 b(read-only)-8 b(.)38 b(When)24 b(this)e(is)h(not)g @@ -9483,31 +9790,31 @@ b Fr(cvs)e Fs(stores)i(the)f(appropriate)f(ro)s(ot)h(\(in)f(the)480 (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 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 -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 +y Fs(Sp)s(eci\014es)34 b(the)h(program)g(to)h(use)g(for)f(recording)f +(log)i(messages)g(during)d(commit.)56 b Fn($CVSEDITOR)480 +3686 y Fs(o)m(v)m(errides)30 b Fn($EDITOR)p Fs(.)39 b(See)31 +b(Section)f(2.2)h([Committing)f(y)m(our)g(c)m(hanges],)i(page)f(9.)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(93,)i(for)d(a)h(description)d(of)i(ho)m(w)h(to)g(sp)s(ecify)d +b(page)f(95,)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 5034 y(Windo)m(ws-NT\).)i(see)h(Section)f(A.2)i -([)p Fn(~)p Fs(/.cvsrc],)f(page)g(91)0 5215 y Fn($CVS_RSH)96 +([)p Fn(~)p Fs(/.cvsrc],)f(page)g(93)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(3.6.2)h -([Connecting)e(via)g(rsh],)g(page)h(20.)p eop -%%Page: 152 154 -152 153 bop 0 -116 a Fs(152)2366 b(CVS|Concurren)m(t)29 +5340 y(is)29 b(sp)s(eci\014ed.)39 b(see)31 b(Section)g(3.7.2)h +([Connecting)e(via)g(rsh],)g(page)h(23.)p eop +%%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)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 @@ -9515,16 +9822,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(3.6.2)j([Connecting)d(via)g(rsh],)f(page)i(20)0 +b(see)31 b(Section)f(3.7.2)j([Connecting)d(via)g(rsh],)f(page)i(23)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(3.6.3.2)j([P)m(assw)m -(ord)e(authen)m(tication)g(clien)m(t],)f(page)h(23)0 +Fn($HOME/.cvspass)p Fs('.)c(see)31 b(Section)f(3.7.3.2)j([P)m(assw)m +(ord)e(authen)m(tication)g(clien)m(t],)f(page)h(26)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(3.6.4)480 1624 y([Kerb)s(eros)30 -b(authen)m(ticated],)h(page)g(25)0 1817 y Fn($CVS_RCMD_PORT)480 +(eros.)54 b(see)35 b(Section)g(3.7.4)480 1624 y([Kerb)s(eros)30 +b(authen)m(ticated],)h(page)g(28)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 @@ -9556,7 +9863,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(93,)480 +b(See)32 b(Section)g(A.3)h([Global)e(options],)i(page)g(95,)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 @@ -9567,10 +9874,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: 153 155 -153 154 bop 0 -116 a Fs(App)s(endix)28 b(D:)j(All)e(en)m(vironmen)m(t)h +%%Page: 155 157 +155 156 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(153)125 366 y Fr(cvs)27 b Fs(in)m(v)m(ok)m(es)i Fr(r)n(cs)e +b(155)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 @@ -9591,49 +9898,147 @@ 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: 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: 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 -(decimal)e(in)m(tegers.)61 b(See)0 1313 y(Section)40 -b(6.1)i([Revision)e(n)m(um)m(b)s(ers],)i(page)f(45.)73 -b(That)40 b(is)g(not)h(the)g(whole)f(truth,)i(ho)m(w)m(ev)m(er.)73 -b(F)-8 b(or)42 b(e\016ciency)0 1437 y(reasons)32 b Fr(cvs)f -Fs(sometimes)h(inserts)e(an)i(extra)h(0)f(in)e(the)i(second)g(righ)m -(tmost)g(p)s(osition)e(\(1.2.3)k(b)s(ecomes)e(1.2.0.3,)0 -1562 y(8.9.10.11.12)j(b)s(ecomes)c(8.9.10.11.0.12)k(and)30 -b(so)h(on\).)125 1836 y Fr(cvs)j Fs(do)s(es)i(a)g(prett)m(y)h(go)s(o)s -(d)f(job)f(at)i(hiding)c(these)k(so)f(called)f(magic)h(branc)m(hes,)h -(but)e(in)g(a)h(few)g(places)g(the)0 1961 y(hiding)28 -b(is)h(incomplete:)75 2234 y Fq(\017)60 b Fs(The)30 b(magic)g(branc)m -(h)g(n)m(um)m(b)s(er)f(app)s(ears)h(in)f(the)i(output)f(from)f -Fn(cvs)h(log)p Fs(.)75 2384 y Fq(\017)60 b Fs(Y)-8 b(ou)31 -b(cannot)g(sp)s(ecify)e(a)i(sym)m(b)s(olic)d(branc)m(h)i(name)h(to)g -Fn(cvs)e(admin)p Fs(.)125 2683 y(Y)-8 b(ou)24 b(can)g(use)g(the)g -Fn(admin)e Fs(command)i(to)g(reassign)g(a)g(sym)m(b)s(olic)e(name)i(to) -h(a)f(branc)m(h)f(the)h(w)m(a)m(y)h Fr(r)n(cs)e Fs(exp)s(ects)h(it)0 -2807 y(to)e(b)s(e.)37 b(If)20 b Fn(R4patches)f Fs(is)h(assigned)g(to)i -(the)f(branc)m(h)g(1.4.2)h(\(magic)g(branc)m(h)e(n)m(um)m(b)s(er)g -(1.4.0.2\))k(in)c(\014le)g(`)p Fn(numbers.c)p Fs(')0 -2932 y(y)m(ou)31 b(can)f(do)h(this:)240 3185 y Fn($)47 -b(cvs)g(admin)g(-NR4patches:1.4.2)c(numbers.c)125 3459 -y Fs(It)25 b(only)g(w)m(orks)g(if)f(at)j(least)e(one)h(revision)e(is)g -(already)h(committed)h(on)f(the)h(branc)m(h.)38 b(Be)26 -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: 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: 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 +157 158 bop 0 -116 a Fs(App)s(endix)28 b(E:)i(T)-8 b(roublesho)s(oting) +2586 b(157)0 366 y Fp(App)t(endix)30 b(E)81 b(T)-13 b(roublesho)t +(oting)0 852 y Fm(E.1)68 b(P)l(artial)32 b(list)g(of)e(error)h +(messages)125 1126 y Fs(Here)21 b(is)g(a)h(partial)e(list)g(of)h(error) +g(messages)i(that)f(y)m(ou)f(ma)m(y)h(see)g(from)f Fr(cvs)p +Fs(.)37 b(It)21 b(is)g(not)g(a)h(complete)g(list|)p Fr(cvs)d +Fs(is)0 1251 y(capable)27 b(of)g(prin)m(ting)e(man)m(y)-8 +b(,)29 b(man)m(y)e(error)f(messages,)j(often)f(with)e(parts)g(of)i +(them)f(supplied)c(b)m(y)k(the)g(op)s(erating)0 1375 +y(system,)k(but)e(the)i(in)m(ten)m(tion)f(is)f(to)i(list)e(the)i +(common)g(and/or)f(p)s(oten)m(tially)f(confusing)g(error)h(messages.) +125 1649 y(The)i(messages)h(are)g(alphab)s(etical,)e(but)h(in)m(tro)s +(ductory)g(text)h(suc)m(h)f(as)h(`)p Fn(cvs)d(update:)e +Fs(')33 b(is)e(not)i(considered)0 1774 y(in)c(ordering)g(them.)125 +2048 y(In)36 b(some)h(cases)h(the)f(list)f(includes)e(messages)k(prin)m +(ted)e(b)m(y)h(old)f(v)m(ersions)g(of)h Fr(cvs)f Fs(\(partly)h(b)s +(ecause)g(users)0 2172 y(ma)m(y)31 b(not)g(b)s(e)e(sure)h(whic)m(h)f(v) +m(ersion)h(of)g Fr(cvs)g Fs(they)g(are)h(using)e(at)i(an)m(y)g +(particular)e(momen)m(t\).)0 2463 y Fn(cvs)g([server)g(aborted]:)f +(received)g(broken)g(pipe)i(signal)480 2588 y Fs(This)h(message)k +(seems)e(to)h(b)s(e)e(caused)i(b)m(y)f(a)g(hard-to-trac)m(k-do)m(wn)i +(bug)d(in)g Fr(cvs)g Fs(or)i(the)f(systems)480 2712 y(it)c(runs)e(on)j +(\(w)m(e)g(don't)f(kno)m(w|w)m(e)g(ha)m(v)m(en't)i(trac)m(k)m(ed)g(it)e +(do)m(wn)f(y)m(et!\).)42 b(It)30 b(seems)f(to)h(happ)s(en)e(only)480 +2837 y(after)c(a)f Fr(cvs)g Fs(command)g(has)g(completed,)i(and)d(y)m +(ou)i(should)d(b)s(e)i(able)g(to)h(just)e(ignore)h(the)h(message.)480 +2961 y(Ho)m(w)m(ev)m(er,)39 b(if)34 b(y)m(ou)h(ha)m(v)m(e)i(disco)m(v)m +(ered)e(information)f(concerning)g(its)h(cause,)i(please)e(let)g(us)g +(kno)m(w)480 3086 y(as)c(describ)s(ed)d(in)59 b([BUGS],)32 +b(page)f(3.)0 3245 y Fn(cannot)e(open)g(CVS/Entries)e(for)j(reading:)e +(No)i(such)f(file)g(or)h(directory)480 3369 y Fs(This)35 +b(generally)g(indicates)h(a)h Fr(cvs)e Fs(in)m(ternal)g(error,)j(and)e +(can)h(b)s(e)f(handled)e(as)j(with)e(other)i Fr(cvs)480 +3494 y Fs(bugs)28 b(\(see)57 b([BUGS],)30 b(page)f(3\).)41 +b(Usually)26 b(there)j(is)e(a)i(w)m(ork)-5 b(around|the)28 +b(exact)i(nature)e(of)g(whic)m(h)480 3618 y(w)m(ould)h(dep)s(end)g(on)h +(the)h(situation)e(but)h(whic)m(h)f(hop)s(efully)e(could)j(b)s(e)f +(\014gured)h(out.)0 3777 y Fn(cvs)f([update)g(aborted]:)f(could)h(not)g +(patch)g Fo(\014le)5 b Fn(:)29 b(No)h(such)f(file)h(or)f(directory)480 +3902 y Fs(This)f(means)h(that)h(there)f(w)m(as)h(a)g(problem)e +(\014nding)f(the)i Fn(patch)f Fs(program.)40 b(Mak)m(e)31 +b(sure)e(that)h(it)f(is)480 4026 y(in)k(y)m(our)h Fn(PATH)p +Fs(.)50 b(Note)35 b(that)g(despite)e(app)s(earances)h(the)g(message)h +(is)e Fo(not)j Fs(referring)d(to)i(whether)480 4151 y(it)30 +b(can)h(\014nd)d Fo(\014le)p Fs(.)0 4309 y Fn(cvs)h(update:)g(could)g +(not)g(patch)g Fo(\014le)5 b Fn(;)30 b(will)f(refetch)480 +4434 y Fs(This)j(means)h(that)h(for)f(whatev)m(er)h(reason)g(the)g +(clien)m(t)f(w)m(as)h(unable)e(to)i(apply)e(a)i(patc)m(h)g(that)g(the) +480 4559 y(serv)m(er)d(sen)m(t.)41 b(The)30 b(message)h(is)f(nothing)f +(to)i(b)s(e)f(concerned)g(ab)s(out,)g(b)s(ecause)h(inabilit)m(y)c(to)k +(apply)480 4683 y(the)g(patc)m(h)g(only)e(slo)m(ws)h(things)f(do)m(wn)h +(and)g(has)g(no)g(e\013ect)i(on)e(what)h Fr(cvs)e Fs(do)s(es.)0 +4842 y Fn(dying)g(gasps)g(from)g Fo(serv)m(er)37 b Fn(unexpected)480 +4966 y Fs(This)31 b(message)k(seems)e(to)h(b)s(e)e(caused)i(b)m(y)f(a)g +(hard-to-trac)m(k-do)m(wn)i(bug)d(in)g Fr(cvs)g Fs(or)i(the)f(systems) +480 5091 y(it)f(runs)e(on)i(\(w)m(e)h(don't)f(kno)m(w|w)m(e)h(ha)m(v)m +(en't)g(trac)m(k)m(ed)h(it)e(do)m(wn)f(y)m(et!\).)48 +b(If)32 b(y)m(ou)g(see)h(it,)f(y)m(ou)h(prob-)480 5215 +y(ably)i(can)i(just)f(retry)g(the)h(op)s(eration)e(whic)m(h)g(failed,)i +(or)f(if)g(y)m(ou)g(ha)m(v)m(e)i(disco)m(v)m(ered)f(information)480 +5340 y(concerning)30 b(its)g(cause,)h(please)f(let)g(us)g(kno)m(w)g(as) +h(describ)s(ed)d(in)60 b([BUGS],)31 b(page)g(3.)p eop +%%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 Fn(end)f(of)h(file)f(from)h +(server)e(\(consult)g(above)h(messages)f(if)i(any\))480 +491 y Fs(The)h(most)h(common)g(cause)g(for)f(this)f(message)j(is)e(if)f +(y)m(ou)i(are)g(using)e(an)h(external)h Fn(rsh)e Fs(program)480 +616 y(and)22 b(it)g(exited)g(with)f(an)i(error.)37 b(In)22 +b(this)g(case)h(the)g Fn(rsh)e Fs(program)i(should)d(ha)m(v)m(e)k(prin) +m(ted)d(a)i(message,)480 740 y(whic)m(h)i(will)f(app)s(ear)i(b)s(efore) +g(the)h(ab)s(o)m(v)m(e)h(message.)40 b(F)-8 b(or)28 b(more)e +(information)f(on)i(setting)f(up)g(a)h Fr(cvs)480 865 +y Fs(clien)m(t)j(and)g(serv)m(er,)h(see)g(Section)f(3.7)h([Remote)h +(rep)s(ositories],)d(page)j(22.)0 1039 y Fn(cvs)d(commit:)g(Executing)f +('mkmodules')480 1163 y Fs(This)g(means)i(that)h(y)m(our)f(rep)s +(ository)f(is)g(set)h(up)f(for)h(a)h(v)m(ersion)e(of)h +Fr(cvs)f Fs(prior)g(to)h Fr(cvs)f Fs(1.8.)42 b(When)480 +1288 y(using)29 b Fr(cvs)g Fs(1.8)j(or)e(later,)h(the)f(ab)s(o)m(v)m(e) +i(message)f(will)d(b)s(e)i(preceded)g(b)m(y)720 1417 +y Fn(cvs)47 b(commit:)f(Rebuilding)f(administrative)f(file)i(database) +480 1566 y Fs(If)28 b(y)m(ou)g(see)h(b)s(oth)e(messages,)j(the)e +(database)h(is)e(b)s(eing)f(rebuilt)g(t)m(wice,)j(whic)m(h)e(is)g +(unnecessary)h(but)480 1691 y(harmless.)39 b(If)29 b(y)m(ou)h(wish)e +(to)j(a)m(v)m(oid)f(the)g(duplication,)e(and)h(y)m(ou)h(ha)m(v)m(e)h +(no)e(v)m(ersions)g(of)h Fr(cvs)f Fs(1.7)i(or)480 1815 +y(earlier)j(in)f(use,)i(remo)m(v)m(e)h Fn(-i)30 b(mkmodules)i +Fs(ev)m(ery)k(place)e(it)g(app)s(ears)g(in)g(y)m(our)g +Fn(modules)f Fs(\014le.)52 b(F)-8 b(or)480 1940 y(more)31 +b(information)d(on)i(the)h Fn(modules)d Fs(\014le,)i(see)h(Section)f +(C.1)h([mo)s(dules],)e(page)i(139.)0 2114 y Fn(cvs)e(commit:)g +(Up-to-date)e(check)i(failed)g(for)h(`)p Fo(\014le)5 +b Fn(')480 2239 y Fs(This)30 b(means)i(that)h(someone)g(else)f(has)f +(committed)i(a)f(c)m(hange)h(to)g(that)g(\014le)e(since)g(the)h(last)g +(time)480 2363 y(that)j(y)m(ou)h(did)d(a)i Fn(cvs)30 +b(update)p Fs(.)52 b(So)35 b(b)s(efore)f(pro)s(ceeding)g(with)g(y)m +(our)h Fn(cvs)29 b(commit)k Fs(y)m(ou)j(need)e(to)480 +2488 y Fn(cvs)29 b(update)p Fs(.)68 b(CVS)39 b(will)f(merge)i(the)g(c)m +(hanges)h(that)g(y)m(ou)f(made)g(and)f(the)h(c)m(hanges)h(that)g(the) +480 2612 y(other)29 b(p)s(erson)e(made.)41 b(If)28 b(it)g(do)s(es)g +(not)h(detect)h(an)m(y)f(con\015icts)g(it)f(will)e(rep)s(ort)i(`)p +Fn(M)i(cacErrCodes.h)p Fs(')480 2737 y(and)h(y)m(ou)i(are)f(ready)g(to) +h Fn(cvs)c(commit)p Fs(.)44 b(If)32 b(it)f(detects)i(con\015icts)f(it)g +(will)d(prin)m(t)i(a)h(message)h(sa)m(ying)480 2861 y(so,)g(will)c(rep) +s(ort)j(`)p Fn(C)e(cacErrCodes.h)p Fs(',)f(and)j(y)m(ou)g(need)g(to)h +(man)m(ually)d(resolv)m(e)j(the)f(con\015ict.)45 b(F)-8 +b(or)480 2986 y(more)31 b(details)e(on)h(this)f(pro)s(cess)h(see)h +(Section)g(5.3)g([Con\015icts)f(example],)g(page)h(37.)0 +3160 y Fn(Usage:)e(diff3)g([-exEX3)f([-i)h(|)i(-m])e([-L)g(label1)g(-L) +h(label3]])e(file1)h(file2)g(file3)720 3264 y(Only)47 +b(one)g(of)g([exEX3])f(allowed)480 3413 y Fs(This)38 +b(indicates)h(a)h(problem)e(with)h(the)h(installation)e(of)i +Fn(diff3)e Fs(and)i Fn(rcsmerge)p Fs(.)67 b(Sp)s(eci\014cally)480 +3538 y Fn(rcsmerge)26 b Fs(w)m(as)i(compiled)f(to)i(lo)s(ok)e(for)h +(GNU)h(di\0133,)f(but)f(it)h(is)f(\014nding)f(unix)g(di\0133)h +(instead.)39 b(The)480 3662 y(exact)32 b(text)g(of)g(the)f(message)h +(will)c(v)-5 b(ary)31 b(dep)s(ending)e(on)h(the)i(system.)42 +b(The)31 b(solution)e(is)h(to)i(mak)m(e)480 3787 y(sure)g +Fn(rcsmerge)e Fs(\014nds)h(GNU)i(di\0133.)47 b(Dep)s(ending)31 +b(on)h(ho)m(w)h Fn(rcsmerge)d Fs(w)m(as)j(compiled,)f(it)g(migh)m(t)480 +3912 y(b)s(e)k(su\016cien)m(t)f(to)i(place)f(GNU)h(di\0133)f(in)f(y)m +(our)h Fn(PATH)p Fs(,)h(or)f(it)g(migh)m(t)g(b)s(e)f(necessary)i(to)g +(recompile)480 4036 y Fn(rcsmerge)28 b Fs(or)i(\014nd)f(a)i(binary)e +(distribution)d(of)31 b Fn(rcsmerge)d Fs(whic)m(h)h(lo)s(oks)h(in)f +(the)i Fn(PATH)p Fs(.)0 4210 y Fn(cvs)e(commit:)g(warning:)f(editor)h +(session)f(failed)480 4335 y Fs(This)h(means)j(that)f(the)h(editor)f +(whic)m(h)f Fr(cvs)g Fs(is)g(using)g(exits)h(with)f(a)i(nonzero)f(exit) +g(status.)44 b(Some)480 4459 y(v)m(ersions)36 b(of)g(vi)f(will)f(do)i +(this)f(ev)m(en)i(when)e(there)i(w)m(as)f(not)h(a)f(problem)f(editing)g +(the)h(\014le.)58 b(If)35 b(so,)480 4584 y(p)s(oin)m(t)29 +b(the)i Fr(CVSEDITOR)g Fs(en)m(vironmen)m(t)f(v)-5 b(ariable)29 +b(to)i(a)g(small)e(script)g(suc)m(h)h(as:)720 4713 y +Fn(#!/bin/sh)720 4816 y(vi)47 b($*)720 4920 y(exit)g(0)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)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 @@ -9693,8 +10098,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: 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)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 @@ -9764,9 +10169,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: 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 +%%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)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 @@ -9843,8 +10248,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: 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(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 @@ -9931,9 +10336,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: 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) +%%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)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 @@ -10012,8 +10417,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: 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)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 @@ -10035,9 +10440,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: 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 +%%Page: 165 167 +165 166 bop 0 -116 a Fs(App)s(endix)28 b(F:)j(GNU)g(GENERAL)f(PUBLIC)g +(LICENSE)1730 b(165)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 @@ -10090,8 +10495,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: 164 166 -164 165 bop 0 -116 a Fs(164)2366 b(CVS|Concurren)m(t)29 +%%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)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 @@ -10112,18 +10517,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: 165 167 -165 166 bop 0 -116 a Fs(Index)3541 b(165)0 366 y Fp(Index)0 +%%Page: 167 169 +167 168 bop 0 -116 a Fs(Index)3541 b(167)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(55)0 1095 y(-k)25 b(\(R)n(CS)g(k\015ags\))15 b Fe(.)e(.)g(.)g(.)g +b Ff(57)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(81)0 1320 y Fm(.)0 1453 y Ff(.#)26 b(\014les)17 +b Ff(83)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(126)0 1569 +(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)44 b Ff(128)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(13)0 1686 y(.cshrc,)27 b(setting)f(CVSR)n(OOT)e @@ -10131,7 +10536,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(13)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(91)0 +(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)42 b Ff(93)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(13)0 2034 y(.tcshrc,)26 b(setting)h(CVSR)n @@ -10142,1260 +10547,1343 @@ y Fm(/)0 2392 y Ff(/usr/lo)r(cal/cvsro)r(ot,)30 b(as)c(example)f(rep)r b Ff(13)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(21)0 2867 y(:kserv)n(er:)15 +(.)g(.)g(.)h(.)f(.)g(.)40 b Ff(24)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(25)0 2983 +(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)42 b Ff(28)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 b Ff(13)0 3099 y(:pserv)n(er:)14 b Fe(.)g(.)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(.)h(.)f(.)g(.)g(.)g(.)g(.)41 -b Ff(23)0 3215 y(:serv)n(er:)19 b Fe(.)13 b(.)h(.)f(.)g(.)g(.)g(.)g(.)g +b Ff(26)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(21)0 3441 y Fm(=)0 3573 y Ff(=======)15 b +(.)45 b Ff(24)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(126)0 4157 y Fg(>)0 4290 y Fd(>>>>>>>)18 +g(.)33 b Ff(128)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)11 +b Ff(39)0 4873 y Fm(A)0 5006 y Ff(A)25 b(sample)h(session)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(.)g(.)h(.)f(.)g(.)g(.)g (.)g(.)38 b Ff(9)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(61)2031 846 y(Adding)25 b(a)h(tag)21 b Fe(.)13 b(.)g(.)g(.)g(.)g +b Ff(63)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(48)2031 962 y(Adding)25 b(\014les)7 b Fe(.)13 b(.)h(.)f(.)g(.)g(.) +b Ff(50)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(61)2031 1078 y(Admin)24 b(\(sub)r(command\))17 b +b Ff(63)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(97)2031 1195 y(Administrativ)n(e)25 b(\014les)h(\(in)n(tro\))12 +b Ff(99)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(17)2031 1311 +h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)38 b Ff(20)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(137)2031 1427 y(Administrativ)n(e)25 +(.)g(.)g(.)37 b Ff(139)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(18)2031 +(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)44 b Ff(21)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(142)2031 1660 y(annotate)26 +h(.)f(.)g(.)g(.)g(.)g(.)45 b Ff(144)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(78)2031 1776 y(A)n(tomic)25 b(transactions,)i(lac)n(k)f(of)9 +b Ff(80)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) -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(23)2031 2008 y(authen)n(ticating)26 b(serv)n(er,)g(setting)g(up)19 +(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)35 b Ff(41)2031 1892 y(attic)10 +b Fe(.)k(.)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(.)g +(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)37 +b Ff(17)2031 2008 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(26)2031 2124 +y(authen)n(ticating)26 b(serv)n(er,)g(setting)g(up)19 b Fe(.)13 b(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g -(.)g(.)g(.)46 b Ff(21)2031 2124 y(Author)25 b(k)n(eyw)n(ord)19 +(.)g(.)g(.)46 b Ff(24)2031 2241 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(79)2031 2241 y(Automatically)25 b(ignored)i(\014les)8 +h(.)46 b Ff(81)2031 2357 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(148)2031 2357 +(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)35 b Ff(150)2031 2473 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(96)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(85)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(83)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(55)2031 3100 y(Branc)n(h)26 b(n)n(um)n(b)r(er)15 b -Fe(.)c(.)i(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g +(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)42 b Ff(98)2031 2735 y +Fm(B)2031 2868 y Ff(Base)27 b(directory)-6 b(,)26 b(in)f(CVS)g +(directory)17 b Fe(.)c(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g +(.)g(.)g(.)g(.)h(.)f(.)43 b Ff(20)2031 2984 y(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(87)2031 3100 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(.)42 b Ff(45)2031 3216 y(Branc)n(h)26 b(n)n(um)n(b)r(ers)17 +g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)43 b Ff(85)2031 3216 +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(57)2031 3333 y(Branc)n(h)26 b(n)n(um)n(b)r(er)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(.)h(.)f(.)g(.)g(.)g(.)g(.)g +(.)g(.)42 b Ff(47)2031 3449 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(51)2031 3333 y(Branc)n(h,)26 b(creating)h(a)16 +h(.)43 b Ff(53)2031 3565 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(50)2031 3449 y(Branc)n(h,)26 b(v)n(endor-)c Fe(.)13 +b Ff(52)2031 3681 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(67)2031 3565 y(Branc)n(hes)21 b Fe(.)13 b(.)g(.)g(.)g(.)h(.)f(.)g +b Ff(69)2031 3798 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 3914 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(50)2031 3798 y(Branc)n(hes,)27 b(cop)n(ying)e(c)n(hanges)h(b)r(et) +b Ff(52)2031 4030 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(55)2031 3914 y(Branc)n(hes,)27 b(stic)n(ky)18 +(.)g(.)g(.)49 b Ff(57)2031 4146 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(52)2031 4030 y(Bringing)27 b(a)f(\014le)g(up)e(to)i(date)20 +h(.)45 b Ff(54)2031 4263 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 -4146 y(Bugs,)27 b(kno)n(wn)e(in)g(this)h(man)n(ual)12 +(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)46 b Ff(36)2031 +4379 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 +g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)39 b Ff(3)2031 4495 y(Bugs,)27 b(rep)r(orting)f(\(CVS\))15 b Fe(.)d(.)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(.)42 b Ff(6)2031 4379 y(Bugs,)27 b(rep)r(orting)f(\(man)n +(.)g(.)g(.)42 b Ff(6)2031 4611 y(Bugs,)27 b(rep)r(orting)f(\(man)n (ual\))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(.)48 -b Ff(3)2031 4495 y(builds)21 b Fe(.)13 b(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.) +b Ff(3)2031 4727 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(85)2031 4757 y Fm(C)2031 4890 y Ff(Changes,)27 +h(.)47 b Ff(87)2031 4989 y Fm(C)2031 5122 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(55)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(98)2031 5122 y(c)n(hec)n(k)n(ed)25 +(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)43 b Ff(57)2031 +5238 y(Changing)27 b(a)f(log)g(message)8 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 +(.)g(.)g(.)g(.)35 b Ff(100)2031 5355 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(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(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(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)f +f(.)38 b Ff(149)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(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(140)0 483 y(Chec)n(kin.prog)26 b(\014le,)g(in)g(CVS) +f(directory)8 b Fe(.)14 b(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g +(.)g(.)g(.)g(.)g(.)35 b Ff(19)0 599 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(143)0 715 y(Chec)n(king)26 b(out)f(source)f 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(.)50 -b Ff(9)0 483 y(Chec)n(k)n(out)25 b(\(sub)r(command\))c +b Ff(9)0 831 y(Chec)n(k)n(out)25 b(\(sub)r(command\))c 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(.)50 b Ff(101)0 599 +(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)50 b Ff(103)0 948 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(138)0 715 y(c)n(hec)n(k)n(out,)25 +g(.)g(.)g(.)g(.)h(.)f(.)40 b Ff(140)0 1064 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 1180 y(Chec)n(k)n(out,)26 b(example)10 b Fe(.)i(.)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(.)38 b Ff(9)0 948 y(c)n(ho)r(osing,)27 b(reserv)n(ed)f(or)g +g(.)g(.)g(.)38 b Ff(9)0 1296 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 1413 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(10)0 1180 y(Clien)n(t/Serv)n(er)26 +g(.)g(.)g(.)g(.)g(.)48 b Ff(10)0 1529 y(Clien)n(t/Serv)n(er)26 b(Op)r(eration)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(.)47 -b Ff(19)0 1296 y(Co)26 b(\(sub)r(command\))13 b Fe(.)f(.)h(.)g(.)g(.)g +b Ff(22)0 1645 y(Co)26 b(\(sub)r(command\))13 b Fe(.)f(.)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(.)40 b Ff(101)0 1413 +h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)40 b Ff(103)0 1761 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(127)0 1529 y(Command)24 b(structure)f +f(.)g(.)g(.)g(.)34 b Ff(129)0 1877 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(91)0 1645 y(Commen)n(t)24 b(leader)14 b Fe(.)f(.)h(.)f(.)g(.)g(.)g +b Ff(93)0 1994 y(Commen)n(t)24 b(leader)14 b Fe(.)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(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)40 b Ff(100)0 -1761 y(Commit)25 b(\(sub)r(command\))9 b Fe(.)i(.)i(.)g(.)g(.)g(.)g(.)g +g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)40 b Ff(102)0 +2110 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(.)g(.)36 b Ff(103)0 1877 y(Commit)25 b(\014les)8 b +g(.)g(.)36 b Ff(105)0 2226 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 +h(.)f(.)g(.)g(.)35 b Ff(142)0 2342 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(89)0 2110 y(Commitinfo)22 b Fe(.)13 b(.)g(.)g(.)h(.)f(.)g(.)g(.)g +b Ff(91)0 2459 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)18 b Fe(.)13 +Ff(143)0 2575 y(Committing)25 b(c)n(hanges)18 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(.)45 -b Ff(9)0 2342 y(Common)25 b(options)e Fe(.)13 b(.)g(.)h(.)f(.)g(.)g(.)g +b Ff(9)0 2691 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(94)0 2459 +g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)50 b Ff(96)0 2807 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 +(.)g(.)g(.)g(.)g(.)34 b Ff(143)0 2924 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(87)0 2691 y(COMSPEC)10 b Fe(.)15 b(.)e(.)g(.)g(.)g(.)g(.)h(.)f(.)g +b Ff(89)0 3040 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(.)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 +Ff(154)0 3156 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 +Ff(39)0 3272 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(37)0 -3040 y(Con\015icts)26 b(\(merge)g(example\))21 b Fe(.)13 +g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)43 b Ff(39)0 +3388 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 3505 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 +b Ff(5)0 3621 y(Con)n(tributors)26 b(\(man)n(ual\))16 b Fe(.)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(.)44 -b Ff(2)0 3388 y(Cop)n(ying)26 b(c)n(hanges)11 b Fe(.)j(.)f(.)g(.)g(.)g +b Ff(2)0 3737 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(55)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(98)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(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 -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(18)0 3970 y(Credits)26 b(\(CVS)g(program\))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(.)45 b Ff(5)0 -4086 y(Credits)26 b(\(man)n(ual\))7 b Fe(.)13 b(.)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(.)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 -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(91)0 4435 y(CVS)25 b(passwd)i(\014le)19 +Ff(57)0 3853 y(Correcting)27 b(a)f(log)h(message)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(.)35 b Ff(100)0 +3970 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(52)0 4086 +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(31)0 4202 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(21)0 4318 y(Credits)26 b(\(CVS)g(program\))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(.)45 b +Ff(5)0 4435 y(Credits)26 b(\(man)n(ual\))7 b Fe(.)13 +b(.)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(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.) +34 b Ff(2)0 4551 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(45)0 4667 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(93)0 4783 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(22)0 4551 y(CVS,)26 b(history)f(of)15 b Fe(.)g(.)e(.)g(.)g +g(.)46 b Ff(25)0 4899 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 +b Ff(5)0 5016 y(CVS,)26 b(in)n(tro)r(duction)f(to)7 b Fe(.)14 b(.)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(.)34 -b Ff(5)0 4783 y(CVS,)26 b(v)n(ersions)g(of)14 b Fe(.)g(.)f(.)g(.)g(.)h +b Ff(5)0 5132 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(87)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(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 +Ff(89)0 5248 y(CVS/Base)27 b(directory)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(.)h(.)f(.)41 b Ff(25)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(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(24)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(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(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(.)h(.)f(.)g(.)g(.)g(.)g(.)48 b Ff(20)2031 366 y(CVS/Chec)n +(kin.prog)26 b(\014le)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(.)42 b Ff(19)2031 483 y(CVS/En)n(tries)26 b(\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(.)g(.)g(.)h +(.)40 b Ff(18)2031 599 y(CVS/En)n(tries.Bac)n(kup)26 +b(\014le)14 b Fe(.)g(.)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(.)41 +b Ff(19)2031 715 y(CVS/En)n(tries.Log)27 b(\014le)9 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(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)36 +b Ff(19)2031 831 y(CVS/En)n(tries.Static)27 b(\014le)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(.)h(.)f(.)g(.)g(.)g(.)34 +b Ff(19)2031 948 y(CVS/Notify)26 b(\014le)10 b Fe(.)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(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)37 +b Ff(19)2031 1064 y(CVS/Notify)-6 b(.tmp)24 b(\014le)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(.)47 +b Ff(20)2031 1180 y(CVS/Rep)r(ository)26 b(\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(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)46 +b Ff(18)2031 1296 y(CVS/Ro)r(ot)26 b(\014le)16 b Fe(.)e(.)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(14)2031 1413 y(CVS/T)-6 b(ag)27 b(\014le)19 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(.)38 b Ff(20)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(152)2031 -831 y(CVSEDITOR)22 b Fe(.)13 b(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g +g(.)h(.)45 b Ff(19)2031 1529 y(CVS/T)-6 b(emplate)25 +b(\014le)10 b Fe(.)k(.)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 +(.)g(.)37 b Ff(20)2031 1645 y(CVS/Up)r(date.prog)26 b(\014le)9 +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(.)36 +b Ff(19)2031 1761 y(CVS)p 2192 1761 24 4 v 27 w(CLIENT)p +2515 1761 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(154)2031 1877 y(CVS)p 2192 1877 V 27 +w(CLIENT)p 2515 1877 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(28)2031 1994 y(CVS)p +2192 1994 V 27 w(IGNORE)p 2534 1994 V 27 w(REMOTE)p 2907 +1994 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(154)2031 2110 y(CVS)p +2192 2110 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(27)2031 2226 y(CVS)p 2192 2226 V 27 w(R)n(CMD)p +2458 2226 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(154)2031 2342 y(CVS)p 2192 +2342 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(153)2031 +2459 y(CVS)p 2192 2459 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(23)2031 2575 y(CVS)p 2192 2575 V 27 w(SER)-9 b(VER)p +2529 2575 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(154)2031 2691 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(153)2031 2807 y(CVSEDITOR,)25 b(en)n(vironmen)n(t)f(v)l(ariable)10 +b Fe(.)j(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.) +37 b Ff(9)2031 2924 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(153)2031 +3040 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(150)2031 3156 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(153)2031 3272 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(96)2031 3388 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(.)50 b Ff(151)2031 948 y(CVSEDITOR,)25 -b(en)n(vironmen)n(t)f(v)l(ariable)10 b Fe(.)j(.)g(.)g(.)h(.)f(.)g(.)g -(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)37 b Ff(9)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(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(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(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(94)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(13)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(151)2031 1761 y(CVSR)n(OOT)25 b(\(\014le\))d Fe(.)13 +h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g +(.)g(.)43 b Ff(13)2031 3505 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(153)2031 3621 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(137)2031 1877 y(CVSR)n(OOT,)25 b(en)n(vironmen)n(t)f(v)l(ariable) +b Ff(139)2031 3737 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(13)2031 1994 y(CVSR)n(OOT,)25 b(mo)r(dule)g(name)c +(.)h(.)40 b Ff(13)2031 3853 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 -(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)48 b Ff(17)2031 2110 +(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)48 b Ff(20)2031 3970 y(CVSR)n(OOT,)25 b(m)n(ultiple)g(rep)r(ositories)7 b Fe(.)15 b(.)e(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g -(.)g(.)g(.)34 b Ff(18)2031 2226 y(CVSR)n(OOT,)25 b(o)n(v)n(erriding)11 +(.)g(.)g(.)34 b Ff(21)2031 4086 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(93)2031 2342 y(CVSUMASK)18 b Fe(.)13 b(.)g(.)g(.)g(.)g(.)g(.)h(.)f +Ff(95)2031 4202 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(16)2031 2459 y(CVSWRAPPERS)20 b Fe(.)13 b(.)h(.)f(.)g(.)g(.)g(.)g(.) +Ff(16)2031 4318 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(151)2031 2575 y(cvswrapp)r(ers)26 +(.)f(.)g(.)g(.)g(.)g(.)g(.)49 b Ff(153)2031 4435 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(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 Ff(141)2031 4551 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(141)2031 +4858 y Fm(D)2031 4991 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(79)2031 3248 y(Dates)9 b Fe(.)k(.)g(.)g(.)g(.)h +(.)g(.)h(.)f(.)35 b Ff(81)2031 5108 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(94)2031 3364 y(Decimal)26 -b(revision)g(n)n(um)n(b)r(er)11 b Fe(.)g(.)i(.)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(45)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(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(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(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(.)h(.)f(.)g(.)35 b Ff(96)2031 5224 y(dead)25 +b(state)17 b Fe(.)d(.)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(.)43 b Ff(17)2031 5340 +y(Decimal)26 b(revision)g(n)n(um)n(b)r(er)11 b Fe(.)g(.)i(.)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(47)p eop +%%Page: 169 171 +169 170 bop 0 -116 a Fs(Index)3541 b(169)0 366 y Ff(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(144)0 483 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(146)0 599 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(.)h(.)f(.) +g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)37 b Ff(144)0 +715 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(.)h(.)f(.)g(.)g(.) +g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)45 b Ff(33)0 831 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(17)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(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(63)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(98)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(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(59)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(11)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(106)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(57)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(75)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(65)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(59)2031 5340 y(Disjoin)n(t)26 b(rep)r(ositories)7 +g(.)g(.)g(.)h(.)41 b Ff(20)0 948 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(139)0 1064 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(65)0 1180 y(Deleting)26 b(revisions)9 +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(.)36 +b Ff(100)0 1296 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(54)0 1413 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(61)0 +1529 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(11)0 1645 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(108)0 1761 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(59)0 1877 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(77)0 1994 +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(67)0 2110 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(61)0 2226 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(18)p eop -%%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(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 -729 y Fm(E)0 862 y Ff(edit)26 b(\(sub)r(command\))16 +b Ff(21)0 2342 y(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(147)0 2459 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(37)0 2766 y Fm(E)0 2899 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 978 y(editinfo)26 b(\(admin)f(\014le\))d Fe(.)13 +b Ff(44)0 3015 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(143)0 -1094 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(145)0 +3132 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(18)0 1211 y(Editing)26 +(.)h(.)f(.)g(.)g(.)g(.)g(.)34 b Ff(21)0 3248 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 1327 y(EDITOR)15 b Fe(.)e(.)g(.)g(.)g(.)g(.)g(.)h(.)f +g(.)35 b Ff(33)0 3364 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(151)0 1443 y(Editor,)26 b(a)n(v)n(oiding)h(in)n(v)n(o)r(cation)f +b Ff(153)0 3480 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(96)0 1559 y(EDITOR,)25 +(.)f(.)g(.)g(.)g(.)g(.)g(.)41 b Ff(98)0 3597 y(EDITOR,)25 b(en)n(vironmen)n(t)f(v)l(ariable)c Fe(.)13 b(.)g(.)g(.)g(.)h(.)f(.)g (.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)46 -b Ff(9)0 1676 y(EDITOR,)25 b(o)n(v)n(erriding)14 b Fe(.)g(.)f(.)g(.)g +b Ff(9)0 3713 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(93)0 1792 +g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)41 b Ff(95)0 3829 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(143)0 1908 y(editors)26 b(\(sub)r(command\))17 +g(.)g(.)g(.)g(.)40 b Ff(145)0 3945 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 2024 y(emerge)21 b Fe(.)13 b(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g +b Ff(45)0 4061 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 2141 y(En)n(vironmen)n(t)24 b(v)l(ariables)16 +b Ff(40)0 4178 y(En)n(tries)26 b(\014le,)g(in)g(CVS)f(directory)6 +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(.)33 b Ff(18)0 4294 y(En)n(tries.Bac)n(kup)26 +b(\014le,)g(in)g(CVS)f(directory)7 b Fe(.)13 b(.)g(.)g(.)g(.)h(.)f(.)g +(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)33 b Ff(19)0 4410 y(En)n(tries.Log)27 +b(\014le,)f(in)g(CVS)f(directory)19 b Fe(.)13 b(.)g(.)g(.)g(.)g(.)h(.)f +(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)45 b Ff(19)0 +4526 y(En)n(tries.Static)27 b(\014le,)f(in)f(CVS)h(directory)17 +b Fe(.)c(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)43 +b Ff(19)0 4643 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(151)0 -2257 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(153)0 +4759 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 2373 y(Errors,)27 +g(.)g(.)g(.)g(.)h(.)f(.)36 b Ff(6)0 4875 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 2489 y(Example)25 b(of)h(a)g(w)n(ork-session)e +43 b Ff(3)0 4991 y(Example)25 b(of)h(a)g(w)n(ork-session)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(.)49 b Ff(9)0 2605 +(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)49 b Ff(9)0 5108 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 2722 y(Example,)25 +g(.)g(.)h(.)f(.)g(.)g(.)49 b Ff(37)0 5224 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(55)0 2838 y(Exp)r(ort)25 b(\(sub)r(command\))11 +b Ff(57)0 5340 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(108)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(138)0 3201 y -Fm(F)0 3333 y Ff(F)-6 b(etc)n(hing)25 b(source)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(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)44 -b Ff(9)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(34)0 3566 +g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)38 b Ff(110)2031 +366 y(Exp)r(ort)25 b(program)18 b Fe(.)c(.)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(.)g(.)g(.)45 b Ff(140)2031 605 y +Fm(F)2031 738 y Ff(F)-6 b(etc)n(hing)25 b(source)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(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.) +f(.)g(.)44 b Ff(9)2031 854 y(File)27 b(had)e(con\015icts)h(on)g(merge)8 +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(.)35 b Ff(36)2031 971 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 3682 y(File)27 b(p)r(ermissions)22 b Fe(.)13 +b Ff(35)2031 1087 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(16)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 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(71)0 4031 y(Files,)27 b(reference)g(man)n(ual)6 +b Ff(16)2031 1203 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(35)2031 1319 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(73)2031 1436 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(137)0 -4147 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(139)2031 +1552 y(Fixing)26 b(a)g(log)h(message)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(.) +g(.)g(.)g(.)g(.)h(.)f(.)36 b Ff(100)2031 1668 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(97)2031 1784 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(.)g(.)h(.)f(.)g(.)g(.)38 b Ff(98)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(95)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(148)0 4496 y(F)-6 b(ormat)25 b(of)h(CVS)g(commands)16 +(.)g(.)46 b Ff(150)2031 1900 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(91)0 4742 -y Fm(G)0 4875 y Ff(Getting)26 b(started)18 b Fe(.)c(.)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(.)45 -b Ff(9)0 4991 y(Getting)26 b(the)f(source)16 b Fe(.)e(.)g(.)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(9)0 -5108 y(Global)27 b(cvsignore)11 b Fe(.)j(.)f(.)g(.)g(.)g(.)h(.)f(.)g(.) +(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)43 b Ff(93)2031 2139 +y Fm(G)2031 2272 y Ff(Getting)26 b(started)18 b Fe(.)c(.)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(.)45 +b Ff(9)2031 2388 y(Getting)26 b(the)f(source)16 b Fe(.)e(.)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(.)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(93)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(16)2031 -366 y Fm(H)2031 499 y Ff(Header)26 b(k)n(eyw)n(ord)21 +(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)43 b Ff(9)2031 +2505 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(150)2031 2621 +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(95)2031 2737 +y(Group)14 b Fe(.)f(.)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(.)g(.)g(.)41 +b Ff(16)2031 2976 y Fm(H)2031 3109 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(79)2031 616 y(History)26 b(\(sub)r(command\))19 +h(.)48 b Ff(81)2031 3225 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(110)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(77)2031 -848 y(History)26 b(\014le)18 b Fe(.)c(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h +(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)49 b Ff(112)2031 +3341 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(79)2031 +3457 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(149)2031 964 y(History)26 b(\014les)d Fe(.)13 b(.)g(.)g(.)g(.)g(.)h +Ff(151)2031 3574 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(16)2031 1080 y(History)26 b(of)g(CVS)18 b Fe(.)c(.)f(.)g(.)g(.)g +b Ff(16)2031 3690 y(History)26 b(of)g(CVS)18 b Fe(.)c(.)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(.)46 -b Ff(5)2031 1197 y(HOME)16 b Fe(.)d(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h +b Ff(5)2031 3806 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(151)2031 1313 y(HOMEP)-6 b(A)g(TH)14 b Fe(.)e(.)h(.)g(.)g(.)g(.)g +b Ff(153)2031 3922 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(151)2031 1548 y Fm(I)2031 1680 y Ff(Id)25 b(k)n(eyw)n(ord)19 +b Ff(153)2031 4161 y Fm(I)2031 4294 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(79)2031 1797 y(Iden)n(t)25 +g(.)g(.)g(.)g(.)g(.)h(.)46 b Ff(81)2031 4410 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(80)2031 1913 y(Iden)n(tifying)25 b(\014les)17 +g(.)41 b Ff(82)2031 4526 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(79)2031 2029 y(Ignored)26 b(\014les)18 +(.)g(.)43 b Ff(81)2031 4643 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(148)2031 2145 y(Ignoring)26 b(\014les)d +g(.)g(.)g(.)h(.)44 b Ff(150)2031 4759 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(148)2031 2262 y(Imp)r(ort)24 b(\(sub)r(command\))11 +g(.)g(.)g(.)49 b Ff(150)2031 4875 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(112)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(.)38 b Ff(114)2031 +4991 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 -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 +(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)39 b Ff(31)2031 +5108 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(32)2031 5224 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(67)2031 2727 y(Index)8 b Fe(.)k(.)h(.)g(.)h(.)f(.)g +g(.)g(.)h(.)33 b Ff(69)2031 5340 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(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 +(.)h(.)f(.)g(.)35 b Ff(167)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(Info)c(\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(143)0 483 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(.)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 -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(19)2031 3191 y(In)n(tro)r(duction)25 b(to)h(CVS)15 -b Fe(.)d(.)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(.)42 -b Ff(5)2031 3308 y(In)n(v)n(oking)25 b(CVS)20 b Fe(.)14 +g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)39 b Ff(40)0 +599 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(22)0 715 y(In)n(tro)r(duction)25 +b(to)h(CVS)15 b Fe(.)d(.)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(.)42 b Ff(5)0 831 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(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(77)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(55)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(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(25)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(79)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(79)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(81)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(25)2031 4856 y(Kno)n(wn)25 -b(bugs)h(in)g(this)f(man)n(ual)18 b Fe(.)13 b(.)g(.)h(.)f(.)g(.)g(.)g +48 b Ff(129)0 948 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(79)0 1194 y Fm(J)0 1327 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(57)0 1573 y Fm(K)0 1706 +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(149)0 1822 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(28)0 1939 +y(Keyw)n(ord)25 b(expansion)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(.)42 b Ff(81)0 2055 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(.) -46 b Ff(3)2031 5091 y Fm(L)2031 5224 y Ff(La)n(y)n(out)25 -b(of)i(rep)r(ository)18 b Fe(.)c(.)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(.)45 b Ff(13)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(93)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)13 -b Fe(.)f(.)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(.)39 -b Ff(45)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(114)0 599 -y(List,)26 b(mailing)g(list)18 b Fe(.)c(.)g(.)f(.)g(.)g(.)g(.)g(.)g(.)g +41 b Ff(81)0 2171 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(.)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(83)0 2287 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(28)0 2404 y(Kno)n(wn)25 b(bugs)h(in)g(this)f +(man)n(ual)18 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(.)46 +b Ff(3)0 2650 y Fm(L)0 2783 y Ff(La)n(y)n(out)25 b(of)i(rep)r(ository) +18 b Fe(.)c(.)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(.)45 +b Ff(13)0 2899 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(95)0 +3015 y(Linear)26 b(dev)n(elopmen)n(t)13 b Fe(.)f(.)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(.)39 b Ff(47)0 3132 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(116)0 3248 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 3364 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(.)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(33)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(33)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(34)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(.)40 +b Ff(35)0 3480 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(.)38 b Ff(79)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(33)0 1296 y(lo)r(c)n(ks,)27 +g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)36 +b Ff(35)0 3597 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 3713 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(81)0 3829 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 3945 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 -1413 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 +4061 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(114)0 1529 y(Log)26 b(information,)h +g(.)h(.)f(.)g(.)g(.)g(.)42 b Ff(116)0 4178 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(149)0 1645 y(Log)26 b(k)n(eyw)n(ord)10 b Fe(.)j(.)g(.)g(.)g(.)g(.) +b Ff(151)0 4294 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(79)0 1761 y(Log)26 b(k)n(eyw)n(ord,)g(selecting)h(commen)n(t)c +b Ff(81)0 4410 y(Log)26 b(k)n(eyw)n(ord,)g(selecting)h(commen)n(t)c (leader)6 b Fe(.)15 b(.)e(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)33 -b Ff(100)0 1877 y(Log)26 b(message)h(en)n(try)18 b Fe(.)12 +b Ff(102)0 4526 y(Log)26 b(message)h(en)n(try)18 b Fe(.)12 b(.)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(.)45 -b Ff(9)0 1994 y(Log)26 b(message)h(template)21 b Fe(.)13 +b Ff(9)0 4643 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(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(98)0 2226 y(log)27 b(message,)f(v)n(erifying)10 +(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)49 b Ff(150)0 +4759 y(Log)26 b(message,)h(correcting)9 b Fe(.)15 b(.)e(.)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(100)0 4875 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(142)0 2342 y(Log)26 b(messages)14 b Fe(.)g(.)f(.)g(.)g(.)h(.)f(.)g +Ff(144)0 4991 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(145)0 2459 y(Log)26 b(messages,)h(editing)11 b Fe(.)j(.)f(.)g(.)h(.) +Ff(147)0 5108 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(143)0 2575 y(Login)26 +(.)g(.)g(.)g(.)g(.)h(.)f(.)38 b Ff(145)0 5224 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(23)0 2691 y(loginfo)28 b(\(admin)c(\014le\))c +g(.)46 b Ff(26)0 5340 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(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(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(24)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(38)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(.) -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\))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(.)g(.)h(.)f(.)g(.)g(.)g(.)38 b Ff(45)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(45)0 3945 y(mak)n(e)17 b Fe(.)12 b(.)h(.)g(.)g(.)g +b Ff(147)2031 366 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(155)2031 483 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(27)2031 +744 y Fm(M)2031 877 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)2031 994 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)2031 1110 y(Mailing)27 +b(log)g(messages)7 b Fe(.)14 b(.)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(.)33 b Ff(147)2031 1226 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)2031 +1342 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(87)2031 1458 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(.) -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(85)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(18)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(37)0 4294 y(Merge,)27 b(an)f(example)8 +36 b Ff(21)2031 1575 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)2031 1691 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 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(55)0 -4526 y(Merging)18 b Fe(.)c(.)f(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f +b Ff(37)2031 1807 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(57)2031 +1923 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(55)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(55)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(34)0 4875 y(Merging)27 b(t)n(w)n(o)f(revisions)10 +g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)44 +b Ff(57)2031 2040 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(57)2031 2156 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)2031 2272 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(57)0 4991 y(Mo)r(di\014cations,)28 b(cop)n(ying)d(b)r(et)n(w)n +b Ff(59)2031 2388 y(mkmo)r(dules)14 b Fe(.)e(.)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(.)g(.)g(.)g(.)h(.)41 +b Ff(158)2031 2505 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(55)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(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 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 +b Ff(57)2031 2621 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(140)2031 2737 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(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.) +37 b Ff(33)2031 2853 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(137)2031 366 y(Mo)r(dules)27 b(\014le)21 b Fe(.)13 +b Ff(139)2031 2969 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(17)2031 483 y(Mo)r(dules)27 b(\014le,)f(c)n +g(.)g(.)h(.)47 b Ff(20)2031 3086 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 599 y(Motiv)l(ation)26 b(for)h(branc)n(hes)10 +b Ff(33)2031 3202 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(50)2031 -715 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(75)2031 831 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(71)2031 948 y(Multiple)26 -b(dev)n(elop)r(ers)14 b Fe(.)g(.)f(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h +g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)37 b Ff(52)2031 +3318 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(77)2031 3434 +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(73)2031 +3551 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 3667 +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(.)41 b Ff(33)2031 1064 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(18)2031 1349 y Fm(N)2031 1482 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(79)2031 1598 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(48)2031 1714 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 1831 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 1947 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(34)2031 2063 y(Newsgroups)9 b Fe(.)14 b(.)f(.)g(.)g(.)g(.)h(.)f(.) +g(.)g(.)g(.)g(.)g(.)41 b Ff(21)2031 3929 y Fm(N)2031 +4061 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(81)2031 +4178 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(50)2031 4294 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(36)2031 4410 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 4526 +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(.)h(.)f(.)g(.)g(.)g(.)36 -b Ff(5)2031 2179 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 +(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)42 b Ff(36)2031 +4643 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 4759 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 2296 y(Nro\013)25 b(\(selecting)i(commen)n(t)d(leader\))13 +b Ff(43)2031 4875 y(Notify)26 b(\014le,)g(in)f(CVS)h(directory)20 +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(.)46 b Ff(19)2031 4991 y(Notify)-6 +b(.tmp)24 b(\014le,)i(in)g(CVS)f(directory)12 b Fe(.)i(.)f(.)g(.)g(.)g +(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)39 +b Ff(20)2031 5108 y(Nro\013)25 b(\(selecting)i(commen)n(t)d(leader\))13 b Fe(.)h(.)f(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.) -g(.)40 b Ff(100)2031 2412 y(Num)n(b)r(er,)24 b(branc)n(h)18 +g(.)40 b Ff(102)2031 5224 y(Num)n(b)r(er,)24 b(branc)n(h)18 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(.)45 b Ff(45)2031 2528 y(Num)n(b)r(er,)24 b(revision-)8 +f(.)45 b Ff(47)2031 5340 y(Num)n(b)r(er,)24 b(revision-)8 b Fe(.)13 b(.)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(.) -34 b Ff(45)2031 2813 y Fm(O)2031 2946 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(91)2031 3062 y(Options,)26 -b(global)20 b Fe(.)13 b(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g +34 b Ff(47)p eop +%%Page: 171 173 +171 172 bop 0 -116 a Fs(Index)3541 b(171)0 366 y Fm(O)0 +499 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(.)45 b Ff(93)2031 3178 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(98)2031 3295 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 3411 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(94)2031 3527 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(93)2031 -3643 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(93)2031 3760 y(Ov)n(erriding)25 +g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)34 b Ff(93)0 +616 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(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.) +h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)45 b Ff(95)0 +732 y(Outdating)25 b(revisions)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(.)38 b Ff(100)0 848 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(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)33 b Ff(37)0 +964 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(96)0 1080 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(.)h(.)f(.)g(.)36 b +Ff(95)0 1197 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(95)0 1313 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(93)2031 3876 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(93)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(18)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(22)2031 4526 y(passw)n(ord)27 b(clien)n(t,)f(using)10 +49 b Ff(95)0 1429 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(95)0 1683 y Fm(P)0 1815 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(21)0 1932 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(25)0 2048 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(23)2031 4643 y(passw)n(ord)27 b(serv)n(er,)f(setting)g(up)6 +b Ff(26)0 2164 y(passw)n(ord)27 b(serv)n(er,)f(setting)g(up)6 b Fe(.)12 b(.)i(.)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(21)2031 4759 +(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)33 b Ff(24)0 2280 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(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(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(89)2031 5108 y(Precommit)25 b(c)n(hec)n(king)19 +b Ff(153)0 2397 y(P)n(er-directory)26 b(stic)n(ky)f(tags/dates)12 +b Fe(.)j(.)e(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.) +g(.)g(.)g(.)g(.)39 b Ff(19)0 2513 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(.) +h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f +(.)47 b Ff(145)0 2629 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(91)0 2745 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(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 Ff(143)0 2862 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)0 2978 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(21)p eop -%%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(16)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(79)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(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) -25 b(lo)r(c)n(king)12 b Fe(.)h(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g +b Ff(24)0 3231 y Fm(R)0 3364 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(.)g(.)g(.)h(.)f(.)38 b Ff(33)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(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(93)0 1313 y(R)n(CS\014le)25 b(k)n(eyw)n(ord)15 +g(.)36 b Ff(16)0 3480 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(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g -(.)42 b Ff(79)0 1429 y(rcsinfo)27 b(\(admin)d(\014le\))e +g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g +(.)g(.)h(.)41 b Ff(81)0 3597 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(49)0 3713 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(32)0 3829 +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(35)0 3945 +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(153)0 4061 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(95)0 4178 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(81)0 4294 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(148)0 1545 y(R)n(CSINIT)10 b Fe(.)i(.)h(.)g(.)g(.)h(.)f(.)g(.)g(.) +b Ff(150)0 4410 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(153)0 1662 y(Rdi\013)25 b(\(sub)r(command\))12 b +b Ff(155)0 4526 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(116)0 1778 y(read-only)25 b(\014les,)i(and)e(-r)17 +b Ff(118)0 4643 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(93)0 1894 y(read-only)25 b(\014les,)i(and)e(CVSREAD)6 +b Ff(95)0 4759 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(151)0 2010 y(read-only)25 b(\014les,)i(and)e(w)n +(.)g(.)h(.)f(.)33 b Ff(153)0 4875 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 -2127 y(read-only)25 b(\014les,)i(in)e(rep)r(ository)9 +(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)44 b Ff(42)0 +4991 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(16)0 2243 y(Read-only)25 +(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)35 b Ff(16)0 5108 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(93)0 2359 y(read-only)25 b(rep)r(ository)i +(.)f(.)g(.)g(.)g(.)45 b Ff(95)0 5224 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(26)0 -2475 y(readers)26 b(\(admin)f(\014le\))14 b Fe(.)f(.)g(.)h(.)f(.)g(.)g +(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)37 b Ff(29)0 +5340 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(26)0 2591 y(Recursiv)n(e)25 +g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)41 b Ff(29)2031 366 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(59)0 -2708 y(Reference)26 b(man)n(ual)f(\(\014les\))d Fe(.)14 +f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)43 b Ff(61)2031 +483 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(137)0 2824 y(Reference)26 +(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)49 b Ff(139)2031 599 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(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(127)0 3056 y(regular)27 +Ff(153)2031 715 y(Reference,)26 b(commands)13 b Fe(.)f(.)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(.)40 b Ff(129)2031 831 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(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(118)0 -3289 y(Releases,)27 b(revisions)g(and)e(v)n(ersions)c +b Ff(143)2031 948 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(120)2031 +1064 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(46)0 3405 y(Releasing)27 b(y)n(our)e(w)n(orking) -h(cop)n(y)16 b Fe(.)d(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g -(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)42 b Ff(10)0 3521 -y(Remote)25 b(rep)r(ositories)10 b Fe(.)15 b(.)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(.)37 b Ff(19)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(63)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(57)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(65)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(63)0 4102 y(Remo)n(ving)24 b(y)n(our)i(w)n(orking)g(cop)n(y)8 +(.)g(.)g(.)g(.)47 b Ff(48)2031 1180 y(Releasing)27 b(y)n(our)e(w)n +(orking)h(cop)n(y)16 b Fe(.)d(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g +(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)42 b Ff(10)2031 +1296 y(Remote)25 b(rep)r(ositories)10 b Fe(.)15 b(.)e(.)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(22)2031 1413 +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(.)g(.)h(.)f(.)g +(.)g(.)g(.)g(.)g(.)43 b Ff(65)2031 1529 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(59)2031 1645 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(67)2031 1761 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(65)2031 1877 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(10)0 4219 y(Renaming)25 +g(.)g(.)h(.)f(.)g(.)g(.)34 b Ff(10)2031 1994 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(75)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(71)0 4451 y(Replacing)26 b(a)g(log)h(message)c Fe(.)13 +49 b Ff(77)2031 2110 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(73)2031 2226 y(Replacing)26 b(a)g(log)h(message)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(.)47 b Ff(100)2031 +2342 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)2031 +2459 y(Rep)r(orting)26 b(bugs)f(\(man)n(ual\))7 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(.)49 b Ff(98)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 -b(bugs)f(\(man)n(ual\))7 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 -(.)35 b Ff(3)0 4800 y(Rep)r(ositories,)28 b(m)n(ultiple)11 -b Fe(.)h(.)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(.)38 -b Ff(18)0 4916 y(Rep)r(ositories,)28 b(remote)17 b Fe(.)12 -b(.)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(.)43 -b Ff(19)0 5032 y(Rep)r(ository)26 b(\(in)n(tro\))21 b -Fe(.)13 b(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g +(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)35 b Ff(3)2031 +2575 y(Rep)r(ositories,)28 b(m)n(ultiple)11 b Fe(.)h(.)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(.)38 b Ff(21)2031 2691 y(Rep)r(ositories,)28 +b(remote)17 b Fe(.)12 b(.)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(.) +43 b Ff(22)2031 2807 y(Rep)r(ository)26 b(\(in)n(tro\))21 +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(.)48 -b Ff(13)0 5149 y(Rep)r(ository)-6 b(,)26 b(example)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(.)47 -b Ff(13)0 5265 y(Rep)r(ository)-6 b(,)26 b(ho)n(w)g(data)g(is)g(stored) -20 b Fe(.)13 b(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g -(.)g(.)g(.)g(.)h(.)f(.)46 b Ff(14)2031 366 y(Rep)r(ository)-6 +b Ff(13)2031 2924 y(Rep)r(ository)26 b(\014le,)g(in)g(CVS)f(directory) +12 b Fe(.)h(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f +(.)g(.)g(.)38 b Ff(18)2031 3040 y(Rep)r(ository)-6 b(,)26 +b(example)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 +(.)47 b Ff(13)2031 3156 y(Rep)r(ository)-6 b(,)26 b(ho)n(w)g(data)g(is) +g(stored)20 b Fe(.)13 b(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g +(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)46 b Ff(14)2031 3272 y(Rep)r(ository)-6 b(,)26 b(setting)g(up)6 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(.)33 b Ff(18)2031 483 y(reserv)n(ed)25 b(c)n(hec)n(k)n(outs)16 +g(.)g(.)33 b Ff(21)2031 3388 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 3505 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(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(54)2031 3621 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(39)2031 3737 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(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(52)2031 1064 y(Retrieving)26 b(an)f(old)h +h(.)f(.)46 b Ff(54)2031 3853 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(54)2031 3970 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(49)2031 1180 y(rev)n(erting)26 +(.)g(.)h(.)f(.)g(.)g(.)44 b Ff(51)2031 4086 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 4202 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(79)2031 1413 y(Revision)26 b(managemen)n(t)10 b +b Ff(81)2031 4318 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(89)2031 1529 y(Revision)26 b(n)n(um)n(b)r(ers)11 +b Ff(91)2031 4435 y(Revision)26 b(n)n(um)n(b)r(ers)11 b Fe(.)h(.)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(.)38 -b Ff(45)2031 1645 y(Revision)26 b(tree)21 b Fe(.)13 b(.)h(.)f(.)g(.)g +b Ff(47)2031 4551 y(Revision)26 b(tree)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(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)48 -b Ff(45)2031 1761 y(Revision)26 b(tree,)g(making)f(branc)n(hes)6 +b Ff(47)2031 4667 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 y(Revisions,)26 +(.)g(.)g(.)g(.)g(.)33 b Ff(47)2031 4783 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(57)2031 1994 +g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)43 b Ff(59)2031 4899 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(46)2031 2110 y(Righ)n(t-hand)24 b(options)c +(.)g(.)47 b Ff(48)2031 5016 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(94)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(20)2031 2342 y(R)n(tag)26 b(\(sub)r(command\))14 +b Ff(96)2031 5132 y(Ro)r(ot)26 b(\014le,)g(in)g(CVS)f(directory)9 +b Fe(.)k(.)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(14)2031 5248 +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(23)p eop +%%Page: 172 174 +172 173 bop 0 -116 a Fs(172)2366 b(CVS|Concurren)m(t)29 +b(V)-8 b(ersions)30 b(System)0 366 y Ff(R)n(tag)c(\(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(120)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(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 +b Ff(122)0 483 y(rtag,)27 b(creating)f(a)g(branc)n(h)f(using)11 +b Fe(.)j(.)f(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.) +g(.)g(.)g(.)g(.)g(.)g(.)38 b Ff(52)0 744 y Fm(S)0 877 +y Ff(Sa)n(ving)25 b(space)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(.)g(.)g(.)h(.) -f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)37 -b Ff(98)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 -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 -b Ff(16)2031 3248 y(serv)n(er,)26 b(CVS)7 b Fe(.)13 b(.)g(.)g(.)g(.)g +f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)35 b Ff(100)0 +994 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(32)0 1110 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(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)33 -b Ff(19)2031 3364 y(setgid)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(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g -(.)g(.)50 b Ff(17)2031 3480 y(Setting)26 b(up)e(a)i(rep)r(ository)e +h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)45 b Ff(16)0 1226 +y(serv)n(er,)26 b(CVS)7 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(.)33 b +Ff(22)0 1342 y(setgid)24 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(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.) +50 b Ff(17)0 1458 y(Setting)26 b(up)e(a)i(rep)r(ository)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(.)49 b Ff(18)2031 -3597 y(setuid)21 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(.)49 b Ff(21)0 +1575 y(setuid)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(.)g(.)g(.)h(.)47 -b Ff(17)2031 3713 y(Sign)n(um)24 b(Supp)r(ort)c Fe(.)13 +b Ff(17)0 1691 y(Sign)n(um)24 b(Supp)r(ort)c 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(.) -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(79)2031 3945 y(Source,)26 b(getting)g(CVS)g(source)c +48 b Ff(1)0 1807 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(81)0 1923 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)15 b Fe(.)d(.)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(.)42 b Ff(9)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(94)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 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(.)h(.)f(.)g(.)g(.)g(.)49 b Ff(5)0 2040 y(Source,)26 +b(getting)g(from)g(CVS)15 b Fe(.)d(.)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(.)42 +b Ff(9)0 2156 y(Sp)r(ecifying)26 b(dates)20 b Fe(.)13 +b(.)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(.)46 +b Ff(96)0 2272 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(40)0 +2388 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(31)0 2505 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(80)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(121)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 +f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)45 b Ff(82)0 2621 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(123)0 2737 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(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.) +g(.)g(.)40 b Ff(35)0 2853 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(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(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(52)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(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(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(91)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(59)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 Ff(140)0 2969 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(54)0 3086 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(54)0 3202 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(54)0 3318 y(Stic)n(ky)25 b(tags/dates,)i(p)r(er-directory)15 +b Fe(.)e(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.) +g(.)g(.)g(.)42 b Ff(19)0 3434 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(147)0 3551 y(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(93)0 3667 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(61)0 3783 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 3899 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(114)0 831 y(Sym)n(b)r(olic)25 b(name)f(\(tag\))9 +b Ff(116)0 4016 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(48)0 948 y(Syn)n(tax)24 b(of)j(info)f(\014les)11 +b Ff(50)0 4132 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(141)0 1163 y Fm(T)0 1296 y Ff(T)-6 b(ag)26 b(\(sub)r(command\))14 +b Ff(143)0 4394 y Fm(T)0 4526 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(122)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(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(48)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(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(49)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(48)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(77)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(.) +b Ff(124)0 4643 y(T)-6 b(ag)26 b(\014le,)h(in)e(CVS)g(directory)11 +b Fe(.)j(.)f(.)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(19)0 4759 +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(.)36 b Ff(47)0 2226 y(T)-6 b(ags,)27 b(stic)n(ky)8 +(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)49 b Ff(140)0 +4875 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(50)0 4991 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(50)0 5108 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(51)0 5224 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(50)0 5340 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(79)2031 +366 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(49)2031 483 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(52)0 2342 y(tc,)26 b(T)-6 -b(rivial)27 b(Compiler)f(\(example\))18 b Fe(.)13 b(.)h(.)f(.)g(.)g(.)g -(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)47 -b Ff(9)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 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(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(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(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(67)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(94)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(95)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(114)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(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(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(93)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(94)0 -3853 y(T)-6 b(raceabilit)n(y)7 b Fe(.)14 b(.)g(.)f(.)g(.)g(.)g(.)g(.)g +g(.)g(.)g(.)g(.)g(.)h(.)34 b Ff(54)2031 599 y(tc,)26 +b(T)-6 b(rivial)27 b(Compiler)f(\(example\))18 b Fe(.)13 +b(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f +(.)g(.)g(.)g(.)47 b Ff(9)2031 715 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(35)2031 831 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(154)2031 948 y(T)-6 b(emplate)25 b(\014le,)h(in)g(CVS)f(directory) +20 b Fe(.)13 b(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g +(.)g(.)g(.)h(.)f(.)46 b Ff(20)2031 1064 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(150)2031 1180 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(154)2031 1296 +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(69)2031 1413 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(96)2031 +1529 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(97)2031 1645 +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(.)g(.)h(.)f(.)g(.)g(.)g +(.)g(.)g(.)h(.)f(.)37 b Ff(116)2031 1761 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(154)2031 1877 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(154)2031 1994 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(.)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(77)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(67)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 4202 y(T)-6 b(rivial)27 -b(Compiler)f(\(example\))7 b Fe(.)12 b(.)h(.)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(9)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(13)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(16)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(57)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 5016 y(Unkno)n(wn)14 +f(.)g(.)35 b Ff(95)2031 2110 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(96)2031 2226 y(T)-6 b(raceabilit)n(y)7 +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(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.) +f(.)g(.)g(.)g(.)g(.)g(.)34 b Ff(79)2031 2342 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(69)2031 2459 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(41)2031 2575 y(T)-6 b(rivial)27 b(Compiler)f(\(example\))7 +b Fe(.)12 b(.)h(.)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(9)2031 +2691 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(13)2031 2953 +y Fm(U)2031 3086 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(16)2031 3202 +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(59)2031 3318 +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(44)2031 3434 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 3551 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(Up-to-date)7 b Fe(.)12 +f(.)g(.)34 b Ff(35)2031 3667 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(33)2031 599 y(Up)r(date)25 +f(.)g(.)g(.)g(.)g(.)34 b Ff(35)2031 3783 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(123)2031 715 y(Up)r(date)25 b(program)12 b Fe(.)i(.)f(.)g(.)g(.)g +b Ff(125)2031 3899 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(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(34)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(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)39 b Ff(140)2031 +4016 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 4132 +y(Up)r(date.prog)26 b(\014le,)g(in)g(CVS)f(directory)19 +b Fe(.)13 b(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g +(.)45 b Ff(19)2031 4248 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(36)2031 4364 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(155)2031 4480 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(26)2031 4597 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 4858 y Fm(V)2031 +4991 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(.)33 b Ff(34)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(23)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(41)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(67)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(67)2031 1916 y(v)n(erifymsg)25 b(\(admin)g(\014le\))e +h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)45 +b Ff(69)2031 5108 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(69)2031 5224 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(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(.)50 b Ff(144)2031 +5340 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(87)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(46)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(11)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 2769 y(w)n(atc)n(h)26 b(o\013)g(\(sub)r(command\))12 +g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)41 b Ff(89)p +eop +%%Page: 173 175 +173 174 bop 0 -116 a Fs(Index)3541 b(173)0 366 y Ff(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(48)0 483 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(11)0 699 y Fm(W)0 831 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(42)0 948 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 -2885 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)0 +1064 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 3001 y(w)n(atc)n(h)26 +h(.)f(.)g(.)g(.)g(.)40 b Ff(42)0 1180 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 3117 y(w)n(atc)n(hers)26 b(\(sub)r(command\))18 +b Ff(43)0 1296 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 -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(.)g(.)h(.)f(.)g(.)g(.)46 b Ff(45)0 +1413 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 3350 y(Wdi\013)25 b(\(imp)r(ort)g(example\))10 +b Ff(41)0 1529 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(67)2031 -3466 y(w)n(eb)26 b(pages,)h(main)n(taining)e(with)h(CVS)9 +g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)37 b Ff(69)0 +1645 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(.) +36 b Ff(149)0 1761 y(What)25 b(\(shell)i(command\))7 +b Fe(.)k(.)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(.)34 b -Ff(80)2031 3698 y(What)25 b(branc)n(hes)h(are)g(go)r(o)r(d)h(for)9 +Ff(82)2031 366 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(50)2031 3815 y(What)25 +(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)35 b Ff(52)2031 483 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 3931 y(When)25 +g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)45 b Ff(5)2031 599 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(89)2031 4047 y(W)-6 b(ork-session,)26 +f(.)g(.)g(.)g(.)g(.)34 b Ff(91)2031 715 y(W)-6 b(ork-session,)26 b(example)f(of)9 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(.)36 -b Ff(9)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(33)2031 4280 y(W)-6 b(orking)25 b(cop)n(y)-6 b(,)26 +b Ff(9)2031 831 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 948 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(10)2031 4396 y(W)-6 b(rapp)r(ers)9 b Fe(.)k(.)g(.)g(.)g(.)h(.)f(.) +b Ff(10)2031 1064 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(139)2031 4512 y(writers)27 b(\(admin)d(\014le\))19 +b Ff(141)2031 1180 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(26)2031 4767 y Fm(Z)2031 4899 y Ff(zone,)26 b(time,)g(in)f(input) +b Ff(29)2031 1512 y Fm(Z)2031 1645 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(95)2031 5016 y(zone,)26 b(time,)g(in)f(output)20 +b Ff(97)2031 1761 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(114)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 +b Ff(116)p eop +%%Page: 174 176 +174 175 bop 0 -116 a Fs(174)2366 b(CVS|Concurren)m(t)29 +b(V)-8 b(ersions)30 b(System)p eop +%%Page: -1 177 +-1 176 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(.) @@ -11412,631 +11900,639 @@ g(.)f(.)h(.)g(.)g(.)g(.)f(.)h(.)g(.)g(.)g(.)f(.)h(.)g(.)g(.)f(.)h(.)g (.)g(.)49 b Fc(13)0 1130 y(4)156 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 1263 y(5)156 b(Multiple)31 b(dev)m(elop)s(ers) +g(.)g(.)f(.)53 b Fc(31)0 1263 y(5)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 1396 y(6)156 b(Revisions)32 +g(.)g(.)g(.)f(.)h(.)47 b Fc(35)0 1396 y(6)156 b(Revisions)32 b(and)h(branc)m(hes)19 b Fb(.)i(.)f(.)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(.)51 b Fc(45)0 1529 y(7)156 b(Merging)34 +f(.)h(.)g(.)g(.)g(.)f(.)51 b Fc(47)0 1529 y(7)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(55)0 1662 y(8)156 b(Recursiv)m(e)34 b(b)s(eha)m(vior)29 +Fc(57)0 1662 y(8)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(59)0 1794 y(9)156 b(Adding)32 +g(.)f(.)h(.)g(.)61 b Fc(61)0 1794 y(9)156 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(61)0 1927 y(10)107 +g(.)g(.)f(.)h(.)g(.)g(.)g(.)f(.)43 b Fc(63)0 1927 y(10)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(63)0 2060 y(11)107 b(Remo)m(ving)31 b(directories)12 +b Fc(65)0 2060 y(11)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(65)0 2193 y(12)107 b(T)-8 b(rac)m(king)33 +h(.)g(.)g(.)44 b Fc(67)0 2193 y(12)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(67)0 2326 y(13)107 b(Mo)m(ving)32 +h(.)g(.)g(.)g(.)53 b Fc(69)0 2326 y(13)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(71)0 2459 y(14)107 b(Mo)m(ving)32 +f(.)h(.)g(.)g(.)f(.)67 b Fc(73)0 2459 y(14)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(75)0 2591 y(15)107 b(History)32 b(bro)m(wsing)14 +f(.)h(.)68 b Fc(77)0 2591 y(15)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(77)0 2724 y(16)107 b(Keyw)m(ord)34 +g(.)g(.)f(.)h(.)g(.)g(.)46 b Fc(79)0 2724 y(16)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(79)0 2857 y(17)107 +h(.)g(.)g(.)g(.)f(.)h(.)g(.)59 b Fc(81)0 2857 y(17)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(83)0 +(.)f(.)h(.)g(.)g(.)g(.)f(.)h(.)g(.)g(.)g(.)f(.)48 b Fc(85)0 2990 y(18)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(85)0 3123 y(19)107 +(.)g(.)f(.)h(.)g(.)g(.)g(.)48 b Fc(87)0 3123 y(19)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(87)0 +g(.)g(.)g(.)f(.)h(.)g(.)g(.)f(.)h(.)g(.)g(.)63 b Fc(89)0 3256 y(20)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(89)0 3388 y(App)s(endix)33 b(A)99 b(Guide)32 b(to)h(CVS)g +b Fc(91)0 3388 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(91)0 3521 y(App)s(endix)33 b(B)103 b(Quic)m(k)33 +b Fc(93)0 3521 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(127)0 +h(.)g(.)g(.)g(.)f(.)h(.)g(.)g(.)f(.)h(.)g(.)46 b Fc(129)0 3654 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(137)0 3787 y(App)s(endix)33 b(D)97 b(All)31 +(.)g(.)46 b Fc(139)0 3787 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(151)0 +b Fb(.)f(.)e(.)h(.)g(.)g(.)g(.)f(.)h(.)g(.)g(.)54 b Fc(153)0 3920 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(155)0 4053 y(App)s(endix)33 b(F)108 b(GNU)33 b(GENERAL)g(PUBLIC)g +b Fc(157)0 4053 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(157)0 4185 y(Index)30 b Fb(.)20 b(.)g(.)f(.)h(.)g(.)g(.) +(.)h(.)70 b Fc(159)0 4185 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(165)p eop -%%Page: -2 174 --2 173 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(167)p eop +%%Page: -2 178 +-2 177 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 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 +%%Page: -3 179 +-3 178 bop 3824 -116 a Fs(iii)0 366 y Fp(T)-13 b(able)31 +b(of)f(Con)l(ten)l(ts)0 715 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 -(.)h(.)g(.)63 b Fm(1)299 857 y Fs(Chec)m(klist)29 b(for)h(the)h +(.)h(.)g(.)63 b Fm(1)299 871 y Fs(Chec)m(klist)29 b(for)h(the)h (impatien)m(t)f(reader)21 b Fa(.)15 b(.)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(.)51 b Fs(2)299 981 +g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)51 b Fs(2)299 995 y(Credits)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(.) 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(.)44 -b Fs(2)299 1106 y(BUGS)10 b Fa(.)15 b(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g +b Fs(2)299 1120 y(BUGS)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(.)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(.) -39 b Fs(3)0 1355 y Fm(1)135 b(What)45 b(is)g(CVS?)19 +39 b Fs(3)0 1369 y Fm(1)135 b(What)45 b(is)g(CVS?)19 b Fb(.)g(.)h(.)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(.)64 b Fm(5)299 1511 y Fs(CVS)30 b(is)f(not)p +(.)g(.)f(.)h(.)64 b Fm(5)299 1525 y Fs(CVS)30 b(is)f(not)p Fh(:)15 b(:)g(:)i Fa(.)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(.)g(.) -g(.)g(.)g(.)g(.)h(.)f(.)g(.)45 b Fs(6)0 1760 y Fm(2)135 +g(.)g(.)g(.)g(.)h(.)f(.)g(.)45 b Fs(6)0 1774 y Fm(2)135 b(A)44 b(sample)i(session)29 b Fb(.)21 b(.)f(.)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(.)74 b Fm(9)299 1915 +(.)f(.)h(.)g(.)g(.)g(.)f(.)h(.)g(.)74 b Fm(9)299 1929 y Fs(2.1)92 b(Getting)31 b(the)f(source)8 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(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g -(.)g(.)g(.)g(.)g(.)g(.)38 b Fs(9)299 2040 y(2.2)92 b(Committing)29 +(.)g(.)g(.)g(.)g(.)g(.)38 b Fs(9)299 2054 y(2.2)92 b(Committing)29 b(y)m(our)h(c)m(hanges)16 b Fa(.)h(.)e(.)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(.)46 b Fs(9)299 -2164 y(2.3)92 b(Cleaning)29 b(up)f Fa(.)15 b(.)g(.)g(.)g(.)g(.)g(.)g(.) +2178 y(2.3)92 b(Cleaning)29 b(up)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(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.) -g(.)g(.)g(.)g(.)g(.)g(.)g(.)58 b Fs(10)299 2289 y(2.4)92 +g(.)g(.)g(.)g(.)g(.)g(.)g(.)58 b Fs(10)299 2303 y(2.4)92 b(Viewing)29 b(di\013erences)16 b Fa(.)e(.)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(.)g(.)g(.)g(.)g(.) -45 b Fs(11)0 2538 y Fm(3)135 b(The)44 b(Rep)t(ository)36 +45 b Fs(11)0 2552 y Fm(3)135 b(The)44 b(Rep)t(ository)36 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(.)g(.)f(.)h(.)g(.)g(.)f(.)h(.)g(.)g(.) -g(.)79 b Fm(13)299 2694 y Fs(3.1)92 b(T)-8 b(elling)28 +g(.)79 b Fm(13)299 2708 y Fs(3.1)92 b(T)-8 b(elling)28 b(CVS)i(where)g(y)m(our)g(rep)s(ository)g(is)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(.)h(.)f(.)g(.)g(.)g(.)54 b Fs(13)299 2818 +(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)54 b Fs(13)299 2832 y(3.2)92 b(Ho)m(w)31 b(data)g(is)f(stored)g(in)f(the)i(rep)s(ository)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(.)h(.)f(.)g(.)g(.)50 b Fs(14)598 -2943 y(3.2.1)93 b(Where)30 b(\014les)g(are)g(stored)h(within)d(the)i +2957 y(3.2.1)93 b(Where)30 b(\014les)g(are)g(stored)h(within)d(the)i (rep)s(ository)11 b Fa(.)j(.)h(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g -(.)40 b Fs(14)598 3067 y(3.2.2)93 b(File)29 b(p)s(ermissions)22 +(.)40 b Fs(14)598 3081 y(3.2.2)93 b(File)29 b(p)s(ermissions)22 b Fa(.)12 b(.)j(.)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(.)52 b Fs(16)299 3192 y(3.3)92 b(The)30 -b(administrativ)m(e)f(\014les)13 b Fa(.)h(.)h(.)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(.)43 -b Fs(17)598 3316 y(3.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(18)299 -3441 y(3.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(18)299 3565 y(3.5)92 -b(Creating)30 b(a)h(rep)s(ository)16 b Fa(.)e(.)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(.)45 -b Fs(18)299 3690 y(3.6)92 b(Remote)32 b(rep)s(ositories)23 -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(19)598 3814 -y(3.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(20)598 3939 y(3.6.2)93 b(Connecting)29 b(with)g(rsh)23 +g(.)g(.)g(.)g(.)52 b Fs(16)598 3206 y(3.2.3)93 b(The)29 +b(attic)h Fa(.)15 b(.)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(.)58 b +Fs(17)299 3330 y(3.3)92 b(Ho)m(w)31 b(data)g(is)f(stored)g(in)f(the)i +(w)m(orking)e(directory)22 b Fa(.)15 b(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g +(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)51 b Fs(17)299 +3455 y(3.4)92 b(The)30 b(administrativ)m(e)f(\014les)13 +b Fa(.)h(.)h(.)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(.)43 b Fs(20)598 3579 y(3.4.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(21)299 3704 y(3.5)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(21)299 3829 y(3.6)92 b(Creating)30 b(a)h(rep)s(ository)16 +b Fa(.)e(.)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(.)45 b Fs(21)299 3953 y(3.7)92 +b(Remote)32 b(rep)s(ositories)23 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(22)598 4078 y(3.7.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(23)598 4202 y(3.7.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(20)598 4064 y(3.6.3)93 b(Direct)30 b(connection)h(with)e(passw) +53 b Fs(23)598 4327 y(3.7.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(21)897 4188 y(3.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 4313 y Fa(.)15 +b Fs(24)897 4451 y(3.7.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 4576 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(21)897 4437 y(3.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(23)897 -4562 y(3.6.3.3)93 b(Securit)m(y)30 b(considerations)f(with)g(passw)m -(ord)1078 4686 y(authen)m(tication)19 b Fa(.)c(.)g(.)g(.)g(.)g(.)g(.)g +Fs(24)897 4700 y(3.7.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(26)897 +4825 y(3.7.3.3)93 b(Securit)m(y)30 b(considerations)f(with)g(passw)m +(ord)1078 4949 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(24)598 -4811 y(3.6.4)93 b(Direct)30 b(connection)h(with)e(k)m(erb)s(eros)8 +g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)48 b Fs(27)598 +5074 y(3.7.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(25)299 4935 y(3.7)92 +(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)37 b Fs(28)299 5198 y(3.8)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(26)0 5184 y Fm(4)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 5340 -y Fs(4.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 +Fs(29)p eop +%%Page: -4 180 +-4 179 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(4)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 239 y Fs(4.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(.)h(.)50 b Fs(29)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)598 83 y(4.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 -208 y(4.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 332 y(4.1.3)93 +g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)50 b Fs(31)598 +363 y(4.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 488 y(4.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(32)598 612 y(4.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 457 y(4.2)92 b(De\014ning)29 b(the)i(mo)s(dule)15 +g(.)44 b Fs(33)299 737 y(4.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 706 y +(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)44 b Fs(33)0 986 y Fm(5)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 861 y +g(.)g(.)g(.)f(.)h(.)g(.)g(.)g(.)67 b Fm(35)299 1142 y Fs(5.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 986 y(5.2)92 +g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)45 b Fs(35)299 1266 y(5.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 1110 y(5.3)92 b(Con\015icts)29 +g(.)g(.)52 b Fs(36)299 1391 y(5.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 1235 y(5.4)92 b(Informing)28 b(others)j(ab)s(out)f(commits) +b Fs(37)299 1515 y(5.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 1359 y(5.5)92 b(Sev)m(eral)30 b(dev)m(elop)s(ers)g(sim)m +b Fs(40)299 1640 y(5.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 1484 y(5.6)92 +b(.)h(.)g(.)g(.)g(.)g(.)g(.)49 b Fs(40)299 1764 y(5.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 1609 y(5.6.1)93 +g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)39 b Fs(41)598 1889 y(5.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 1733 y(5.6.2)93 b(T)-8 +g(.)g(.)g(.)h(.)f(.)43 b Fs(42)598 2013 y(5.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 -1858 y(5.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 +2138 y(5.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 1982 y(5.6.4)93 +(.)g(.)g(.)g(.)g(.)g(.)45 b Fs(44)598 2262 y(5.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 2107 y(5.6.5)93 b(Using)29 b(w)m(atc)m(hes)j(with)d(old)h +b Fs(45)598 2387 y(5.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 2231 y(5.7)92 +(.)g(.)g(.)g(.)g(.)g(.)g(.)52 b Fs(45)299 2511 y(5.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 2480 y Fm(6)135 b(Revisions)46 +g(.)g(.)g(.)48 b Fs(46)0 2760 y Fm(6)135 b(Revisions)46 b(and)f(branc)l(hes)29 b Fb(.)19 b(.)h(.)g(.)g(.)f(.)h(.)g(.)g(.)g(.)f (.)h(.)g(.)g(.)g(.)f(.)h(.)g(.)g(.)f(.)h(.)g(.)g(.)g(.)f(.)h(.)g(.)74 -b Fm(45)299 2636 y Fs(6.1)92 b(Revision)29 b(n)m(um)m(b)s(ers)22 +b Fm(47)299 2916 y Fs(6.1)92 b(Revision)29 b(n)m(um)m(b)s(ers)22 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(.) -g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)53 b Fs(45)299 -2760 y(6.2)92 b(V)-8 b(ersions,)30 b(revisions)f(and)g(releases)18 +g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)53 b Fs(47)299 +3041 y(6.2)92 b(V)-8 b(ersions,)30 b(revisions)f(and)g(releases)18 b Fa(.)d(.)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(.)47 -b Fs(46)299 2885 y(6.3)92 b(Assigning)29 b(revisions)20 +b Fs(48)299 3165 y(6.3)92 b(Assigning)29 b(revisions)20 b Fa(.)13 b(.)i(.)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(.)50 b Fs(47)299 -3010 y(6.4)92 b(T)-8 b(ags{Sym)m(b)s(olic)30 b(revisions)21 +g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)50 b Fs(49)299 +3290 y(6.4)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(47)299 3134 y(6.5)92 b(What)31 +g(.)g(.)g(.)g(.)g(.)53 b Fs(49)299 3414 y(6.5)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(50)299 3259 y(6.6)92 b(Creating)30 b(a)h(branc)m(h)16 +Fs(52)299 3539 y(6.6)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(50)299 -3383 y(6.7)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(52)299 +3663 y(6.7)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(52)0 3632 -y Fm(7)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(55)299 3788 y Fs(7.1)92 b(Merging)30 b(an)h(en)m(tire)f(branc)m(h) +(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)58 b Fs(54)299 3788 +y(6.8)92 b(Magic)31 b(branc)m(h)f(n)m(um)m(b)s(ers)9 +b Fa(.)k(.)i(.)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(55)0 4037 y Fm(7)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(57)299 4193 y Fs(7.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(55)299 3912 y(7.2)92 b(Merging)30 +g(.)g(.)g(.)g(.)g(.)52 b Fs(57)299 4317 y(7.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(56)299 4037 y(7.3)92 b(Merging)30 +g(.)g(.)g(.)g(.)g(.)42 b Fs(58)299 4442 y(7.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(57)299 4161 y(7.4)92 b(Merging)30 +(.)g(.)g(.)47 b Fs(59)299 4566 y(7.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(57)0 4411 y Fm(8)135 b(Recursiv)l(e)46 b(b)t(eha)l(vior)16 +b Fs(59)0 4815 y Fm(8)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(59)0 4691 y(9)135 b(Adding)44 b(\014les)h(to)h(a)f(directory)23 +b Fm(61)0 5095 y(9)135 b(Adding)44 b(\014les)h(to)h(a)f(directory)23 b Fb(.)d(.)g(.)f(.)h(.)g(.)g(.)g(.)f(.)h(.)g(.)g(.)g(.)f(.)h(.)g(.)g(.) -g(.)f(.)h(.)g(.)g(.)f(.)h(.)68 b Fm(61)0 4971 y(10)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(63)0 5251 -y(11)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(65)p eop -%%Page: -5 177 --5 176 bop 3852 -116 a Fs(v)0 83 y Fm(12)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(67)299 239 y Fs(12.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(67)299 363 y(12.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(68)299 488 y(12.3)92 b(Rev)m(erting)31 +g(.)f(.)h(.)g(.)g(.)f(.)h(.)68 b Fm(63)p eop +%%Page: -5 181 +-5 180 bop 3852 -116 a Fs(v)0 83 y Fm(10)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(65)0 363 y(11)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(67)0 643 y(12)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(69)299 799 y Fs(12.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(69)299 924 +y(12.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(70)299 1048 y(12.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(68)299 612 y(12.4)92 b(Ho)m(w)31 +g(.)g(.)g(.)45 b Fs(70)299 1173 y(12.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(69)0 861 y Fm(13)135 b(Mo)l(ving)45 +g(.)g(.)g(.)g(.)44 b Fs(71)0 1422 y Fm(13)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(71)299 1017 y Fs(13.1)92 b(The)30 b(Normal)g(w)m(a)m(y)i(to)f +b Fm(73)299 1577 y Fs(13.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(71)299 1142 y(13.2)92 b(Mo)m(ving)31 +g(.)g(.)g(.)56 b Fs(73)299 1702 y(13.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(71)299 1266 y(13.3)92 b(Cop)m(ying)30 b(the)h(history)e(\014le)14 +b Fs(73)299 1826 y(13.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(72)0 1515 y Fm(14)135 b(Mo)l(ving)45 +(.)g(.)g(.)g(.)g(.)43 b Fs(74)0 2076 y Fm(14)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(75)0 1795 +(.)f(.)h(.)g(.)g(.)f(.)h(.)g(.)g(.)58 b Fm(77)0 2356 y(15)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(77)299 1951 +g(.)f(.)h(.)g(.)g(.)f(.)h(.)g(.)g(.)56 b Fm(79)299 2511 y Fs(15.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(77)299 2076 y(15.2)92 +(.)g(.)g(.)g(.)g(.)g(.)52 b Fs(79)299 2636 y(15.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(77)299 2200 y(15.3)92 b(User-de\014ned)30 b(logging)15 +b Fs(79)299 2760 y(15.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(77)299 2325 y(15.4)92 +(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)44 b Fs(79)299 2885 y(15.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(78)0 2574 y Fm(16)135 b(Keyw)l(ord)46 b(substitution)16 +b Fs(80)0 3134 y Fm(16)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(79)299 -2729 y Fs(16.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(81)299 +3290 y Fs(16.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(79)299 -2854 y(16.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(81)299 +3414 y(16.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(80)299 -2978 y(16.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(82)299 +3539 y(16.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(81)299 3103 y(16.4)92 b(Substitution)28 +(.)g(.)38 b Fs(83)299 3663 y(16.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(81)299 3227 y(16.5)92 b(Problems)29 b(with)g(the)i($Log: cvs.ps,v $ -Fs(81)299 3227 y(16.5)92 b(Problems)29 b(with)g(the)i(Revision 1.1.1.8 1997/03/29 04:45:27 tholo -Fs(81)299 3227 y(16.5)92 b(Problems)29 b(with)g(the)i(Latest release from Cyclic Software -Fs(81)299 3227 y(16.5)92 b(Problems)29 b(with)g(the)i()h(k)m(eyw)m +Fs(83)299 3788 y(16.5)92 b(Problems)29 b(with)g(the)i($Log: cvs.ps,v $ +Fs(83)299 3788 y(16.5)92 b(Problems)29 b(with)g(the)i(Revision 1.1.1.9 1997/04/21 04:33:40 tholo +Fs(83)299 3788 y(16.5)92 b(Problems)29 b(with)g(the)i(Missing files from import +Fs(83)299 3788 y(16.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(82)0 3477 y Fm(17)135 b(Handling)45 b(binary)g(\014les)11 +b Fs(84)0 4037 y Fm(17)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(83)0 3757 y(18)135 b(Ho)l(w)46 b(y)l(our)f(build)f(system)i(in)l +b Fm(85)0 4317 y(18)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(85)0 4037 y(19)135 b(Compatibilit)l(y)47 b(b)t(et)l(w)l(een)f(CVS) +b Fm(87)0 4597 y(19)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(87)0 4317 y(20)135 b(Revision)46 b(managemen)l(t)40 +78 b Fm(89)0 4878 y(20)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(89)299 -4473 y Fs(20.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(91)299 +5033 y Fs(20.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(89)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(91)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(91)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(91)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(93)299 5251 y(A.4)92 b(Common)30 b(command)g(options)13 +(.)g(.)g(.)g(.)46 b Fs(91)p eop +%%Page: -6 182 +-6 181 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(93)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(93)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(93)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(95)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(94)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)299 83 y(A.5)92 b(admin|Administration)26 +(.)g(.)42 b Fs(96)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(97)598 208 y(A.5.1)92 b(admin)29 b(options)d Fa(.)15 +b Fs(99)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(97)598 332 y(A.5.2)92 b(admin)29 +g(.)g(.)g(.)55 b Fs(99)598 986 y(A.5.2)92 b(admin)29 b(examples)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(100)897 457 y(A.5.2.1)93 +g(.)g(.)g(.)g(.)g(.)h(.)39 b Fs(102)897 1110 y(A.5.2.1)93 b(Outdating)29 b(is)h(dangerous)23 b Fa(.)15 b(.)g(.)g(.)g(.)g(.)g(.)g (.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)53 -b Fs(100)897 581 y(A.5.2.2)93 b(Commen)m(t)31 b(leaders)15 +b Fs(102)897 1235 y(A.5.2.2)93 b(Commen)m(t)31 b(leaders)15 b Fa(.)f(.)h(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.) -g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)44 b Fs(100)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(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)44 b Fs(102)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)18 b Fa(.)c(.)h(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.) -g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)48 b Fs(101)598 830 +g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)48 b Fs(103)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(.) -50 b Fs(102)598 955 y(A.6.2)92 b(c)m(hec)m(k)m(out)33 +50 b Fs(104)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(103)299 1079 y(A.7)92 b(commit|Chec)m(k)30 +g(.)g(.)g(.)g(.)56 b Fs(105)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(103)598 1204 y(A.7.1)92 b(commit)31 +(.)g(.)g(.)g(.)g(.)53 b Fs(105)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(104)598 1328 y(A.7.2)92 +(.)g(.)g(.)g(.)g(.)g(.)g(.)51 b Fs(106)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(105)897 1453 y(A.7.2.1)93 +g(.)g(.)g(.)g(.)g(.)g(.)g(.)57 b Fs(107)897 2107 y(A.7.2.1)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(105)897 1577 y(A.7.2.2)93 b(Creating)30 b(the)g(branc)m(h)g(after) +b Fs(107)897 2231 y(A.7.2.2)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(106)299 1702 y(A.8)92 b(di\013|Run)28 b(di\013s)h(b)s(et)m(w)m +b Fs(108)299 2356 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(106)598 1826 y(A.8.1)92 b(di\013)29 b(options)20 +(.)42 b Fs(108)598 2480 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(107)598 1951 y(A.8.2)92 +g(.)g(.)g(.)h(.)f(.)g(.)g(.)49 b Fs(109)598 2605 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(108)299 -2076 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(110)299 +2729 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(108)598 2200 y(A.9.1)92 b(exp)s(ort)30 +(.)g(.)56 b Fs(110)598 2854 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(109)299 2325 y(A.10)92 +(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)49 b Fs(111)299 2978 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(110)598 2449 y(A.10.1)93 +(.)g(.)g(.)g(.)g(.)g(.)g(.)54 b Fs(112)598 3103 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(110)299 -2574 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(112)299 +3227 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(112)598 2698 y(A.11.1)93 b(imp)s(ort)28 b(options)12 +b Fs(114)598 3352 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(113)598 2823 y(A.11.2)93 b(imp)s(ort)28 +(.)g(.)g(.)42 b Fs(115)598 3477 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(113)598 2947 y(A.11.3)93 +g(.)g(.)g(.)g(.)g(.)g(.)52 b Fs(115)598 3601 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(114)299 3072 +g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)48 b Fs(116)299 3726 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(114)598 3196 y(A.12.1)93 +(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)55 b Fs(116)598 3850 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(114)598 3321 y(A.12.2)93 b(log)30 b(examples)10 b +Fs(116)598 3975 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(116)299 3445 y(A.13)92 b(rdi\013|'patc)m +g(.)h(.)f(.)g(.)g(.)39 b Fs(118)299 4099 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(116)598 3570 y(A.13.1)93 b(rdi\013)28 +(.)g(.)g(.)g(.)39 b Fs(118)598 4224 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(117)598 3694 +(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)52 b Fs(119)598 4348 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(117)299 3819 y(A.14)92 b(release|Indicate)30 b(that)h(a)g(Mo)s(dule) +Fs(119)299 4473 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(118)598 3944 y(A.14.1)93 b(release)30 +(.)g(.)g(.)g(.)44 b Fs(120)598 4597 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(118)598 4068 y(A.14.2)93 +g(.)g(.)g(.)h(.)f(.)g(.)45 b Fs(120)598 4722 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(119)598 4193 +g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)56 b Fs(121)598 4846 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(119)299 -4317 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(121)299 +4971 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(120)598 4442 +g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)53 b Fs(122)598 5095 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(120)299 4566 y(A.16)92 b(status|Displa)m(y)30 b(status)h +b Fs(122)299 5220 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(121)598 -4691 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(121)299 4815 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(122)598 4940 -y(A.17.1)93 b(tag)31 b(options)20 b Fa(.)14 b(.)h(.)g(.)h(.)f(.)g(.)g +b Fa(.)13 b(.)i(.)g(.)g(.)g(.)h(.)f(.)49 b Fs(123)p eop +%%Page: -7 183 +-7 182 bop 3802 -116 a Fs(vii)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(123)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(124)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(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)49 -b Fs(122)299 5064 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(123)598 5189 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(.)h(.)f(.)g(.)49 b Fs(124)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(125)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(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)39 b Fs(123)598 -5313 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(125)p eop -%%Page: -7 179 --7 178 bop 3802 -116 a Fs(vii)598 83 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 +(.)g(.)h(.)39 b Fs(125)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(126)0 332 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 612 y(App)t(endix)44 b(C)134 -b(Reference)46 b(man)l(ual)g(for)f(the)h(Administrativ)l(e)269 -737 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 892 y Fs(C.1)91 b(The)30 b(mo)s(dules)f(\014le)14 +g(.)g(.)g(.)g(.)g(.)g(.)50 b Fs(127)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(128)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(129)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(139)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(137)299 -1017 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(139)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(139)299 1142 y(C.3)91 +g(.)h(.)f(.)g(.)g(.)g(.)g(.)49 b Fs(141)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(140)598 1266 y(C.3.1)92 b(The)30 b(common)g(syn)m(tax)11 +b Fs(142)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(141)299 1391 y(C.4)91 b(Commitinfo)21 b Fa(.)14 +b Fs(143)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(141)299 1515 y(C.5)91 b(V)-8 b(erifying)29 b(log)i(messages)d +b Fs(143)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(142)299 1640 y(C.6)91 b(Editinfo)10 +g(.)g(.)g(.)g(.)g(.)57 b Fs(144)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(143)598 1764 y(C.6.1)92 b(Editinfo)28 b(example)13 +g(.)40 b Fs(145)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(144)299 1889 y(C.7)91 b(Loginfo)23 b Fa(.)15 +(.)g(.)43 b Fs(146)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(145)598 2013 y(C.7.1)92 b(Loginfo)30 b(example)25 +b Fs(147)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(147)598 2138 y(C.7.2)92 b(Keeping)29 +g(.)g(.)56 b Fs(149)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(147)299 2262 y(C.8)91 b(Rcsinfo)25 b +g(.)g(.)44 b Fs(149)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(148)299 2387 y(C.9)91 b(Ignoring)30 b(\014les)f(via)h +(.)g(.)55 b Fs(150)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(148)299 2511 y(C.10)92 b(The)29 +g(.)g(.)h(.)f(.)58 b Fs(150)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(149)299 2636 y(C.11)92 b(Expansions)28 b(in)h(administrativ)m(e)g +b Fs(151)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(150)0 2885 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 3010 y(CVS)10 +b Fs(152)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(151)0 -3290 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(153)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(155)299 3445 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(155)0 3694 y Fm(App)t(endix)44 b(F)134 -b(GNU)45 b(GENERAL)g(PUBLIC)g(LICENSE)304 3819 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(157)299 3975 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(157)299 4099 y(TERMS)29 b(AND)j(CONDITIONS)d(F)m(OR)h(COPYING,)h -(DISTRIBUTION)e(AND)481 4224 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(158)299 -4348 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(163)0 -4597 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(165)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)p eop +(.)f(.)h(.)g(.)g(.)g(.)71 b Fm(157)299 4437 y Fs(E.1)91 +b(P)m(artial)30 b(list)f(of)i(error)f(messages)14 b Fa(.)i(.)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(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)44 b +Fs(157)0 4686 y Fm(App)t(endix)g(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(159)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(159)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(160)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(165)p eop +%%Page: -8 184 +-8 183 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(167)p eop %%Trailer end userdict /end-hook known{end-hook}if diff --git a/gnu/usr.bin/cvs/doc/cvsclient.aux b/gnu/usr.bin/cvs/doc/cvsclient.aux index 494d19a6579..f454a918c8d 100644 --- a/gnu/usr.bin/cvs/doc/cvsclient.aux +++ b/gnu/usr.bin/cvs/doc/cvsclient.aux @@ -25,18 +25,24 @@ 'xrdef {Filenames-title}{Conventions regarding transmission of file names} 'xrdef {Filenames-pg}{7} 'xrdef {Filenames-snt}{Section'tie5.3} +'xrdef {File transmissions-title}{File transmissions} +'xrdef {File transmissions-pg}{7} +'xrdef {File transmissions-snt}{Section'tie5.4} +'xrdef {Strings-title}{Strings} +'xrdef {Strings-pg}{8} +'xrdef {Strings-snt}{Section'tie5.5} 'xrdef {Requests-title}{Requests} -'xrdef {Requests-pg}{7} -'xrdef {Requests-snt}{Section'tie5.4} +'xrdef {Requests-pg}{8} +'xrdef {Requests-snt}{Section'tie5.6} 'xrdef {Responses-title}{Responses} -'xrdef {Responses-pg}{13} -'xrdef {Responses-snt}{Section'tie5.5} +'xrdef {Responses-pg}{16} +'xrdef {Responses-snt}{Section'tie5.7} 'xrdef {Example-title}{Example} -'xrdef {Example-pg}{17} -'xrdef {Example-snt}{Section'tie5.6} +'xrdef {Example-pg}{20} +'xrdef {Example-snt}{Section'tie5.8} 'xrdef {Requirements-title}{Required versus optional parts of the protocol} -'xrdef {Requirements-pg}{19} -'xrdef {Requirements-snt}{Section'tie5.7} +'xrdef {Requirements-pg}{23} +'xrdef {Requirements-snt}{Section'tie5.9} 'xrdef {Obsolete-title}{Obsolete protocol elements} -'xrdef {Obsolete-pg}{19} -'xrdef {Obsolete-snt}{Section'tie5.8} +'xrdef {Obsolete-pg}{23} +'xrdef {Obsolete-snt}{Section'tie5.10} diff --git a/gnu/usr.bin/cvs/doc/cvsclient.info b/gnu/usr.bin/cvs/doc/cvsclient.info index 79771c281f7..706b3838582 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.6 of the protocol +regular CVS manual for that. This is version 1.9.8 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.6 of the protocol specification. This version + This is version 1.9.8 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 @@ -77,8 +77,17 @@ Goals * Do not assume any access to the repository other than via this protocol. It does not depend on NFS, rdist, etc. - * Providing a reliable transport is outside this protocol. It is - expected that it runs over TCP, UUCP, etc. + * Providing a reliable transport is outside this protocol. The + protocol expects a reliable transport that is transparent (that + is, there is no translation of characters, including characters + such as such as linefeeds or carriage returns), and can transmit + all 256 octets (for example for proper handling of binary files, + compression, and encryption). The encoding of characters + specified by the protocol (the names of requests and so on) is the + invariant ISO 646 character set (a subset of most popular + character sets including ASCII and others). For more details on + running the protocol over the TCP reliable transport, see *Note + Connection and Authentication::. * Security and authentication are handled outside this protocol (but see below about `cvs kserver' and `cvs pserver'). @@ -204,6 +213,8 @@ horizontal tab. * Entries Lines:: * Modes:: * Filenames:: Conventions regarding filenames +* File transmissions:: How file contents are transmitted +* Strings:: Strings in various requests and responses * Requests:: * Responses:: * Example:: @@ -267,7 +278,7 @@ operating systems haven't really been worked out (e.g. should the VMS port use ACLs to get POSIX semantics for groups?).  -File: cvsclient.info, Node: Filenames, Next: Requests, Prev: Modes, Up: Protocol +File: cvsclient.info, Node: Filenames, Next: File transmissions, Prev: Modes, Up: Protocol Conventions regarding transmission of file names ================================================ @@ -282,21 +293,24 @@ answer (and what to do if future server ports are operating on a repository like e:/foo or CVS_ROOT:[FOO.BAR] has not been carefully thought out). - -File: cvsclient.info, Node: Requests, Next: Responses, Prev: Filenames, Up: Protocol + Characters outside the invariant ISO 646 character set should be +avoided in filenames. This restriction may need to be relaxed to allow +for characters such as `[' and `]' (see above about non-unix servers); +this has not been carefully considered (and currently implementations +probably use whatever character sets that the operating systems they +are running on allow, and/or that users specify). Of course the most +portable practice is to restrict oneself further, to the POSIX portable +filename character set as specified in POSIX.1. -Requests -======== + +File: cvsclient.info, Node: File transmissions, Next: Strings, Prev: Filenames, Up: Protocol - By convention, requests which begin with a capital letter do not -elicit a response from the server, while all others do - save one. The -exception is `gzip-file-contents'. Unrecognized requests will always -elicit a response from the server, even if that request begins with a -capital letter. +File transmissions +================== File contents (noted below as FILE TRANSMISSION) can be sent in one of two forms. The simpler form is a number of bytes, followed by a -newline, followed by the specified number of bytes of file contents. +linefeed, followed by the specified number of bytes of file contents. These are the entire contents of the specified file. Second, if both client and server support `gzip-file-contents', a `z' may precede the length, and the `file contents' sent are actually compressed with @@ -304,8 +318,48 @@ length, and the `file contents' sent are actually compressed with compressed version of the file. In neither case are the file content followed by any additional data. -The transmission of a file will end with a newline iff that file (or its -compressed form) ends with a newline. +The transmission of a file will end with a linefeed iff that file (or +its compressed form) ends with a linefeed. + + The encoding of file contents depends on the value for the `-k' +option. If the file is binary (as specified by the `-kb' option in the +appropriate place), then it is just a certain number of octets, and the +protocol contributes nothing towards determining the encoding (using +the file name is one widespread, if not universally popular, mechanism). +If the file is text (not binary), then the file is sent as a series of +lines, separated by linefeeds. If the keyword expansion is set to +something other than `-ko', then it is expected that the file conform +to the RCS expectations regarding keyword expansion--in particular, +that it is in a character set such as ASCII in which 0x24 is a dollar +sign (`$'). + + +File: cvsclient.info, Node: Strings, Next: Requests, Prev: File transmissions, Up: Protocol + +Strings +======= + + In various contexts, for example the `Argument' request and the `M' +response, one transmits what is essentially an arbitrary string. Often +this will have been supplied by the user (for example, the `-m' option +to the `ci' request). The protocol has no mechanism to specify the +character set of such strings; it would be fairly safe to stick to the +invariant ISO 646 character set but the existing practice is probably +to just transmit whatever the user specifies, and hope that everyone +involved agrees which character set is in use, or sticks to a common +subset. + + +File: cvsclient.info, Node: Requests, Next: Responses, Prev: Strings, Up: Protocol + +Requests +======== + + By convention, requests which begin with a capital letter do not +elicit a response from the server, while all others do - save one. The +exception is `gzip-file-contents'. Unrecognized requests will always +elicit a response from the server, even if that request begins with a +capital letter. `Root PATHNAME \n' Response expected: no. Tell the server which `CVSROOT' to use. @@ -338,6 +392,58 @@ compressed form) ends with a newline. (i.e. the last `Directory' which is sent before the command); to indicate that top level, `.' should be send for LOCAL-DIRECTORY. + Here is an example of where a client gets REPOSITORY and + LOCAL-DIRECTORY. Suppose that there is a module defined by + + moddir 1dir + + That is, one can check out `moddir' and it will take `1dir' in the + repository and check it out to `moddir' in the working directory. + Then an initial check out could proceed like this: + + C: Root /home/kingdon/zwork/cvsroot + . . . + C: Argument moddir + C: Directory . + C: /home/kingdon/zwork/cvsroot + C: co + S: Clear-sticky moddir/ + S: /home/kingdon/zwork/cvsroot/1dir/ + . . . + S: ok + + In this example the response shown is `Clear-sticky', but it could + be another response instead. Note that it returns two pathnames. + The first one, `moddir/', indicates the working directory to check + out into. The second one, ending in `1dir/', indicates the + directory to pass back to the server in a subsequent `Directory' + request. For example, a subsequent `update' request might look + like: + + C: Directory moddir + C: /home/kingdon/zwork/cvsroot/1dir + . . . + C: update + + For a given LOCAL-DIRECTORY, the repository will be the same for + each of the responses, so one can use the repository from whichever + response is most convenient. Typically a client will store the + repository along with the sources for each LOCAL-DIRECTORY, use + that same setting whenever operating on that LOCAL-DIRECTORY, and + not update the setting as long as the LOCAL-DIRECTORY exists. + + A client is free to rename a LOCAL-DIRECTORY at any time (for + example, in response to an explicit user request). While it is + true that the server supplies a LOCAL-DIRECTORY to the client, as + noted above, this is only the default place to put the directory. + Of course, the various `Directory' requests for a single command + (for example, `update' or `ci' request) should name a particular + directory with the same LOCAL-DIRECTORY. + + Each `Directory' request specifies a brand-new LOCAL-DIRECTORY and + REPOSITORY; that is, LOCAL-DIRECTORY and REPOSITORY are never + relative to paths specified in any previous `Directory' request. + `Max-dotdot LEVEL \n' Response expected: no. Tell the server that LEVEL levels of directories above the directory which `Directory' requests are @@ -378,8 +484,12 @@ compressed form) ends with a newline. to the directory most recently specified with `Directory'. If the user is operating on only some files in a directory, `Entry' requests for only those files need be included. If an `Entry' - request is sent without `Modified' or `Unchanged', it means the - file is lost (does not exist in the working directory). + request is sent without `Modified', `Is-modified', or `Unchanged', + it means the file is lost (does not exist in the working + directory). If both `Entry' and one of `Modified', `Is-modified', + or `Unchanged' are sent for the same file, `Entry' must be sent + first. For a given file, one can send `Modified', `Is-modified', + or `Unchanged', but not more than one of these three. `Modified FILENAME \n' Response expected: no. Additional data: mode, \n, file @@ -389,6 +499,38 @@ compressed form) ends with a newline. a directory, only those files need to be included. This can also be sent without `Entry', if there is no entry for the file. +`Is-modified FILENAME \n' + Response expected: no. Additional data: none. Like `Modified', + but used if the server only needs to know whether the file is + modified, not the contents. + + The commands which can take `Is-modified' instead of `Modified' + with no known change in behavior are: `admin', `diff' (if and only + if two `-r' or `-D' options are specified), `watch-on', + `watch-off', `watch-add', `watch-remove', `watchers', `editors', + `log', and `annotate'. + + For the `status' command, one can send `Is-modified' but if the + client is using imperfect mechanisms such a timestamps to determine + whether to consider a file modified, then the behavior will be + different. That is, if one sends `Modified', then the server will + actually compare the contents of the file sent and the one it + derives from to determine whether the file is genuinely modified. + But if one sends `Is-modified', then the server takes the client's + word for it. A similar situation exists for `tag', if the `-c' + option is specified. + + Commands for which `Modified' is necessary are `co', `ci', + `update', and `import'. + + Commands which do not need to inform the server about a working + directory, and thus should not be sending either `Modified' or + `Is-modified': `rdiff', `rtag', `history', `init', and `release'. + + Commands for which further investigation is warranted are: + `remove', `add', and `export'. Pending such investigation, the + more conservative course of action is to stick to `Modified'. + `Unchanged FILENAME \n' Response expected: no. Tell the server that FILENAME has not been modified in the checked out directory. The name is relative to @@ -407,13 +549,26 @@ compressed form) ends with a newline. Additional data: NOTIFICATION-TYPE \t TIME \t CLIENTHOST \t WORKING-DIR \t WATCHES \n - where NOTIFICATION-TYPE is `E' for edit or `U' for unedit, TIME is - the time at which the edit or unedit took place, CLIENTHOST is the - name of the host on which the edit or unedit took place, and - WORKING-DIR is the pathname of the working directory where the - edit or unedit took place. WATCHES are the temporary watches to - set; if it is followed by \t then the tab and the rest of the line - are ignored. + where NOTIFICATION-TYPE is `E' for edit, `U' for unedit, undefined + behavior if `C', and all other letters should be silently ignored + for future expansion. TIME is the time at which the edit or + unedit took place, in a user-readable format of the client's + choice (the server should treat the time as an opaque string + rather than interpreting it). CLIENTHOST is the name of the host + on which the edit or unedit took place, and WORKING-DIR is the + pathname of the working directory where the edit or unedit took + place. WATCHES are the temporary watches to set. If WATCHES is + followed by \t then the \t and the rest of the line should be + ignored, for future expansion. + + Note that a client may be capable of performing an `edit' or + `unedit' operation without connecting to the server at that time, + and instead connecting to the server when it is convenient (for + example, when a laptop is on the net again) to send the `Notify' + requests. Even if a client is capable of deferring notifications, + it should attempt to send them immediately (one can send `Notify' + requests together with a `noop' request, for example), unless + perhaps if it can know that a connection would be impossible. `Questionable FILENAME \n' Response expected: no. Additional data: no. Tell the server to @@ -487,7 +642,42 @@ compressed form) ends with a newline. not rtag or rdiff; the latter do not access the working directory and thus have no need to expand modules on the client side. -`co \n' + Expand may not be the best word for what this request does. It + does not necessarily tell you all the files contained in a module, + for example. Basically it is a way of telling you which working + directories the server needs to know about in order to handle a + checkout of the specified modules. + + For example, suppose that the server has a module defined by + + aliasmodule -a 1dir + + That is, one can check out `aliasmodule' and it will take `1dir' + in the repository and check it out to `1dir' in the working + directory. Now suppose the client already has this module checked + out and is planning on using the `co' request to update it. + Without using `expand-modules', the client would have two bad + choices: it could either send information about *all* working + directories under the current directory, which could be + unnecessarily slow, or it could be ignorant of the fact that + `aliasmodule' stands for `1dir', and neglect to send information + for `1dir', which would lead to incorrect operation. + + With `expand-modules', the client would first ask for the module to + be expanded: + + C: Root /home/kingdon/zwork/cvsroot + . . . + C: Argument aliasmodule + C: Directory . + C: /home/kingdon/zwork/cvsroot + C: expand-modules + S: Module-expansion 1dir + S: ok + + and then it knows to check the `1dir' directory and send requests + such as `Entry' and `Modified' for the files in that directory. + `ci \n' `diff \n' `tag \n' @@ -495,8 +685,6 @@ compressed form) ends with a newline. `log \n' `add \n' `remove \n' -`rdiff \n' -`rtag \n' `admin \n' `export \n' `history \n' @@ -510,6 +698,23 @@ compressed form) ends with a newline. made for any input from the user. This means that `ci' must use a `-m' argument if it wants to specify a log message. +`co \n' + Response expected: yes. Get files from the repository. This uses + any previous `Argument', `Directory', `Entry', or `Modified' + requests, if they have been sent. Arguments to this command are + module names; the client cannot know what directories they + correspond to except by (1) just sending the `co' request, and then + seeing what directory names the server sends back in its + responses, and (2) the `expand-modules' request. + +`rdiff \n' +`rtag \n' + Response expected: yes. Actually do a cvs command. This uses any + previous `Argument' requests, if they have been sent. The client + should not send `Directory', `Entry', or `Modified' requests for + this command; they are not used. Arguments to these commands are + module names, as described for `co'. + `init ROOT-NAME \n' Response expected: yes. If it doesn't already exist, create a CVS repository ROOT-NAME. Note that ROOT-NAME is a local directory @@ -606,7 +811,7 @@ message and exiting--this should be investigated further). In the following, PATHNAME actually indicates a pair of pathnames. First, a local directory name relative to the directory in which the command was given (i.e. the last `Directory' before the command). Then -a newline and a repository name. Then a slash and the filename +a linefeed and a repository name. Then a slash and the filename (without a `,v' ending). For example, for a file `i386.mh' which is in the local directory `gas.clean/config' and for which the repository is `/rel/cvsfiles/devo/gas/config': @@ -614,6 +819,26 @@ the local directory `gas.clean/config' and for which the repository is gas.clean/config/ /rel/cvsfiles/devo/gas/config/i386.mh + If the server wants to tell the client to create a directory, then it +merely uses the directory in any response, as described above, and the +client should create the directory if it does not exist. Note that this +should only be done one directory at a time, in order to permit the +client to correctly store the repository for each directory. Servers +can use requests such as `Clear-sticky', `Clear-static-directory', or +any other requests, to create directories. + + Some server implementations may poorly distinguish between a +directory which should not exist and a directory which contains no +files; in order to refrain from creating empty directories a client +should both send the `-P' option to `update' or `co', and should also +detect the case in which the server asks to create a directory but not +any files within it (in that case the client should remove the +directory or refrain from creating it in the first place). Note that +servers could clean this up greatly by only telling the client to +create directories if the directory in question should exist, but until +servers do this, clients will need to offer the `-P' behavior described +above. + Any response always ends with `error' or `ok'. This indicates that the response is over. @@ -661,12 +886,29 @@ the response is over. is used only if a `Entry', `Modified', or `Unchanged' request has been sent for the file in question. + This response, or `Merged', indicates that the server has + determined that it is OK to overwrite the previous contents of the + file specified by PATHNAME. Provided that the client has correctly + sent `Modified' or `Is-modified' requests for a modified file, and + the file was not modified while CVS was running, the server can + ensure that a user's modifications are not lost. + `Merged PATHNAME \n' This is just like `Updated' and takes the same additional data, with the one difference that after the new copy of the file is enclosed, it will still not be up to date. Used for the results of a merge, with or without conflicts. + It is useful to preserve an copy of what the file looked like + before the merge. This is basically handled by the server; before + sending `Merged' it will send a `Copy-file' response. For + example, if the file is `aa' and it derives from revision 1.3, the + `Copy-file' response will tell the client to copy `aa' to + `.#aa.1.3'. It is up to the client to decide how long to keep this + file around; traditionally clients have left it around forever, + thus letting the user clean it up as desired. But another answer, + such as until the next commit, might be preferable. + `Patched PATHNAME \n' This is just like `Updated' and takes the same additional data, with the one difference that instead of sending a new copy of the @@ -944,16 +1186,18 @@ Tag Table: Node: Top117 Node: Introduction885 Node: Goals3419 -Node: Protocol Notes5226 -Node: Connection and Authentication6904 -Node: Protocol9699 -Node: Entries Lines10159 -Node: Modes10867 -Node: Filenames12390 -Node: Requests13141 -Node: Responses27895 -Node: Example37034 -Node: Requirements40961 -Node: Obsolete41869 +Node: Protocol Notes5829 +Node: Connection and Authentication7507 +Node: Protocol10302 +Node: Entries Lines10910 +Node: Modes11618 +Node: Filenames13141 +Node: File transmissions14443 +Node: Strings16001 +Node: Requests16687 +Node: Responses38060 +Node: Example49374 +Node: Requirements53301 +Node: Obsolete54209  End Tag Table diff --git a/gnu/usr.bin/cvs/doc/cvsclient.ps b/gnu/usr.bin/cvs/doc/cvsclient.ps index 734d96453c0..d6b5636944a 100644 --- a/gnu/usr.bin/cvs/doc/cvsclient.ps +++ b/gnu/usr.bin/cvs/doc/cvsclient.ps @@ -1,14 +1,14 @@ %!PS-Adobe-2.0 %%Creator: dvipsk 5.58f Copyright 1986, 1994 Radical Eye Software %%Title: cvsclient.dvi -%%Pages: 20 +%%Pages: 23 %%PageOrder: Ascend %%BoundingBox: 0 0 596 842 %%DocumentPaperSizes: a4 %%EndComments %DVIPSCommandLine: dvips cvsclient.dvi -o cvsclient.ps %DVIPSParameters: dpi=600, compressed, comments removed -%DVIPSSource: TeX output 1997.03.25:1329 +%DVIPSSource: TeX output 1997.04.18:1220 %%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 @@ -70,296 +70,326 @@ p 1 w}B /r{p 2 w}B /s{p 3 w}B /t{p 4 w}B /x{0 S rmoveto}B /y{3 2 roll p a}B /bos{/SS save N}B /eos{SS restore}B end %%EndProcSet TeXDict begin 39158280 55380996 1000 600 600 (cvsclient.dvi) -@start /Fa 37 121 df12 D46 D<157815FC14031407141F14FF130F0007B5FCB6FCA214 -7F13F0EAF800C7FCB3B3B3A6007FB712FEA52F4E76CD43>49 DI<91380FFFC091B512FC0107ECFF80011F15E090263FF8077F9026FF800113FC -4848C76C7ED803F86E7E491680D807FC8048B416C080486D15E0A4805CA36C17C06C5B6C -90C75AD801FC1680C9FC4C13005FA24C5A4B5B4B5B4B13C04B5BDBFFFEC7FC91B512F816 -E016FCEEFF80DA000713E0030113F89238007FFE707E7013807013C018E07013F0A218F8 -A27013FCA218FEA2EA03E0EA0FF8487E487E487EB57EA318FCA25E18F891C7FC6C17F049 -5C6C4816E001F04A13C06C484A1380D80FF84A13006CB44A5A6CD9F0075BC690B612F06D -5D011F1580010302FCC7FCD9001F1380374F7ACD43>I<177C17FEA2160116031607160F -A2161F163F167FA216FF5D5DA25D5DED1FBFED3F3F153E157C15FCEC01F815F0EC03E014 -07EC0FC01580EC1F005C147E147C5C1301495A495A5C495A131F49C7FC133E5B13FC485A -5B485A1207485A485A90C8FC123E127E5ABA12C0A5C96C48C7FCAF020FB712C0A53A4F7C -CE43>III<121F7F7FEBFF8091B81280A45A190060 -6060A2606060485F0180C86CC7FC007EC95A4C5A007C4B5A5F4C5A160F4C5A484B5A4C5A -94C8FC16FEC812014B5A5E4B5A150F4B5AA24B5AA24B5A15FFA24A90C9FCA25C5D1407A2 -140FA25D141FA2143FA4147F5DA314FFA55BAC6D5BA2EC3FC06E5A395279D043>I<9138 -07FFC0027F13FC0103B67E010F15E090261FFC0113F8903A3FE0003FFCD97F80EB0FFE49 -C76C7E48488048486E1380000717C04980120F18E0177FA2121F7FA27F7F6E14FF02E015 -C014F802FE4913806C7FDBC00313009238F007FE6C02F85B9238FE1FF86C9138FFBFF06C -EDFFE017806C4BC7FC6D806D81010F15E06D81010115FC010781011F81491680EBFFE748 -018115C048D9007F14E04848011F14F048487F48481303030014F8484880161F48480207 -13FC1601824848157F173FA2171FA2170FA218F8A27F007F17F06D151FA26C6CED3FE000 -1F17C06D157F6C6CEDFF806C6C6C010313006C01E0EB0FFE6C01FCEBFFFC6C6CB612F06D -5D010F1580010102FCC7FCD9000F13C0364F7ACD43>I<932601FFFCEC01C0047FD9FFC0 -13030307B600F81307033F03FE131F92B8EA803F0203DAE003EBC07F020F01FCC7383FF0 -FF023F01E0EC0FF94A01800203B5FC494848C9FC4901F882494982494982494982494982 -4990CA7E494883A2484983485B1B7F485B481A3FA24849181FA3485B1B0FA25AA298C7FC -5CA2B5FCAE7EA280A2F307C07EA36C7FA21B0F6C6D1980A26C1A1F6C7F1C006C6D606C6D -187EA26D6C606D6D4C5A6D6D16036D6D4C5A6D6D4C5A6D01FC4C5A6D6DEE7F806D6C6C6C -4BC7FC6E01E0EC07FE020F01FEEC1FF80203903AFFE001FFF0020091B612C0033F93C8FC -030715FCDB007F14E0040101FCC9FC525479D261>67 D69 D76 DI<93 -380FFFC00303B6FC031F15E092B712FC0203D9FC0013FF020F01C0010F13C0023F90C700 -0313F0DA7FFC02007F494848ED7FFE4901E0ED1FFF49496F7F49496F7F4990C96C7F4985 -4948707F4948707FA24849717E48864A83481B804A83481BC0A2481BE04A83A2481BF0A3 -48497113F8A5B51AFCAF6C1BF86E5FA46C1BF0A26E5F6C1BE0A36C6D4D13C0A26C6D4D13 -80A26C1B006C6D4D5A6E5E6C626D6C4C5B6D6D4B5B6D6D4B5B6D6D4B5B6D6D4B5B6D6D4B -90C7FC6D6D4B5A6D01FF02035B023F01E0011F13F0020F01FC90B512C0020390B7C8FC02 -0016FC031F15E0030392C9FCDB001F13E0565479D265>79 D82 D97 DI<913801FFF8021FEBFF8091B612F0010315FC010F9038 -C00FFE903A1FFE0001FFD97FFC491380D9FFF05B4817C048495B5C5A485BA2486F138091 -C7FC486F1300705A4892C8FC5BA312FFAD127F7FA27EA2EF03E06C7F17076C6D15C07E6E -140F6CEE1F806C6DEC3F006C6D147ED97FFE5C6D6CEB03F8010F9038E01FF0010390B55A -01001580023F49C7FC020113E033387CB63C>I<4DB47E0407B5FCA5EE001F1707B3A491 -3801FFE0021F13FC91B6FC010315C7010F9038E03FE74990380007F7D97FFC0101B5FC49 -487F4849143F484980485B83485B5A91C8FC5AA3485AA412FFAC127FA36C7EA37EA26C7F -5F6C6D5C7E6C6D5C6C6D49B5FC6D6C4914E0D93FFED90FEFEBFF80903A0FFFC07FCF6D90 -B5128F0101ECFE0FD9003F13F8020301C049C7FC41547CD24B>I<913803FFC0023F13FC -49B6FC010715C04901817F903A3FFC007FF849486D7E49486D7E4849130F48496D7E4817 -8048497F18C0488191C7FC4817E0A248815B18F0A212FFA490B8FCA318E049CAFCA6127F -A27F7EA218E06CEE01F06E14037E6C6DEC07E0A26C6DEC0FC06C6D141F6C6DEC3F806D6C -ECFF00D91FFEEB03FE903A0FFFC03FF8010390B55A010015C0021F49C7FC020113F03438 -7CB63D>IIII<137F497E000313E0487FA2487FA76C5BA26C5BC613806DC7FC90C8FCADEB3F -F0B5FCA512017EB3B3A6B612E0A51B547BD325>I108 DII<91 -3801FFE0021F13FE91B612C0010315F0010F9038807FFC903A1FFC000FFED97FF86D6C7E -49486D7F48496D7F48496D7F4A147F48834890C86C7EA24883A248486F7EA3007F1880A4 -00FF18C0AC007F1880A3003F18006D5DA26C5FA26C5F6E147F6C5F6C6D4A5A6C6D495B6C -6D495B6D6C495BD93FFE011F90C7FC903A0FFF807FFC6D90B55A010015C0023F91C8FC02 -0113E03A387CB643>I<903A3FF001FFE0B5010F13FE033FEBFFC092B612F002F301017F -913AF7F8007FFE0003D9FFE0EB1FFFC602806D7F92C76C7F4A824A6E7F4A6E7FA2717FA2 -85187F85A4721380AC1A0060A36118FFA2615F616E4A5BA26E4A5B6E4A5B6F495B6F4990 -C7FC03F0EBFFFC9126FBFE075B02F8B612E06F1480031F01FCC8FC030313C092CBFCB1B6 -12F8A5414D7BB54B>I<912601FFE0EB0780021F01F8130F91B500FE131F0103ECFF8001 -0F9039F03FC03F499039800FE07F903A7FFE0003F04948903801F8FF4849EB00FD484914 -7F4A805A4849805A4A805AA291C87E5AA35B12FFAC6C7EA37EA2806C5EA26C6D5CA26C6D -5C6C6D5C6C93B5FC6C6D5B6D6C5B6DB4EB0FEF010F9038C07FCF6D90B5120F010114FED9 -003F13F80203138091C8FCB1040FB61280A5414D7CB547>I<90397FE003FEB590380FFF -80033F13E04B13F09238FE1FF89139E1F83FFC0003D9E3E013FEC6ECC07FECE78014EF15 -0014EE02FEEB3FFC5CEE1FF8EE0FF04A90C7FCA55CB3AAB612FCA52F367CB537>I<9039 -03FFF00F013FEBFE1F90B7FC120348EB003FD80FF81307D81FE0130148487F4980127F90 -C87EA24881A27FA27F01F091C7FC13FCEBFFC06C13FF15F86C14FF16C06C15F06C816C81 -6C81C681013F1580010F15C01300020714E0EC003F030713F015010078EC007F00F8153F -161F7E160FA27E17E07E6D141F17C07F6DEC3F8001F8EC7F0001FEEB01FE9039FFC00FFC -6DB55AD8FC1F14E0D8F807148048C601F8C7FC2C387CB635>I<143EA6147EA414FEA213 -01A313031307A2130F131F133F13FF5A000F90B6FCB8FCA426003FFEC8FCB3A9EE07C0AB -011FEC0F8080A26DEC1F0015806DEBC03E6DEBF0FC6DEBFFF86D6C5B021F5B020313802A -4D7ECB34>III<007FB500F090387FFFFEA5C66C48C7000F90C7FC6D6CEC07F86D6D5C6D6D -495A6D4B5A6F495A6D6D91C8FC6D6D137E6D6D5B91387FFE014C5A6E6C485A6EEB8FE06E -EBCFC06EEBFF806E91C9FCA26E5B6E5B6F7E6F7EA26F7F834B7F4B7F92B5FCDA01FD7F03 -F87F4A486C7E4A486C7E020F7FDA1FC0804A486C7F4A486C7F02FE6D7F4A6D7F495A4948 -6D7F01076F7E49486E7E49486E7FEBFFF0B500FE49B612C0A542357EB447>120 -D E /Fb 3 119 df99 D<90383FC00C9038FFF81C0003EBFE3C390FE03FFC38 -1F8007EB0003003E1301481300157C5A153CA36C141CA27E6C14006C7E13E013FE383FFF -E06C13FE6CEBFF806C14E0000114F06C6C13F8010F13FC1300EC07FE14011400157F153F -12E0151FA37EA2151E6C143E6C143C6C147C6C14F89038C001F039FBF807E000F1B512C0 -D8E07F130038C007FC20317BAF2A>115 D118 -D E /Fc 1 16 df -15 D E /Fd 74 126 df<00101304007C131F00FEEB3F80A26C137FA248133FB2007E14 -00007C7F003C131E00101304191C75B830>34 D39 D<141E147F14FF5BEB03FEEB07FCEB0FF0EB1FE0EB3FC0EB7F80 -EBFF00485A5B12035B485A120F5BA2485AA2123F5BA2127F90C7FCA412FEAD127FA47F12 -3FA27F121FA26C7EA27F12076C7E7F12017F6C7EEB7F80EB3FC0EB1FE0EB0FF0EB07FCEB -03FEEB01FF7F147F141E184771BE30>I<127812FE7E7F6C7E6C7EEA0FF06C7E6C7E6C7E -6C7EEB7F80133F14C0131FEB0FE014F01307A2EB03F8A214FC1301A214FE1300A4147FAD -14FEA4130114FCA2130314F8A2EB07F0A2130F14E0EB1FC0133F1480137FEBFF00485A48 -5A485A485AEA3FE0485A485A90C7FC5A1278184778BE30>I<143EA2147FAF007FB7FCA2 -B81280A36C1600A2C76CC8FCAF143EA229297DAF30>43 DI<007FB612F0A2B712F8A36C15F0A225077B9E30>I<120FEA -3FC0EA7FE0A2EAFFF0A4EA7FE0A2EA3FC0EA0F000C0C6E8B30>I<16F01501ED03F8A215 -07A2ED0FF0A2ED1FE0A2ED3FC0A2ED7F80A2EDFF00A24A5AA25D1403A24A5AA24A5AA24A -5AA24A5AA24A5AA24AC7FCA2495AA25C1303A2495AA2495AA2495AA2495AA2495AA249C8 -FCA2485AA25B1203A2485AA2485AA2485AA2485AA2485AA248C9FCA25AA2127CA225477B -BE30>I<14FE903807FFC0497F013F13F8497F90B57E48EB83FF4848C6138049137F4848 -EB3FC04848EB1FE049130F001F15F0491307A24848EB03F8A290C712014815FCA400FEEC -00FEAD6C14016C15FCA36D1303003F15F8A26D1307001F15F0A26D130F6C6CEB1FE0A26C -6CEB3FC06C6CEB7F806D13FF2601FF8313006CEBFFFE6D5B6D5B010F13E06D5BD900FEC7 -FC273A7CB830>III -I54 D<49B4FC011F13F0017F13FC90B57E0003ECFF804815C048010113E03A1FF800 -3FF049131FD83FC0EB07F8A24848EB03FC90C71201A56D1303003F15F86D13076C6CEB0F -F06C6CEB1FE0D807FCEB7FC03A03FF83FF806C90B512006C6C13FC011F13F0497F90B512 -FE48802607FE0013C0D80FF8EB3FE0D81FE0EB0FF04848EB07F8491303007F15FC90C712 -014815FE481400A66C14016C15FC6D1303003F15F86D1307D81FF0EB1FF06D133F3A0FFF -01FFE06C90B512C06C1580C6ECFE006D5B011F13F0010190C7FC273A7CB830>56 -D<120FEA3FC0EA7FE0A2EAFFF0A4EA7FE0A2EA3FC0EA0F00C7FCAF120FEA3FC0EA7FE0A2 -EAFFF0A4EA7FE0A2EA3FC0EA0F000C276EA630>58 DI< -16F01503ED07F8151F157FEDFFF014034A13C0021F138091383FFE00ECFFF8495B010713 -C0495BD93FFEC7FC495A3801FFF0485B000F13804890C8FCEA7FFC5BEAFFE05B7FEA7FF8 -7FEA1FFF6C7F000313E06C7F38007FFC6D7E90380FFF806D7F010113F06D7FEC3FFE9138 -1FFF80020713C06E13F01400ED7FF8151F1507ED03F01500252F7BB230>I<007FB7FCA2 -B81280A36C16006C5DCBFCA7003FB612FE4881B81280A36C1600A229157DA530>I63 D<147F4A7EA2497FA4497F14F7A401077F14E3A3010F7FA314C1A2011F7FA490 -383F80FEA590387F007FA4498049133F90B6FCA34881A39038FC001F00038149130FA400 -0781491307A2D87FFFEB7FFFB56CB51280A46C496C130029397DB830>65 -D<007FB512F0B612FE6F7E82826C813A03F8001FF815076F7E1501A26F7EA615015EA24B -5A1507ED1FF0ED7FE090B65A5E4BC7FC6F7E16E0829039F8000FF8ED03FC6F7E1500167F -A3EE3F80A6167F1700A25E4B5A1503ED1FFC007FB6FCB75A5E16C05E6C02FCC7FC29387E -B730>I<91387F803C903903FFF03E49EBFC7E011F13FE49EBFFFE5B9038FFE07F48EB80 -1F3903FE000F484813075B48481303A2484813015B123F491300A2127F90C8FC167C1600 -5A5AAC7E7EA2167C6D14FE123FA27F121F6D13016C6C14FCA26C6CEB03F86D13076C6CEB -0FF03901FF801F6C9038E07FE06DB512C06D14806D1400010713FC6D13F09038007FC027 -3A7CB830>I<003FB512E04814FCB67E6F7E6C816C813A03F8007FF0ED1FF8150F6F7E6F -7E15016F7EA2EE7F80A2163F17C0161FA4EE0FE0AC161F17C0A3163F1780A2167F17005E -4B5A15034B5A150F4B5AED7FF0003FB65A485DB75A93C7FC6C14FC6C14E02B387FB730> -I<007FB7FCB81280A47ED803F8C7123FA8EE1F0093C7FCA4157C15FEA490B5FCA6EBF800 -A4157C92C8FCA5EE07C0EE0FE0A9007FB7FCB8FCA46C16C02B387EB730>I<003FB71280 -4816C0B8FCA27E7ED801FCC7121FA8EE0F8093C7FCA5153E157FA490B6FCA69038FC007F -A4153E92C8FCAE383FFFF8487FB5FCA27E6C5B2A387EB730>I<02FF13F00103EBC0F801 -0F13F1013F13FD4913FF90B6FC4813C1EC007F4848133F4848131F49130F485A49130712 -1F5B123F491303A2127F90C7FC6F5A92C8FC5A5AA892B5FC4A14805CA26C7F6C6D1400ED -03F8A27F003F1407A27F121F6D130F120F7F6C6C131FA2D803FE133F6C6C137FECC1FF6C -90B5FC7F6D13FB010F13F30103EBC1F0010090C8FC293A7DB830>I<3B3FFF800FFFE048 -6D4813F0B56C4813F8A26C496C13F06C496C13E0D803F8C7EAFE00B290B6FCA601F8C7FC -B3A23B3FFF800FFFE0486D4813F0B56C4813F8A26C496C13F06C496C13E02D387FB730> -I<007FB6FCB71280A46C1500260007F0C7FCB3B3A8007FB6FCB71280A46C1500213879B7 -30>I<49B512F04914F85BA27F6D14F090C7EAFE00B3B3123C127EB4FCA24A5A1403EB80 -07397FF01FF86CB55A5D6C5C00075C000149C7FC38003FF025397AB730>II<38 -3FFFF8487FB57EA26C5B6C5BD801FCC9FCB3B0EE0F80EE1FC0A9003FB7FC5AB8FCA27E6C -16802A387EB730>III<90383FFFE048B512FC000714FF4815804815C04815E0EBF800 -01E0133FD87F80EB0FF0A290C71207A44815F8481403B3A96C1407A26C15F0A36D130FA2 -6D131F6C6CEB3FE001F813FF90B6FC6C15C06C15806C1500000114FCD8003F13E0253A7B -B830>I<007FB512F0B612FE6F7E16E0826C813903F8003FED0FFCED03FE15016F7EA282 -1780163FA6167F17005EA24B5A1503ED0FFCED3FF890B6FC5E5E16804BC7FC15F001F8C9 -FCB0387FFFC0B57EA46C5B29387EB730>I<90383FFFE048B512FC000714FF4815804815 -C04815E0EBF80001E0133F4848EB1FF049130F90C71207A44815F8481403B3A8147E14FE -6CEBFF076C15F0EC7F87A2EC3FC7018013CF9038C01FFFD83FE014E0EBF80F90B6FC6C15 -C06C15806C1500000114FCD8003F7FEB00016E7EA21680157F16C0153F16E0151F16F015 -0FED07E025467BB830>I<003FB57E4814F0B612FC15FF6C816C812603F8017F9138003F -F0151F6F7E15071503821501A515035E1507150F4B5A153F4AB45A90B65A5E93C7FC5D81 -82D9F8007FED3FE0151F150F821507A817F8EEF1FCA53A3FFF8003FB4801C0EBFFF8B56C -7E17F06C496C13E06C49EB7FC0C9EA1F002E397FB730>I<90390FF803C0D97FFF13E048 -B512C74814F74814FF5A381FF80F383FE001497E4848137F90C7123F5A48141FA2150FA3 -7EED07C06C91C7FC7F7FEA3FF0EA1FFEEBFFF06C13FF6C14E0000114F86C80011F13FF01 -031480D9003F13C014019138007FE0151FED0FF0A2ED07F8A2007C140312FEA56C140716 -F07F6DEB0FE06D131F01F8EB3FC001FF13FF91B51280160000FD5CD8FC7F13F8D8F81F5B -D878011380253A7BB830>I<003FB712C04816E0B8FCA43AFE003F800FA8007CED07C0C7 -91C7FCB3B1011FB5FC4980A46D91C7FC2B387EB730>I<3B7FFFC007FFFCB56C4813FEA4 -6C496C13FCD803F8C7EA3F80B3B16D147F00011600A36C6C14FE6D13016D5CEC80039039 -3FE00FF890391FF83FF06DB55A6D5C6D5C6D91C7FC9038007FFCEC1FF02F3980B730>I< -D87FFE90380FFFC0B54913E06E5AA24A7E6C486D13C0D807F0903801FC00A26D13030003 -5DA46C6C495AA46C6C495AA46D131F6D5CA3EC803F013F5CA46D6C48C7FCA490380FE0FE -A401075B14F1A301035BA314FB01015BA314FFA26D5BA46E5A6E5A2B397EB730>II89 +6C5A6C5A6C5A1111769025>46 D<913803FFC0023F13FC91B6FC010315C0010F018113F0 +903A1FFC003FF849486D7E49486D7E49486D7E48496D138048496D13C0A24817E04890C8 +13F0A34817F8A24817FC49157FA3007F17FEA600FF17FFB3A5007F17FEA6003F17FCA26D +15FFA26C17F8A36C17F0A26C6D4913E0A26C6D4913C06C17806E5B6C6D4913006D6C495A +D91FFCEB3FF8903A0FFF81FFF06D90B55A01011580D9003F01FCC7FC020313C0384F7BCD +43>48 D<157815FC14031407141F14FF130F0007B5FCB6FCA2147F13F0EAF800C7FCB3B3 +B3A6007FB712FEA52F4E76CD43>II<91380FFFC091 +B512FC0107ECFF80011F15E090263FF8077F9026FF800113FC4848C76C7ED803F86E7E49 +1680D807FC8048B416C080486D15E0A4805CA36C17C06C5B6C90C75AD801FC1680C9FC4C +13005FA24C5A4B5B4B5B4B13C04B5BDBFFFEC7FC91B512F816E016FCEEFF80DA000713E0 +030113F89238007FFE707E7013807013C018E07013F0A218F8A27013FCA218FEA2EA03E0 +EA0FF8487E487E487EB57EA318FCA25E18F891C7FC6C17F0495C6C4816E001F04A13C06C +484A1380D80FF84A13006CB44A5A6CD9F0075BC690B612F06D5D011F1580010302FCC7FC +D9001F1380374F7ACD43>I<177C17FEA2160116031607160FA2161F163F167FA216FF5D +5DA25D5DED1FBFED3F3F153E157C15FCEC01F815F0EC03E01407EC0FC01580EC1F005C14 +7E147C5C1301495A495A5C495A131F49C7FC133E5B13FC485A5B485A1207485A485A90C8 +FC123E127E5ABA12C0A5C96C48C7FCAF020FB712C0A53A4F7CCE43>III<121F7F7FEBFF8091B81280A45A1900606060A2606060485F0180C8 +6CC7FC007EC95A4C5A007C4B5A5F4C5A160F4C5A484B5A4C5A94C8FC16FEC812014B5A5E +4B5A150F4B5AA24B5AA24B5A15FFA24A90C9FCA25C5D1407A2140FA25D141FA2143FA414 +7F5DA314FFA55BAC6D5BA2EC3FC06E5A395279D043>I<913807FFC0027F13FC0103B67E +010F15E090261FFC0113F8903A3FE0003FFCD97F80EB0FFE49C76C7E48488048486E1380 +000717C04980120F18E0177FA2121F7FA27F7F6E14FF02E015C014F802FE4913806C7FDB +C00313009238F007FE6C02F85B9238FE1FF86C9138FFBFF06CEDFFE017806C4BC7FC6D80 +6D81010F15E06D81010115FC010781011F81491680EBFFE748018115C048D9007F14E048 +48011F14F048487F48481303030014F8484880161F4848020713FC1601824848157F173F +A2171FA2170FA218F8A27F007F17F06D151FA26C6CED3FE0001F17C06D157F6C6CEDFF80 +6C6C6C010313006C01E0EB0FFE6C01FCEBFFFC6C6CB612F06D5D010F1580010102FCC7FC +D9000F13C0364F7ACD43>I<91380FFF8091B512F8010314FE010F6E7E4901037F90267F +F8007F4948EB3FF048496D7E484980486F7E484980824817805A91C714C05A7013E0A218 +F0B5FCA318F8A618FCA46C5DA37EA25E6C7F6C5DA26C5D6C7F6C6D137B6C6D13F390387F +F803011FB512E36D14C30103028313F89039007FFE03EC00401500A218F05EA3D801F816 +E0487E486C16C0487E486D491380A218005E5F4C5A91C7FC6C484A5A494A5A49495B6C48 +495BD803FC010F5B9027FF807FFEC7FC6C90B55A6C6C14F06D14C0010F49C8FC010013F0 +364F7ACD43>I<932601FFFCEC01C0047FD9FFC013030307B600F81307033F03FE131F92 +B8EA803F0203DAE003EBC07F020F01FCC7383FF0FF023F01E0EC0FF94A01800203B5FC49 +4848C9FC4901F8824949824949824949824949824990CA7E494883A2484983485B1B7F48 +5B481A3FA24849181FA3485B1B0FA25AA298C7FC5CA2B5FCAE7EA280A2F307C07EA36C7F +A21B0F6C6D1980A26C1A1F6C7F1C006C6D606C6D187EA26D6C606D6D4C5A6D6D16036D6D +4C5A6D6D4C5A6D01FC4C5A6D6DEE7F806D6C6C6C4BC7FC6E01E0EC07FE020F01FEEC1FF8 +0203903AFFE001FFF0020091B612C0033F93C8FC030715FCDB007F14E0040101FCC9FC52 +5479D261>67 D69 DI76 DI<93380FFFC00303B6FC031F15E092B712FC0203D9FC0013FF020F01C0010F13C002 +3F90C7000313F0DA7FFC02007F494848ED7FFE4901E0ED1FFF49496F7F49496F7F4990C9 +6C7F49854948707F4948707FA24849717E48864A83481B804A83481BC0A2481BE04A83A2 +481BF0A348497113F8A5B51AFCAF6C1BF86E5FA46C1BF0A26E5F6C1BE0A36C6D4D13C0A2 +6C6D4D1380A26C1B006C6D4D5A6E5E6C626D6C4C5B6D6D4B5B6D6D4B5B6D6D4B5B6D6D4B +5B6D6D4B90C7FC6D6D4B5A6D01FF02035B023F01E0011F13F0020F01FC90B512C0020390 +B7C8FC020016FC031F15E0030392C9FCDB001F13E0565479D265>79 +D82 D<91260FFF80130791B5 +00F85B010702FF5B011FEDC03F49EDF07F9026FFFC006D5A4801E0EB0FFD4801800101B5 +FC4848C87E48488149150F001F824981123F4981007F82A28412FF84A27FA26D82A27F7F +6D93C7FC14C06C13F014FF15F86CECFF8016FC6CEDFFC017F06C16FC6C16FF6C17C06C83 +6C836D826D82010F821303010082021F16801400030F15C0ED007F040714E01600173F05 +0F13F08383A200788200F882A3187FA27EA219E07EA26CEFFFC0A27F6D4B13806D17006D +5D01FC4B5A01FF4B5A02C04A5A02F8EC7FF0903B1FFFC003FFE0486C90B65AD8FC0393C7 +FC48C66C14FC48010F14F048D9007F90C8FC3C5479D24B>I97 DI<913801FFF8021FEBFF8091B6 +12F0010315FC010F9038C00FFE903A1FFE0001FFD97FFC491380D9FFF05B4817C048495B +5C5A485BA2486F138091C7FC486F1300705A4892C8FC5BA312FFAD127F7FA27EA2EF03E0 +6C7F17076C6D15C07E6E140F6CEE1F806C6DEC3F006C6D147ED97FFE5C6D6CEB03F8010F +9038E01FF0010390B55A01001580023F49C7FC020113E033387CB63C>I<4DB47E0407B5 +FCA5EE001F1707B3A4913801FFE0021F13FC91B6FC010315C7010F9038E03FE749903800 +07F7D97FFC0101B5FC49487F4849143F484980485B83485B5A91C8FC5AA3485AA412FFAC +127FA36C7EA37EA26C7F5F6C6D5C7E6C6D5C6C6D49B5FC6D6C4914E0D93FFED90FEFEBFF +80903A0FFFC07FCF6D90B5128F0101ECFE0FD9003F13F8020301C049C7FC41547CD24B> +I<913803FFC0023F13FC49B6FC010715C04901817F903A3FFC007FF849486D7E49486D7E +4849130F48496D7E48178048497F18C0488191C7FC4817E0A248815B18F0A212FFA490B8 +FCA318E049CAFCA6127FA27F7EA218E06CEE01F06E14037E6C6DEC07E0A26C6DEC0FC06C +6D141F6C6DEC3F806D6CECFF00D91FFEEB03FE903A0FFFC03FF8010390B55A010015C002 +1F49C7FC020113F034387CB63D>IIII<137F497E000313E0487FA2487FA76C5BA26C5BC613 +806DC7FC90C8FCADEB3FF0B5FCA512017EB3B3A6B612E0A51B547BD325>I108 DII<913801FFE0021F13FE91B612C0010315F0010F9038807FFC903A1F +FC000FFED97FF86D6C7E49486D7F48496D7F48496D7F4A147F48834890C86C7EA24883A2 +48486F7EA3007F1880A400FF18C0AC007F1880A3003F18006D5DA26C5FA26C5F6E147F6C +5F6C6D4A5A6C6D495B6C6D495B6D6C495BD93FFE011F90C7FC903A0FFF807FFC6D90B55A +010015C0023F91C8FC020113E03A387CB643>I<903A3FF001FFE0B5010F13FE033FEBFF +C092B612F002F301017F913AF7F8007FFE0003D9FFE0EB1FFFC602806D7F92C76C7F4A82 +4A6E7F4A6E7FA2717FA285187F85A4721380AC1A0060A36118FFA2615F616E4A5BA26E4A +5B6E4A5B6F495B6F4990C7FC03F0EBFFFC9126FBFE075B02F8B612E06F1480031F01FCC8 +FC030313C092CBFCB1B612F8A5414D7BB54B>I<912601FFE0EB0780021F01F8130F91B5 +00FE131F0103ECFF80010F9039F03FC03F499039800FE07F903A7FFE0003F04948903801 +F8FF4849EB00FD4849147F4A805A4849805A4A805AA291C87E5AA35B12FFAC6C7EA37EA2 +806C5EA26C6D5CA26C6D5C6C6D5C6C93B5FC6C6D5B6D6C5B6DB4EB0FEF010F9038C07FCF +6D90B5120F010114FED9003F13F80203138091C8FCB1040FB61280A5414D7CB547>I<90 +397FE003FEB590380FFF80033F13E04B13F09238FE1FF89139E1F83FFC0003D9E3E013FE +C6ECC07FECE78014EF150014EE02FEEB3FFC5CEE1FF8EE0FF04A90C7FCA55CB3AAB612FC +A52F367CB537>I<903903FFF00F013FEBFE1F90B7FC120348EB003FD80FF81307D81FE0 +130148487F4980127F90C87EA24881A27FA27F01F091C7FC13FCEBFFC06C13FF15F86C14 +FF16C06C15F06C816C816C81C681013F1580010F15C01300020714E0EC003F030713F015 +010078EC007F00F8153F161F7E160FA27E17E07E6D141F17C07F6DEC3F8001F8EC7F0001 +FEEB01FE9039FFC00FFC6DB55AD8FC1F14E0D8F807148048C601F8C7FC2C387CB635>I< +143EA6147EA414FEA21301A313031307A2130F131F133F13FF5A000F90B6FCB8FCA42600 +3FFEC8FCB3A9EE07C0AB011FEC0F8080A26DEC1F0015806DEBC03E6DEBF0FC6DEBFFF86D +6C5B021F5B020313802A4D7ECB34>III<007FB500F090387FFFFEA5C66C48C7000F90C7FC +6D6CEC07F86D6D5C6D6D495A6D4B5A6F495A6D6D91C8FC6D6D137E6D6D5B91387FFE014C +5A6E6C485A6EEB8FE06EEBCFC06EEBFF806E91C9FCA26E5B6E5B6F7E6F7EA26F7F834B7F +4B7F92B5FCDA01FD7F03F87F4A486C7E4A486C7E020F7FDA1FC0804A486C7F4A486C7F02 +FE6D7F4A6D7F495A49486D7F01076F7E49486E7E49486E7FEBFFF0B500FE49B612C0A542 +357EB447>120 D E /Fb 3 119 df99 D<90383FC00C9038FFF81C0003EBFE3C +390FE03FFC381F8007EB0003003E1301481300157C5A153CA36C141CA27E6C14006C7E13 +E013FE383FFFE06C13FE6CEBFF806C14E0000114F06C6C13F8010F13FC1300EC07FE1401 +1400157F153F12E0151FA37EA2151E6C143E6C143C6C147C6C14F89038C001F039FBF807 +E000F1B512C0D8E07F130038C007FC20317BAF2A>115 D118 D E /Fc 1 16 df15 D E /Fd 78 126 df<00101304007C131F00FEEB3F80A26C137FA24813 +3FB2007E1400007C7F003C131E00101304191C75B830>34 D<903907C007C0A2496C487E +A8011F131FA202C05BA3007FB7FCA2B81280A36C16006C5D3A007F807F80A2020090C7FC +A9495BA2003F90B512FE4881B81280A36C1600A22701FC01FCC7FCA300031303A201F85B +A76C486C5AA229387DB730>I<1438147C14FCA4EB03FF011F13E090B512FC4880000780 +481580261FFEFD13C09039F0FC3FE0D83FC0131FD87F80EB0FF001001307007E15F800FE +14035A1507A36CEC03F0A2007F91C7FC138013C0EA3FF0EA1FFE13FF6C13FF6C14E00001 +14F86C6C7F011F7F01037F0100148002FD13C09138FC7FE0151FED0FF015070018EC03F8 +127E1501B4FCA35AA26CEC03F07E01801307ED0FE0D83FC0131F01F0EB7FC0D81FFEB512 +806CB612006C5C6C5CC614F0013F13C0D907FEC7FCEB00FCA5147C143825477BBE30>I< +EA07C0EA0FF0EA1FF8A213FCA213FE120F1207EA007EA513FE13FCA2120113F81203EA07 +F0120FEA1FE0127FEAFFC013801300127C12380F1D70B730>39 D<141E147F14FF5BEB03 +FEEB07FCEB0FF0EB1FE0EB3FC0EB7F80EBFF00485A5B12035B485A120F5BA2485AA2123F +5BA2127F90C7FCA412FEAD127FA47F123FA27F121FA26C7EA27F12076C7E7F12017F6C7E +EB7F80EB3FC0EB1FE0EB0FF0EB07FCEB03FEEB01FF7F147F141E184771BE30>I<127812 +FE7E7F6C7E6C7EEA0FF06C7E6C7E6C7E6C7EEB7F80133F14C0131FEB0FE014F01307A2EB +03F8A214FC1301A214FE1300A4147FAD14FEA4130114FCA2130314F8A2EB07F0A2130F14 +E0EB1FC0133F1480137FEBFF00485A485A485A485AEA3FE0485A485A90C7FC5A12781847 +78BE30>I<143EA2147FAF007FB7FCA2B81280A36C1600A2C76CC8FCAF143EA229297DAF +30>43 DI<007FB612F0A2B7 +12F8A36C15F0A225077B9E30>I<120FEA3FC0EA7FE0A2EAFFF0A4EA7FE0A2EA3FC0EA0F +000C0C6E8B30>I<16F01501ED03F8A21507A2ED0FF0A2ED1FE0A2ED3FC0A2ED7F80A2ED +FF00A24A5AA25D1403A24A5AA24A5AA24A5AA24A5AA24A5AA24AC7FCA2495AA25C1303A2 +495AA2495AA2495AA2495AA2495AA249C8FCA2485AA25B1203A2485AA2485AA2485AA248 +5AA2485AA248C9FCA25AA2127CA225477BBE30>I<14FE903807FFC0497F013F13F8497F +90B57E48EB83FF4848C6138049137F4848EB3FC04848EB1FE049130F001F15F0491307A2 +4848EB03F8A290C712014815FCA400FEEC00FEAD6C14016C15FCA36D1303003F15F8A26D +1307001F15F0A26D130F6C6CEB1FE0A26C6CEB3FC06C6CEB7F806D13FF2601FF8313006C +EBFFFE6D5B6D5B010F13E06D5BD900FEC7FC273A7CB830>IIII54 D<49B4FC011F13F0017F13FC90B57E +0003ECFF804815C048010113E03A1FF8003FF049131FD83FC0EB07F8A24848EB03FC90C7 +1201A56D1303003F15F86D13076C6CEB0FF06C6CEB1FE0D807FCEB7FC03A03FF83FF806C +90B512006C6C13FC011F13F0497F90B512FE48802607FE0013C0D80FF8EB3FE0D81FE0EB +0FF04848EB07F8491303007F15FC90C712014815FE481400A66C14016C15FC6D1303003F +15F86D1307D81FF0EB1FF06D133F3A0FFF01FFE06C90B512C06C1580C6ECFE006D5B011F +13F0010190C7FC273A7CB830>56 D<120FEA3FC0EA7FE0A2EAFFF0A4EA7FE0A2EA3FC0EA +0F00C7FCAF120FEA3FC0EA7FE0A2EAFFF0A4EA7FE0A2EA3FC0EA0F000C276EA630>58 +DI<16F01503ED07F8151F157FEDFFF014034A13C0021F +138091383FFE00ECFFF8495B010713C0495BD93FFEC7FC495A3801FFF0485B000F138048 +90C8FCEA7FFC5BEAFFE05B7FEA7FF87FEA1FFF6C7F000313E06C7F38007FFC6D7E90380F +FF806D7F010113F06D7FEC3FFE91381FFF80020713C06E13F01400ED7FF8151F1507ED03 +F01500252F7BB230>I<007FB7FCA2B81280A36C16006C5DCBFCA7003FB612FE4881B812 +80A36C1600A229157DA530>I63 D<147F4A7EA2497FA4497F14F7A401077F +14E3A3010F7FA314C1A2011F7FA490383F80FEA590387F007FA4498049133F90B6FCA348 +81A39038FC001F00038149130FA4000781491307A2D87FFFEB7FFFB56CB51280A46C496C +130029397DB830>65 D<007FB512F0B612FE6F7E82826C813A03F8001FF815076F7E1501 +A26F7EA615015EA24B5A1507ED1FF0ED7FE090B65A5E4BC7FC6F7E16E0829039F8000FF8 +ED03FC6F7E1500167FA3EE3F80A6167F1700A25E4B5A1503ED1FFC007FB6FCB75A5E16C0 +5E6C02FCC7FC29387EB730>I<91387F803C903903FFF03E49EBFC7E011F13FE49EBFFFE +5B9038FFE07F48EB801F3903FE000F484813075B48481303A2484813015B123F491300A2 +127F90C8FC167C16005A5AAC7E7EA2167C6D14FE123FA27F121F6D13016C6C14FCA26C6C +EB03F86D13076C6CEB0FF03901FF801F6C9038E07FE06DB512C06D14806D1400010713FC +6D13F09038007FC0273A7CB830>I<003FB512E04814FCB67E6F7E6C816C813A03F8007F +F0ED1FF8150F6F7E6F7E15016F7EA2EE7F80A2163F17C0161FA4EE0FE0AC161F17C0A316 +3F1780A2167F17005E4B5A15034B5A150F4B5AED7FF0003FB65A485DB75A93C7FC6C14FC +6C14E02B387FB730>I<007FB7FCB81280A47ED803F8C7123FA8EE1F0093C7FCA4157C15 +FEA490B5FCA6EBF800A4157C92C8FCA5EE07C0EE0FE0A9007FB7FCB8FCA46C16C02B387E +B730>I<003FB712804816C0B8FCA27E7ED801FCC7121FA8EE0F8093C7FCA5153E157FA4 +90B6FCA69038FC007FA4153E92C8FCAE383FFFF8487FB5FCA27E6C5B2A387EB730>I<02 +FF13F00103EBC0F8010F13F1013F13FD4913FF90B6FC4813C1EC007F4848133F4848131F +49130F485A491307121F5B123F491303A2127F90C7FC6F5A92C8FC5A5AA892B5FC4A1480 +5CA26C7F6C6D1400ED03F8A27F003F1407A27F121F6D130F120F7F6C6C131FA2D803FE13 +3F6C6C137FECC1FF6C90B5FC7F6D13FB010F13F30103EBC1F0010090C8FC293A7DB830> +I<3B3FFF800FFFE0486D4813F0B56C4813F8A26C496C13F06C496C13E0D803F8C7EAFE00 +B290B6FCA601F8C7FCB3A23B3FFF800FFFE0486D4813F0B56C4813F8A26C496C13F06C49 +6C13E02D387FB730>I<007FB6FCB71280A46C1500260007F0C7FCB3B3A8007FB6FCB712 +80A46C1500213879B730>I<49B512F04914F85BA27F6D14F090C7EAFE00B3B3123C127E +B4FCA24A5A1403EB8007397FF01FF86CB55A5D6C5C00075C000149C7FC38003FF025397A +B730>II<383FFFF8487FB57EA26C5B6C5BD801FCC9FCB3B0EE0F80EE1FC0A900 +3FB7FC5AB8FCA27E6C16802A387EB730>III<90383FFFE048B512FC000714FF481580 +4815C04815E0EBF80001E0133FD87F80EB0FF0A290C71207A44815F8481403B3A96C1407 +A26C15F0A36D130FA26D131F6C6CEB3FE001F813FF90B6FC6C15C06C15806C1500000114 +FCD8003F13E0253A7BB830>I<007FB512F0B612FE6F7E16E0826C813903F8003FED0FFC +ED03FE15016F7EA2821780163FA6167F17005EA24B5A1503ED0FFCED3FF890B6FC5E5E16 +804BC7FC15F001F8C9FCB0387FFFC0B57EA46C5B29387EB730>I<90383FFFE048B512FC +000714FF4815804815C04815E0EBF80001E0133F4848EB1FF049130F90C71207A44815F8 +481403B3A8147E14FE6CEBFF076C15F0EC7F87A2EC3FC7018013CF9038C01FFFD83FE014 +E0EBF80F90B6FC6C15C06C15806C1500000114FCD8003F7FEB00016E7EA21680157F16C0 +153F16E0151F16F0150FED07E025467BB830>I<003FB57E4814F0B612FC15FF6C816C81 +2603F8017F9138003FF0151F6F7E15071503821501A515035E1507150F4B5A153F4AB45A +90B65A5E93C7FC5D8182D9F8007FED3FE0151F150F821507A817F8EEF1FCA53A3FFF8003 +FB4801C0EBFFF8B56C7E17F06C496C13E06C49EB7FC0C9EA1F002E397FB730>I<90390F +F803C0D97FFF13E048B512C74814F74814FF5A381FF80F383FE001497E4848137F90C712 +3F5A48141FA2150FA37EED07C06C91C7FC7F7FEA3FF0EA1FFEEBFFF06C13FF6C14E00001 +14F86C80011F13FF01031480D9003F13C014019138007FE0151FED0FF0A2ED07F8A2007C +140312FEA56C140716F07F6DEB0FE06D131F01F8EB3FC001FF13FF91B51280160000FD5C +D8FC7F13F8D8F81F5BD878011380253A7BB830>I<003FB712C04816E0B8FCA43AFE003F +800FA8007CED07C0C791C7FCB3B1011FB5FC4980A46D91C7FC2B387EB730>I<3B7FFFC0 +07FFFCB56C4813FEA46C496C13FCD803F8C7EA3F80B3B16D147F00011600A36C6C14FE6D +13016D5CEC800390393FE00FF890391FF83FF06DB55A6D5C6D5C6D91C7FC9038007FFCEC +1FF02F3980B730>III< +D87FFF90381FFFC0B56C4813E0A46C496C13C0D803F8903803F8006D1307A26C6C495AA2 +6C6C5C151F6D5CEC803F013F5CECC07F011F91C7FCA290380FE0FEA214F101075BA29038 +03FBF8A201015B14FF6D5BA26E5AA36E5AB1903803FFF8497F497FA26D5B6D5B2B387EB7 +30>89 D<007FB5FCB61280A4150048C8FCB3B3B3A5B6FC1580A46C140019476DBE30>91 D<127CA212FEA27EA26C7EA26C7EA26C7EA26C7EA26C7EA26C7EA212017FA26C7EA26D7E A26D7EA26D7EA26D7EA26D7EA26D7EA2130180A26D7EA26E7EA26E7EA26E7EA26E7EA26E 7EA26E7EA2140181A26E7EA2ED7F80A2ED3FC0A2ED1FE0A2ED0FF0A2ED07F8A21503A2ED -01F0150025477BBE30>92 D<007FB612F0A2B712F8A36C15F0A225077B7D30>95 +01F0150025477BBE30>I<007FB5FCB61280A47EC7123FB3B3B3A5007FB5FCB6FCA46C14 +0019477DBE30>I<007FB612F0A2B712F8A36C15F0A225077B7D30>95 D<1338137CEA01FE12031207EA0FFC13F0EA1FE013C0EA3F8013005A127EA212FE5AA5EA FFC013E013F0127FA2123FA2EA1FE0EA07C00F1D70BE30>I