diff options
| -rw-r--r-- | gnu/usr.bin/cvs/doc/CVSvn.texi | 2 | ||||
| -rw-r--r-- | gnu/usr.bin/cvs/doc/cvs.aux | 434 | ||||
| -rw-r--r-- | gnu/usr.bin/cvs/doc/cvs.info | 325 | ||||
| -rw-r--r-- | gnu/usr.bin/cvs/doc/cvs.info-1 | 186 | ||||
| -rw-r--r-- | gnu/usr.bin/cvs/doc/cvs.info-2 | 278 | ||||
| -rw-r--r-- | gnu/usr.bin/cvs/doc/cvs.info-6 | 798 | ||||
| -rw-r--r-- | gnu/usr.bin/cvs/doc/cvs.info-8 | 476 | ||||
| -rw-r--r-- | gnu/usr.bin/cvs/doc/cvs.ps | 5949 | ||||
| -rw-r--r-- | gnu/usr.bin/cvs/doc/cvsclient.aux | 2 | ||||
| -rw-r--r-- | gnu/usr.bin/cvs/doc/cvsclient.info | 39 | ||||
| -rw-r--r-- | gnu/usr.bin/cvs/doc/cvsclient.ps | 853 |
11 files changed, 5135 insertions, 4207 deletions
diff --git a/gnu/usr.bin/cvs/doc/CVSvn.texi b/gnu/usr.bin/cvs/doc/CVSvn.texi index fea8d138c70..274e2627f8e 100644 --- a/gnu/usr.bin/cvs/doc/CVSvn.texi +++ b/gnu/usr.bin/cvs/doc/CVSvn.texi @@ -1 +1 @@ -@set CVSVN 1.9.4 +@set CVSVN 1.9.6 diff --git a/gnu/usr.bin/cvs/doc/cvs.aux b/gnu/usr.bin/cvs/doc/cvs.aux index bf4e4291c92..072b36bc41b 100644 --- a/gnu/usr.bin/cvs/doc/cvs.aux +++ b/gnu/usr.bin/cvs/doc/cvs.aux @@ -13,395 +13,395 @@ 'xrdef {What is CVS?-title}{What is CVS?} 'xrdef {What is CVS?-pg}{5} 'xrdef {What is CVS?-snt}{Chapter'tie1} -'xrdef {Basic concepts-title}{Basic concepts} -'xrdef {Basic concepts-pg}{9} -'xrdef {Basic concepts-snt}{Chapter'tie2} -'xrdef {Revision numbers-title}{Revision numbers} -'xrdef {Revision numbers-pg}{9} -'xrdef {Revision numbers-snt}{Section'tie2.1} -'xrdef {Versions revisions releases-title}{Versions, revisions and releases} -'xrdef {Versions revisions releases-pg}{10} -'xrdef {Versions revisions releases-snt}{Section'tie2.2} 'xrdef {A sample session-title}{A sample session} -'xrdef {A sample session-pg}{11} -'xrdef {A sample session-snt}{Chapter'tie3} +'xrdef {A sample session-pg}{9} +'xrdef {A sample session-snt}{Chapter'tie2} 'xrdef {Getting the source-title}{Getting the source} -'xrdef {Getting the source-pg}{11} -'xrdef {Getting the source-snt}{Section'tie3.1} +'xrdef {Getting the source-pg}{9} +'xrdef {Getting the source-snt}{Section'tie2.1} 'xrdef {Committing your changes-title}{Committing your changes} -'xrdef {Committing your changes-pg}{11} -'xrdef {Committing your changes-snt}{Section'tie3.2} +'xrdef {Committing your changes-pg}{9} +'xrdef {Committing your changes-snt}{Section'tie2.2} 'xrdef {Cleaning up-title}{Cleaning up} -'xrdef {Cleaning up-pg}{12} -'xrdef {Cleaning up-snt}{Section'tie3.3} +'xrdef {Cleaning up-pg}{10} +'xrdef {Cleaning up-snt}{Section'tie2.3} 'xrdef {Viewing differences-title}{Viewing differences} -'xrdef {Viewing differences-pg}{13} -'xrdef {Viewing differences-snt}{Section'tie3.4} +'xrdef {Viewing differences-pg}{11} +'xrdef {Viewing differences-snt}{Section'tie2.4} 'xrdef {Repository-title}{The Repository} -'xrdef {Repository-pg}{15} -'xrdef {Repository-snt}{Chapter'tie4} +'xrdef {Repository-pg}{13} +'xrdef {Repository-snt}{Chapter'tie3} 'xrdef {Specifying a repository-title}{Telling CVS where your repository is} -'xrdef {Specifying a repository-pg}{15} -'xrdef {Specifying a repository-snt}{Section'tie4.1} +'xrdef {Specifying a repository-pg}{13} +'xrdef {Specifying a repository-snt}{Section'tie3.1} 'xrdef {Repository storage-title}{How data is stored in the repository} -'xrdef {Repository storage-pg}{16} -'xrdef {Repository storage-snt}{Section'tie4.2} +'xrdef {Repository storage-pg}{14} +'xrdef {Repository storage-snt}{Section'tie3.2} 'xrdef {Repository files-title}{Where files are stored within the repository} -'xrdef {Repository files-pg}{16} -'xrdef {Repository files-snt}{Section'tie4.2.1} +'xrdef {Repository files-pg}{14} +'xrdef {Repository files-snt}{Section'tie3.2.1} 'xrdef {File permissions-title}{File permissions} -'xrdef {File permissions-pg}{18} -'xrdef {File permissions-snt}{Section'tie4.2.2} +'xrdef {File permissions-pg}{16} +'xrdef {File permissions-snt}{Section'tie3.2.2} 'xrdef {Intro administrative files-title}{The administrative files} -'xrdef {Intro administrative files-pg}{19} -'xrdef {Intro administrative files-snt}{Section'tie4.3} +'xrdef {Intro administrative files-pg}{17} +'xrdef {Intro administrative files-snt}{Section'tie3.3} 'xrdef {Multiple repositories-title}{Multiple repositories} -'xrdef {Multiple repositories-pg}{20} -'xrdef {Multiple repositories-snt}{Section'tie4.4} +'xrdef {Multiple repositories-pg}{18} +'xrdef {Multiple repositories-snt}{Section'tie3.4} 'xrdef {Creating a repository-title}{Creating a repository} -'xrdef {Creating a repository-pg}{20} -'xrdef {Creating a repository-snt}{Section'tie4.5} +'xrdef {Creating a repository-pg}{18} +'xrdef {Creating a repository-snt}{Section'tie3.5} 'xrdef {Remote repositories-title}{Remote repositories} -'xrdef {Remote repositories-pg}{21} -'xrdef {Remote repositories-snt}{Section'tie4.6} +'xrdef {Remote repositories-pg}{19} +'xrdef {Remote repositories-snt}{Section'tie3.6} 'xrdef {Server requirements-title}{Server requirements} -'xrdef {Server requirements-pg}{22} -'xrdef {Server requirements-snt}{Section'tie4.6.1} +'xrdef {Server requirements-pg}{20} +'xrdef {Server requirements-snt}{Section'tie3.6.1} 'xrdef {Connecting via rsh-title}{Connecting with rsh} -'xrdef {Connecting via rsh-pg}{22} -'xrdef {Connecting via rsh-snt}{Section'tie4.6.2} +'xrdef {Connecting via rsh-pg}{20} +'xrdef {Connecting via rsh-snt}{Section'tie3.6.2} 'xrdef {Password authenticated-title}{Direct connection with password authentication} -'xrdef {Password authenticated-pg}{23} -'xrdef {Password authenticated-snt}{Section'tie4.6.3} +'xrdef {Password authenticated-pg}{21} +'xrdef {Password authenticated-snt}{Section'tie3.6.3} 'xrdef {Password authentication server-title}{Setting up the server for password authentication} -'xrdef {Password authentication server-pg}{23} -'xrdef {Password authentication server-snt}{Section'tie4.6.3.1} +'xrdef {Password authentication server-pg}{21} +'xrdef {Password authentication server-snt}{Section'tie3.6.3.1} 'xrdef {Password authentication client-title}{Using the client with password authentication} -'xrdef {Password authentication client-pg}{25} -'xrdef {Password authentication client-snt}{Section'tie4.6.3.2} +'xrdef {Password authentication client-pg}{23} +'xrdef {Password authentication client-snt}{Section'tie3.6.3.2} 'xrdef {Password authentication security-title}{Security considerations with password authentication} -'xrdef {Password authentication security-pg}{26} -'xrdef {Password authentication security-snt}{Section'tie4.6.3.3} +'xrdef {Password authentication security-pg}{24} +'xrdef {Password authentication security-snt}{Section'tie3.6.3.3} 'xrdef {Kerberos authenticated-title}{Direct connection with kerberos} -'xrdef {Kerberos authenticated-pg}{27} -'xrdef {Kerberos authenticated-snt}{Section'tie4.6.4} +'xrdef {Kerberos authenticated-pg}{25} +'xrdef {Kerberos authenticated-snt}{Section'tie3.6.4} 'xrdef {Read-only access-title}{Read-only repository access} -'xrdef {Read-only access-pg}{28} -'xrdef {Read-only access-snt}{Section'tie4.7} +'xrdef {Read-only access-pg}{26} +'xrdef {Read-only access-snt}{Section'tie3.7} 'xrdef {Starting a new project-title}{Starting a project with CVS} -'xrdef {Starting a new project-pg}{31} -'xrdef {Starting a new project-snt}{Chapter'tie5} +'xrdef {Starting a new project-pg}{29} +'xrdef {Starting a new project-snt}{Chapter'tie4} 'xrdef {Setting up the files-title}{Setting up the files} -'xrdef {Setting up the files-pg}{31} -'xrdef {Setting up the files-snt}{Section'tie5.1} +'xrdef {Setting up the files-pg}{29} +'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}{31} -'xrdef {From files-snt}{Section'tie5.1.1} +'xrdef {From files-pg}{29} +'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}{32} -'xrdef {From other version control systems-snt}{Section'tie5.1.2} +'xrdef {From other version control systems-pg}{30} +'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}{33} -'xrdef {From scratch-snt}{Section'tie5.1.3} +'xrdef {From scratch-pg}{31} +'xrdef {From scratch-snt}{Section'tie4.1.3} 'xrdef {Defining the module-title}{Defining the module} -'xrdef {Defining the module-pg}{33} -'xrdef {Defining the module-snt}{Section'tie5.2} +'xrdef {Defining the module-pg}{31} +'xrdef {Defining the module-snt}{Section'tie4.2} 'xrdef {Multiple developers-title}{Multiple developers} -'xrdef {Multiple developers-pg}{35} -'xrdef {Multiple developers-snt}{Chapter'tie6} +'xrdef {Multiple developers-pg}{33} +'xrdef {Multiple developers-snt}{Chapter'tie5} 'xrdef {File status-title}{File status} -'xrdef {File status-pg}{35} -'xrdef {File status-snt}{Section'tie6.1} +'xrdef {File status-pg}{33} +'xrdef {File status-snt}{Section'tie5.1} 'xrdef {Updating a file-title}{Bringing a file up to date} -'xrdef {Updating a file-pg}{36} -'xrdef {Updating a file-snt}{Section'tie6.2} +'xrdef {Updating a file-pg}{34} +'xrdef {Updating a file-snt}{Section'tie5.2} 'xrdef {Conflicts example-title}{Conflicts example} -'xrdef {Conflicts example-pg}{37} -'xrdef {Conflicts example-snt}{Section'tie6.3} +'xrdef {Conflicts example-pg}{35} +'xrdef {Conflicts example-snt}{Section'tie5.3} 'xrdef {Informing others-title}{Informing others about commits} -'xrdef {Informing others-pg}{40} -'xrdef {Informing others-snt}{Section'tie6.4} +'xrdef {Informing others-pg}{38} +'xrdef {Informing others-snt}{Section'tie5.4} 'xrdef {Concurrency-title}{Several developers simultaneously attempting to run CVS} -'xrdef {Concurrency-pg}{40} -'xrdef {Concurrency-snt}{Section'tie6.5} +'xrdef {Concurrency-pg}{38} +'xrdef {Concurrency-snt}{Section'tie5.5} 'xrdef {Watches-title}{Mechanisms to track who is editing files} -'xrdef {Watches-pg}{41} -'xrdef {Watches-snt}{Section'tie6.6} +'xrdef {Watches-pg}{39} +'xrdef {Watches-snt}{Section'tie5.6} 'xrdef {Setting a watch-title}{Telling CVS to watch certain files} -'xrdef {Setting a watch-pg}{42} -'xrdef {Setting a watch-snt}{Section'tie6.6.1} +'xrdef {Setting a watch-pg}{40} +'xrdef {Setting a watch-snt}{Section'tie5.6.1} 'xrdef {Getting Notified-title}{Telling CVS to notify you} -'xrdef {Getting Notified-pg}{42} -'xrdef {Getting Notified-snt}{Section'tie6.6.2} +'xrdef {Getting Notified-pg}{40} +'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}{44} -'xrdef {Editing files-snt}{Section'tie6.6.3} +'xrdef {Editing files-pg}{42} +'xrdef {Editing files-snt}{Section'tie5.6.3} 'xrdef {Watch information-title}{Information about who is watching and editing} -'xrdef {Watch information-pg}{45} -'xrdef {Watch information-snt}{Section'tie6.6.4} +'xrdef {Watch information-pg}{43} +'xrdef {Watch information-snt}{Section'tie5.6.4} 'xrdef {Watches Compatibility-title}{Using watches with old versions of CVS} -'xrdef {Watches Compatibility-pg}{45} -'xrdef {Watches Compatibility-snt}{Section'tie6.6.5} +'xrdef {Watches Compatibility-pg}{43} +'xrdef {Watches Compatibility-snt}{Section'tie5.6.5} 'xrdef {Choosing a model-title}{Choosing between reserved or unreserved checkouts} -'xrdef {Choosing a model-pg}{46} -'xrdef {Choosing a model-snt}{Section'tie6.7} -'xrdef {Branches-title}{Branches} -'xrdef {Branches-pg}{47} -'xrdef {Branches-snt}{Chapter'tie7} +'xrdef {Choosing a model-pg}{44} +'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-snt}{Chapter'tie6} +'xrdef {Revision numbers-title}{Revision numbers} +'xrdef {Revision numbers-pg}{45} +'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-snt}{Section'tie6.2} +'xrdef {Assigning revisions-title}{Assigning revisions} +'xrdef {Assigning revisions-pg}{47} +'xrdef {Assigning revisions-snt}{Section'tie6.3} 'xrdef {Tags-title}{Tags--Symbolic revisions} 'xrdef {Tags-pg}{47} -'xrdef {Tags-snt}{Section'tie7.1} +'xrdef {Tags-snt}{Section'tie6.4} 'xrdef {Branches motivation-title}{What branches are good for} -'xrdef {Branches motivation-pg}{49} -'xrdef {Branches motivation-snt}{Section'tie7.2} +'xrdef {Branches motivation-pg}{50} +'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-snt}{Section'tie7.3} +'xrdef {Creating a branch-snt}{Section'tie6.6} 'xrdef {Sticky tags-title}{Sticky tags} -'xrdef {Sticky tags-pg}{51} -'xrdef {Sticky tags-snt}{Section'tie7.4} +'xrdef {Sticky tags-pg}{52} +'xrdef {Sticky tags-snt}{Section'tie6.7} 'xrdef {Merging-title}{Merging} -'xrdef {Merging-pg}{53} -'xrdef {Merging-snt}{Chapter'tie8} +'xrdef {Merging-pg}{55} +'xrdef {Merging-snt}{Chapter'tie7} 'xrdef {Merging a branch-title}{Merging an entire branch} -'xrdef {Merging a branch-pg}{53} -'xrdef {Merging a branch-snt}{Section'tie8.1} +'xrdef {Merging a branch-pg}{55} +'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}{54} -'xrdef {Merging more than once-snt}{Section'tie8.2} +'xrdef {Merging more than once-pg}{56} +'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}{55} -'xrdef {Merging two revisions-snt}{Section'tie8.3} +'xrdef {Merging two revisions-pg}{57} +'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}{55} -'xrdef {Merging adds and removals-snt}{Section'tie8.4} +'xrdef {Merging adds and removals-pg}{57} +'xrdef {Merging adds and removals-snt}{Section'tie7.4} 'xrdef {Recursive behavior-title}{Recursive behavior} -'xrdef {Recursive behavior-pg}{57} -'xrdef {Recursive behavior-snt}{Chapter'tie9} +'xrdef {Recursive behavior-pg}{59} +'xrdef {Recursive behavior-snt}{Chapter'tie8} 'xrdef {Adding files-title}{Adding files to a directory} -'xrdef {Adding files-pg}{59} -'xrdef {Adding files-snt}{Chapter'tie10} +'xrdef {Adding files-pg}{61} +'xrdef {Adding files-snt}{Chapter'tie9} 'xrdef {Removing files-title}{Removing files} -'xrdef {Removing files-pg}{61} -'xrdef {Removing files-snt}{Chapter'tie11} +'xrdef {Removing files-pg}{63} +'xrdef {Removing files-snt}{Chapter'tie10} 'xrdef {Removing directories-title}{Removing directories} -'xrdef {Removing directories-pg}{63} -'xrdef {Removing directories-snt}{Chapter'tie12} +'xrdef {Removing directories-pg}{65} +'xrdef {Removing directories-snt}{Chapter'tie11} 'xrdef {Tracking sources-title}{Tracking third-party sources} -'xrdef {Tracking sources-pg}{65} -'xrdef {Tracking sources-snt}{Chapter'tie13} +'xrdef {Tracking sources-pg}{67} +'xrdef {Tracking sources-snt}{Chapter'tie12} 'xrdef {First import-title}{Importing a module for the first time} -'xrdef {First import-pg}{65} -'xrdef {First import-snt}{Section'tie13.1} +'xrdef {First import-pg}{67} +'xrdef {First import-snt}{Section'tie12.1} 'xrdef {Update imports-title}{Updating a module with the import command} -'xrdef {Update imports-pg}{66} -'xrdef {Update imports-snt}{Section'tie13.2} +'xrdef {Update imports-pg}{68} +'xrdef {Update imports-snt}{Section'tie12.2} 'xrdef {Reverting local changes-title}{Reverting to the latest vendor release} -'xrdef {Reverting local changes-pg}{66} -'xrdef {Reverting local changes-snt}{Section'tie13.3} +'xrdef {Reverting local changes-pg}{68} +'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}{67} -'xrdef {Binary files in imports-snt}{Section'tie13.4} +'xrdef {Binary files in imports-pg}{69} +'xrdef {Binary files in imports-snt}{Section'tie12.4} 'xrdef {Moving files-title}{Moving and renaming files} -'xrdef {Moving files-pg}{69} -'xrdef {Moving files-snt}{Chapter'tie14} +'xrdef {Moving files-pg}{71} +'xrdef {Moving files-snt}{Chapter'tie13} 'xrdef {Outside-title}{The Normal way to Rename} -'xrdef {Outside-pg}{69} -'xrdef {Outside-snt}{Section'tie14.1} +'xrdef {Outside-pg}{71} +'xrdef {Outside-snt}{Section'tie13.1} 'xrdef {Inside-title}{Moving the history file} -'xrdef {Inside-pg}{69} -'xrdef {Inside-snt}{Section'tie14.2} +'xrdef {Inside-pg}{71} +'xrdef {Inside-snt}{Section'tie13.2} 'xrdef {Rename by copying-title}{Copying the history file} -'xrdef {Rename by copying-pg}{70} -'xrdef {Rename by copying-snt}{Section'tie14.3} +'xrdef {Rename by copying-pg}{72} +'xrdef {Rename by copying-snt}{Section'tie13.3} 'xrdef {Moving directories-title}{Moving and renaming directories} -'xrdef {Moving directories-pg}{73} -'xrdef {Moving directories-snt}{Chapter'tie15} +'xrdef {Moving directories-pg}{75} +'xrdef {Moving directories-snt}{Chapter'tie14} 'xrdef {History browsing-title}{History browsing} -'xrdef {History browsing-pg}{75} -'xrdef {History browsing-snt}{Chapter'tie16} +'xrdef {History browsing-pg}{77} +'xrdef {History browsing-snt}{Chapter'tie15} 'xrdef {log messages-title}{Log messages} -'xrdef {log messages-pg}{75} -'xrdef {log messages-snt}{Section'tie16.1} +'xrdef {log messages-pg}{77} +'xrdef {log messages-snt}{Section'tie15.1} 'xrdef {history database-title}{The history database} -'xrdef {history database-pg}{75} -'xrdef {history database-snt}{Section'tie16.2} +'xrdef {history database-pg}{77} +'xrdef {history database-snt}{Section'tie15.2} 'xrdef {user-defined logging-title}{User-defined logging} -'xrdef {user-defined logging-pg}{75} -'xrdef {user-defined logging-snt}{Section'tie16.3} +'xrdef {user-defined logging-pg}{77} +'xrdef {user-defined logging-snt}{Section'tie15.3} 'xrdef {annotate-title}{Annotate command} -'xrdef {annotate-pg}{76} -'xrdef {annotate-snt}{Section'tie16.4} +'xrdef {annotate-pg}{78} +'xrdef {annotate-snt}{Section'tie15.4} 'xrdef {Keyword substitution-title}{Keyword substitution} -'xrdef {Keyword substitution-pg}{77} -'xrdef {Keyword substitution-snt}{Chapter'tie17} +'xrdef {Keyword substitution-pg}{79} +'xrdef {Keyword substitution-snt}{Chapter'tie16} 'xrdef {Keyword list-title}{RCS Keywords} -'xrdef {Keyword list-pg}{77} -'xrdef {Keyword list-snt}{Section'tie17.1} +'xrdef {Keyword list-pg}{79} +'xrdef {Keyword list-snt}{Section'tie16.1} 'xrdef {Using keywords-title}{Using keywords} -'xrdef {Using keywords-pg}{78} -'xrdef {Using keywords-snt}{Section'tie17.2} +'xrdef {Using keywords-pg}{80} +'xrdef {Using keywords-snt}{Section'tie16.2} 'xrdef {Avoiding substitution-title}{Avoiding substitution} -'xrdef {Avoiding substitution-pg}{79} -'xrdef {Avoiding substitution-snt}{Section'tie17.3} +'xrdef {Avoiding substitution-pg}{81} +'xrdef {Avoiding substitution-snt}{Section'tie16.3} 'xrdef {Substitution modes-title}{Substitution modes} -'xrdef {Substitution modes-pg}{79} -'xrdef {Substitution modes-snt}{Section'tie17.4} +'xrdef {Substitution modes-pg}{81} +'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.7 1997/03/18 02:05:45 tholo -'xrdef {Log keyword-title}{Problems with the Files missed from previous import +'xrdef {Log keyword-title}{Problems with the 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 keyword.} -'xrdef {Log keyword-pg}{80} -'xrdef {Log keyword-snt}{Section'tie17.5} +'xrdef {Log keyword-pg}{82} +'xrdef {Log keyword-snt}{Section'tie16.5} 'xrdef {Binary files-title}{Handling binary files} -'xrdef {Binary files-pg}{81} -'xrdef {Binary files-snt}{Chapter'tie18} +'xrdef {Binary files-pg}{83} +'xrdef {Binary files-snt}{Chapter'tie17} 'xrdef {Builds-title}{How your build system interacts with CVS} -'xrdef {Builds-pg}{83} -'xrdef {Builds-snt}{Chapter'tie19} +'xrdef {Builds-pg}{85} +'xrdef {Builds-snt}{Chapter'tie18} 'xrdef {Compatibility-title}{Compatibility between CVS Versions} -'xrdef {Compatibility-pg}{85} -'xrdef {Compatibility-snt}{Chapter'tie20} +'xrdef {Compatibility-pg}{87} +'xrdef {Compatibility-snt}{Chapter'tie19} 'xrdef {Revision management-title}{Revision management} -'xrdef {Revision management-pg}{87} -'xrdef {Revision management-snt}{Chapter'tie21} +'xrdef {Revision management-pg}{89} +'xrdef {Revision management-snt}{Chapter'tie20} 'xrdef {When to commit-title}{When to commit?} -'xrdef {When to commit-pg}{87} -'xrdef {When to commit-snt}{Section'tie21.1} +'xrdef {When to commit-pg}{89} +'xrdef {When to commit-snt}{Section'tie20.1} 'xrdef {CVS commands-title}{Guide to CVS commands} -'xrdef {CVS commands-pg}{89} +'xrdef {CVS commands-pg}{91} 'xrdef {CVS commands-snt}{Appendix'tie'char65{}} 'xrdef {Structure-title}{Overall structure of CVS commands} -'xrdef {Structure-pg}{89} +'xrdef {Structure-pg}{91} 'xrdef {Structure-snt}{Section'tie'char65.1} 'xrdef {~/.cvsrc-title}{Default options and the ~/.cvsrc file} -'xrdef {~/.cvsrc-pg}{89} +'xrdef {~/.cvsrc-pg}{91} 'xrdef {~/.cvsrc-snt}{Section'tie'char65.2} 'xrdef {Global options-title}{Global options} -'xrdef {Global options-pg}{91} +'xrdef {Global options-pg}{93} 'xrdef {Global options-snt}{Section'tie'char65.3} 'xrdef {Common options-title}{Common command options} -'xrdef {Common options-pg}{92} +'xrdef {Common options-pg}{94} 'xrdef {Common options-snt}{Section'tie'char65.4} 'xrdef {admin-title}{admin---Administration front end for rcs} -'xrdef {admin-pg}{95} +'xrdef {admin-pg}{97} 'xrdef {admin-snt}{Section'tie'char65.5} 'xrdef {admin options-title}{admin options} -'xrdef {admin options-pg}{95} +'xrdef {admin options-pg}{97} 'xrdef {admin options-snt}{Section'tie'char65.5.1} 'xrdef {admin examples-title}{admin examples} -'xrdef {admin examples-pg}{98} +'xrdef {admin examples-pg}{100} 'xrdef {admin examples-snt}{Section'tie'char65.5.2} 'xrdef {checkout-title}{checkout---Check out sources for editing} -'xrdef {checkout-pg}{99} +'xrdef {checkout-pg}{101} 'xrdef {checkout-snt}{Section'tie'char65.6} 'xrdef {checkout options-title}{checkout options} -'xrdef {checkout options-pg}{100} +'xrdef {checkout options-pg}{102} 'xrdef {checkout options-snt}{Section'tie'char65.6.1} 'xrdef {checkout examples-title}{checkout examples} -'xrdef {checkout examples-pg}{101} +'xrdef {checkout examples-pg}{103} 'xrdef {checkout examples-snt}{Section'tie'char65.6.2} 'xrdef {commit-title}{commit---Check files into the repository} -'xrdef {commit-pg}{101} +'xrdef {commit-pg}{103} 'xrdef {commit-snt}{Section'tie'char65.7} 'xrdef {commit options-title}{commit options} -'xrdef {commit options-pg}{102} +'xrdef {commit options-pg}{104} 'xrdef {commit options-snt}{Section'tie'char65.7.1} 'xrdef {commit examples-title}{commit examples} -'xrdef {commit examples-pg}{103} +'xrdef {commit examples-pg}{105} 'xrdef {commit examples-snt}{Section'tie'char65.7.2} 'xrdef {diff-title}{diff---Run diffs between revisions} -'xrdef {diff-pg}{105} +'xrdef {diff-pg}{106} 'xrdef {diff-snt}{Section'tie'char65.8} 'xrdef {diff options-title}{diff options} -'xrdef {diff options-pg}{105} +'xrdef {diff options-pg}{107} 'xrdef {diff options-snt}{Section'tie'char65.8.1} 'xrdef {diff examples-title}{diff examples} -'xrdef {diff examples-pg}{106} +'xrdef {diff examples-pg}{108} 'xrdef {diff examples-snt}{Section'tie'char65.8.2} 'xrdef {export-title}{export---Export sources from CVS, similar to checkout} -'xrdef {export-pg}{107} +'xrdef {export-pg}{108} 'xrdef {export-snt}{Section'tie'char65.9} 'xrdef {export options-title}{export options} -'xrdef {export options-pg}{107} +'xrdef {export options-pg}{109} 'xrdef {export options-snt}{Section'tie'char65.9.1} 'xrdef {history-title}{history---Show status of files and users} -'xrdef {history-pg}{108} +'xrdef {history-pg}{110} 'xrdef {history-snt}{Section'tie'char65.10} 'xrdef {history options-title}{history options} -'xrdef {history options-pg}{108} +'xrdef {history options-pg}{110} 'xrdef {history options-snt}{Section'tie'char65.10.1} 'xrdef {import-title}{import---Import sources into CVS, using vendor branches} -'xrdef {import-pg}{110} +'xrdef {import-pg}{112} 'xrdef {import-snt}{Section'tie'char65.11} 'xrdef {import options-title}{import options} -'xrdef {import options-pg}{111} +'xrdef {import options-pg}{113} 'xrdef {import options-snt}{Section'tie'char65.11.1} 'xrdef {import output-title}{import output} -'xrdef {import output-pg}{112} +'xrdef {import output-pg}{113} 'xrdef {import output-snt}{Section'tie'char65.11.2} 'xrdef {import examples-title}{import examples} -'xrdef {import examples-pg}{112} +'xrdef {import examples-pg}{114} 'xrdef {import examples-snt}{Section'tie'char65.11.3} 'xrdef {log-title}{log---Print out log information for files} -'xrdef {log-pg}{113} +'xrdef {log-pg}{114} 'xrdef {log-snt}{Section'tie'char65.12} 'xrdef {log options-title}{log options} -'xrdef {log options-pg}{113} +'xrdef {log options-pg}{114} 'xrdef {log options-snt}{Section'tie'char65.12.1} 'xrdef {log examples-title}{log examples} -'xrdef {log examples-pg}{114} +'xrdef {log examples-pg}{116} 'xrdef {log examples-snt}{Section'tie'char65.12.2} 'xrdef {rdiff-title}{rdiff---'patch' format diffs between releases} -'xrdef {rdiff-pg}{115} +'xrdef {rdiff-pg}{116} 'xrdef {rdiff-snt}{Section'tie'char65.13} 'xrdef {rdiff options-title}{rdiff options} -'xrdef {rdiff options-pg}{115} +'xrdef {rdiff options-pg}{117} 'xrdef {rdiff options-snt}{Section'tie'char65.13.1} 'xrdef {rdiff examples-title}{rdiff examples} -'xrdef {rdiff examples-pg}{116} +'xrdef {rdiff examples-pg}{117} '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}{116} +'xrdef {release-pg}{118} 'xrdef {release-snt}{Section'tie'char65.14} 'xrdef {release options-title}{release options} -'xrdef {release options-pg}{117} +'xrdef {release options-pg}{118} 'xrdef {release options-snt}{Section'tie'char65.14.1} 'xrdef {release output-title}{release output} -'xrdef {release output-pg}{117} +'xrdef {release output-pg}{119} 'xrdef {release output-snt}{Section'tie'char65.14.2} 'xrdef {release examples-title}{release examples} -'xrdef {release examples-pg}{118} +'xrdef {release examples-pg}{119} 'xrdef {release examples-snt}{Section'tie'char65.14.3} 'xrdef {rtag-title}{rtag---Add a symbolic tag to a module} -'xrdef {rtag-pg}{118} +'xrdef {rtag-pg}{120} 'xrdef {rtag-snt}{Section'tie'char65.15} 'xrdef {rtag options-title}{rtag options} -'xrdef {rtag options-pg}{119} +'xrdef {rtag options-pg}{120} 'xrdef {rtag options-snt}{Section'tie'char65.15.1} 'xrdef {status-title}{status---Display status information on checked out files} -'xrdef {status-pg}{119} +'xrdef {status-pg}{121} 'xrdef {status-snt}{Section'tie'char65.16} 'xrdef {status options-title}{status options} -'xrdef {status options-pg}{120} +'xrdef {status options-pg}{121} '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}{120} +'xrdef {tag-pg}{122} 'xrdef {tag-snt}{Section'tie'char65.17} 'xrdef {tag options-title}{tag options} -'xrdef {tag options-pg}{121} +'xrdef {tag options-pg}{122} 'xrdef {tag options-snt}{Section'tie'char65.17.1} 'xrdef {update-title}{update---Bring work tree in sync with repository} -'xrdef {update-pg}{122} +'xrdef {update-pg}{123} 'xrdef {update-snt}{Section'tie'char65.18} 'xrdef {update options-title}{update options} -'xrdef {update options-pg}{122} +'xrdef {update options-pg}{123} 'xrdef {update options-snt}{Section'tie'char65.18.1} 'xrdef {update output-title}{update output} -'xrdef {update output-pg}{124} +'xrdef {update output-pg}{125} 'xrdef {update output-snt}{Section'tie'char65.18.2} 'xrdef {update examples-title}{update examples} -'xrdef {update examples-pg}{125} +'xrdef {update examples-pg}{126} 'xrdef {update examples-snt}{Section'tie'char65.18.3} 'xrdef {Invoking CVS-title}{Quick reference to CVS commands} 'xrdef {Invoking CVS-pg}{127} diff --git a/gnu/usr.bin/cvs/doc/cvs.info b/gnu/usr.bin/cvs/doc/cvs.info index 83651c5baec..5861b9f4ed8 100644 --- a/gnu/usr.bin/cvs/doc/cvs.info +++ b/gnu/usr.bin/cvs/doc/cvs.info @@ -24,171 +24,172 @@ the Free Software Foundation instead of in the original English. Indirect: cvs.info-1: 1088 -cvs.info-2: 50652 -cvs.info-3: 99757 -cvs.info-4: 149195 -cvs.info-5: 197528 -cvs.info-6: 247090 -cvs.info-7: 283427 +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 Tag Table: (Indirect) Node: Top1088 -Node: Preface3013 -Node: Checklist4959 -Node: Credits6021 -Node: BUGS7209 -Node: What is CVS?8225 -Node: Basic concepts16780 -Node: Revision numbers17376 -Node: Versions revisions releases20426 -Node: A sample session20985 -Node: Getting the source21697 -Node: Committing your changes22574 -Node: Cleaning up23501 -Node: Viewing differences25201 -Node: Repository26094 -Node: Specifying a repository28408 -Node: Repository storage29819 -Node: Repository files30696 -Node: File permissions33473 -Node: Intro administrative files35784 -Node: Multiple repositories37485 -Node: Creating a repository38657 -Node: Remote repositories40797 -Node: Server requirements42026 -Node: Connecting via rsh43297 -Node: Password authenticated45891 -Node: Password authentication server46646 -Node: Password authentication client50652 -Node: Password authentication security52968 -Node: Kerberos authenticated54434 -Node: Read-only access55851 -Node: Starting a new project58543 -Node: Setting up the files59297 -Node: From files59921 -Node: From other version control systems61927 -Node: From scratch63816 -Node: Defining the module64552 -Node: Multiple developers65533 -Node: File status67689 -Node: Updating a file69863 -Node: Conflicts example71170 -Node: Informing others75222 -Node: Concurrency75762 -Node: Watches77520 -Node: Setting a watch78910 -Node: Getting Notified80077 -Node: Editing files83453 -Node: Watch information85973 -Node: Watches Compatibility86823 -Node: Choosing a model87658 -Node: Branches90333 -Node: Tags91044 -Node: Branches motivation96177 -Node: Creating a branch97189 -Node: Sticky tags99757 -Node: Merging103028 -Node: Merging a branch103606 -Node: Merging more than once105382 -Node: Merging two revisions107855 -Node: Merging adds and removals108647 -Node: Recursive behavior109223 -Node: Adding files110907 -Node: Removing files113578 -Node: Removing directories116537 -Node: Tracking sources117583 -Node: First import118984 -Node: Update imports120333 -Node: Reverting local changes121826 -Node: Binary files in imports122518 -Node: Moving files122799 -Node: Outside123426 -Node: Inside124377 -Node: Rename by copying125242 -Node: Moving directories126402 -Node: History browsing127833 -Node: log messages128392 -Node: history database128714 -Node: user-defined logging129060 -Node: annotate130580 -Node: Keyword substitution131720 -Node: Keyword list132708 -Node: Using keywords134488 -Node: Avoiding substitution136435 -Node: Substitution modes137335 -Node: Log keyword139837 -Node: Binary files140977 -Node: Builds143828 -Node: Compatibility146506 -Node: Revision management147498 -Node: When to commit148087 -Node: CVS commands149195 -Node: Structure150776 -Node: ~/.cvsrc152044 -Node: Global options154043 -Node: Common options157618 -Node: admin164479 -Node: admin options165355 -Node: admin examples173093 -Node: checkout174610 -Node: checkout options177058 -Node: checkout examples180227 -Node: commit180504 -Node: commit options182630 -Node: commit examples183999 -Node: diff187339 -Node: diff options188228 -Node: diff examples190504 -Node: export191464 -Node: export options192723 -Node: history193915 -Node: history options194696 -Node: import197528 -Node: import options200139 -Node: import output201689 -Node: import examples202766 -Node: log202930 -Node: log options203965 -Node: log examples207191 -Node: rdiff207337 -Node: rdiff options208639 -Node: rdiff examples210188 -Node: release211146 -Node: release options212441 -Node: release output213120 -Node: release examples214635 -Node: rtag215095 -Node: rtag options215930 -Node: status217820 -Node: status options218717 -Node: tag219305 -Node: tag options220859 -Node: update222096 -Node: update options222950 -Node: update output226553 -Node: update examples229416 -Node: Invoking CVS229748 -Node: Administrative files245757 -Node: modules247090 -Node: Wrappers251718 -Node: commit files255316 -Node: syntax257024 -Node: commitinfo257904 -Node: verifymsg259417 -Node: editinfo261857 -Node: editinfo example264133 -Node: loginfo265427 -Node: loginfo example267761 -Node: Keeping a checked out copy268531 -Node: rcsinfo269539 -Node: cvsignore270845 -Node: history file273727 -Node: Variables274379 -Node: Environment variables276910 -Node: Troubleshooting282071 -Node: Magic branch numbers282265 -Node: Copying283427 -Node: Index302614 +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 End Tag Table diff --git a/gnu/usr.bin/cvs/doc/cvs.info-1 b/gnu/usr.bin/cvs/doc/cvs.info-1 index e657bc7206a..e7a92fd2d3e 100644 --- a/gnu/usr.bin/cvs/doc/cvs.info-1 +++ b/gnu/usr.bin/cvs/doc/cvs.info-1 @@ -27,18 +27,17 @@ File: cvs.info, Node: Top, Next: Preface, Up: (dir) This info manual describes how to use and administer CVS version -1.9.4. +1.9.6. * Menu: * Preface:: About this manual * What is CVS?:: What is CVS? -* Basic concepts:: Basic concepts of revision management * A sample session:: A tour of basic CVS usage * Repository:: Where all your sources are stored * Starting a new project:: Starting a project with CVS * Multiple developers:: How CVS helps a group of developers -* Branches:: Parallel development explained +* Revisions and branches:: Numeric, symbolic, and branch revisions * Merging:: How to move changes between branches * Recursive behavior:: CVS descends directories * Adding files:: Adding files @@ -204,7 +203,7 @@ above-mentioned shortcomings. Per Cederqvist -File: cvs.info, Node: What is CVS?, Next: Basic concepts, Prev: Preface, Up: Top +File: cvs.info, Node: What is CVS?, Next: A sample session, Prev: Preface, Up: Top What is CVS? ************ @@ -380,107 +379,15 @@ CVS does not have a builtin process model once they have been proven. -File: cvs.info, Node: Basic concepts, Next: A sample session, Prev: What is CVS?, Up: Top - -Basic concepts -************** - - CVS stores all files in a centralized "repository" (*note -Repository::.). - - The repository contains directories and files, in an arbitrary tree. -The "modules" feature can be used to group together a set of -directories or files into a single entity (*note modules::.). A -typical usage is to define one module per project. - -* Menu: - -* Revision numbers:: The meaning of a revision number -* Versions revisions releases:: Terminology used in this manual - - -File: cvs.info, Node: Revision numbers, Next: Versions revisions releases, Up: Basic concepts - -Revision numbers -================ - - Each version of a file has a unique "revision number". Revision -numbers look like `1.1', `1.2', `1.3.2.2' or even `1.3.2.2.4.5'. A -revision number always has an even number of period-separated decimal -integers. By default revision 1.1 is the first revision of a file. -Each successive revision is given a new number by increasing the -rightmost number by one. The following figure displays a few -revisions, with newer revisions to the right. - - +-----+ +-----+ +-----+ +-----+ +-----+ - ! 1.1 !----! 1.2 !----! 1.3 !----! 1.4 !----! 1.5 ! - +-----+ +-----+ +-----+ +-----+ +-----+ - - CVS is not limited to linear development. The "revision tree" can -be split into "branches", where each branch is a self-maintained line of -development. Changes made on one branch can easily be moved back to -the main trunk. - - Each branch has a "branch number", consisting of an odd number of -period-separated decimal integers. The branch number is created by -appending an integer to the revision number where the corresponding -branch forked off. Having branch numbers allows more than one branch -to be forked off from a certain revision. - - All revisions on a branch have revision numbers formed by appending -an ordinal number to the branch number. The following figure -illustrates branching with an example. - - +-------------+ - Branch 1.2.2.3.2 -> ! 1.2.2.3.2.1 ! - / +-------------+ - / - / - +---------+ +---------+ +---------+ +---------+ - Branch 1.2.2 -> _! 1.2.2.1 !----! 1.2.2.2 !----! 1.2.2.3 !----! 1.2.2.4 ! - / +---------+ +---------+ +---------+ +---------+ - / - / - +-----+ +-----+ +-----+ +-----+ +-----+ - ! 1.1 !----! 1.2 !----! 1.3 !----! 1.4 !----! 1.5 ! <- The main trunk - +-----+ +-----+ +-----+ +-----+ +-----+ - ! - ! - ! +---------+ +---------+ +---------+ - Branch 1.2.4 -> +---! 1.2.4.1 !----! 1.2.4.2 !----! 1.2.4.3 ! - +---------+ +---------+ +---------+ - - The exact details of how the branch number is constructed is not -something you normally need to be concerned about, but here is how it -works: When CVS creates a branch number it picks the first unused even -integer, starting with 2. So when you want to create a branch from -revision 6.4 it will be numbered 6.4.2. All branch numbers ending in a -zero (such as 6.4.0) are used internally by CVS (*note Magic branch -numbers::.). The branch 1.1.1 has a special meaning. *Note Tracking -sources::. - - -File: cvs.info, Node: Versions revisions releases, Prev: Revision numbers, Up: Basic concepts - -Versions, revisions and releases -================================ - - A file can have several versions, as described above. Likewise, a -software product can have several versions. A software product is -often given a version number such as `4.1.1'. - - Versions in the first sense are called "revisions" in this document, -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: A sample session, Next: Repository, Prev: Basic concepts, Up: Top +File: cvs.info, Node: A sample session, Next: Repository, Prev: What is CVS?, Up: Top A sample session **************** - This section describes a typical work-session using CVS. It assumes -that a repository is set up (*note Repository::.). + As a way of introducing CVS, we'll go through a typical work-session +using CVS. The first thing to understand is that CVS stores all files +in a centralized "repository" (*note Repository::.); this section +assumes that a repository is set up. Suppose you are working on a simple compiler. The source consists of a handful of C files and a `Makefile'. The compiler is called `tc' @@ -1189,3 +1096,80 @@ as well. is to paste it there from somewhere else. Someday, there may be a `cvs passwd' command. + +File: cvs.info, Node: Password authentication client, Next: Password authentication security, Prev: Password authentication server, Up: Password authenticated + +Using the client with password authentication +............................................. + + Before connecting to the server, the client must "log in" with the +command `cvs login'. Logging in verifies a password with the server, +and also records the password for later transactions with the server. +The `cvs login' command needs to know the username, server hostname, +and full repository path, and it gets this information from the +repository argument or the `CVSROOT' environment variable. + + `cvs login' is interactive -- it prompts for a password: + + cvs -d :pserver:bach@chainsaw.brickyard.com:/usr/local/cvsroot login + CVS password: + + The password is checked with the server; if it is correct, the +`login' succeeds, else it fails, complaining that the password was +incorrect. + + Once you have logged in, you can force CVS to connect directly to +the server and authenticate with the stored password: + + cvs -d :pserver:bach@chainsaw.brickyard.com:/usr/local/cvsroot checkout foo + + The `:pserver:' is necessary because without it, CVS will assume it +should use `rsh' to connect with the server (*note Connecting via +rsh::.). (Once you have a working copy checked out and are running CVS +commands from within it, there is no longer any need to specify the +repository explicitly, because CVS records it in the working copy's +`CVS' subdirectory.) + + Passwords are stored by default in the file `$HOME/.cvspass'. Its +format is human-readable, but don't edit it unless you know what you +are doing. The passwords are not stored in cleartext, but are +trivially encoded to protect them from "innocent" compromise (i.e., +inadvertently being seen by a system administrator who happens to look +at that file). + + The 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 ff76ea67a22..fd25deaa429 100644 --- a/gnu/usr.bin/cvs/doc/cvs.info-2 +++ b/gnu/usr.bin/cvs/doc/cvs.info-2 @@ -22,83 +22,6 @@ and this permission notice may be included in translations approved by the Free Software Foundation instead of in the original English. -File: cvs.info, Node: Password authentication client, Next: Password authentication security, Prev: Password authentication server, Up: Password authenticated - -Using the client with password authentication -............................................. - - Before connecting to the server, the client must "log in" with the -command `cvs login'. Logging in verifies a password with the server, -and also records the password for later transactions with the server. -The `cvs login' command needs to know the username, server hostname, -and full repository path, and it gets this information from the -repository argument or the `CVSROOT' environment variable. - - `cvs login' is interactive -- it prompts for a password: - - cvs -d :pserver:bach@chainsaw.brickyard.com:/usr/local/cvsroot login - CVS password: - - The password is checked with the server; if it is correct, the -`login' succeeds, else it fails, complaining that the password was -incorrect. - - Once you have logged in, you can force CVS to connect directly to -the server and authenticate with the stored password: - - cvs -d :pserver:bach@chainsaw.brickyard.com:/usr/local/cvsroot checkout foo - - The `:pserver:' is necessary because without it, CVS will assume it -should use `rsh' to connect with the server (*note Connecting via -rsh::.). (Once you have a working copy checked out and are running CVS -commands from within it, there is no longer any need to specify the -repository explicitly, because CVS records it in the working copy's -`CVS' subdirectory.) - - Passwords are stored by default in the file `$HOME/.cvspass'. Its -format is human-readable, but don't edit it unless you know what you -are doing. The passwords are not stored in cleartext, but are -trivially encoded to protect them from "innocent" compromise (i.e., -inadvertently being seen by a system administrator who happens to look -at that file). - - The password for the currently choosen remote repository can be -removed from the CVS_PASSFILE by using the `cvs logout' command. - - The `CVS_PASSFILE' environment variable overrides this default. If -you use this variable, make sure you set it *before* `cvs login' is -run. If you were to set it after running `cvs login', then later CVS -commands would be unable to look up the password for transmission to -the server. - - -File: cvs.info, Node: Password authentication security, Prev: Password authentication client, Up: Password authenticated - -Security considerations with password authentication -.................................................... - - 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 Direct connection with kerberos @@ -375,7 +298,7 @@ together related files and directories. $ cvs release -d CVSROOT -File: cvs.info, Node: Multiple developers, Next: Branches, Prev: Starting a new project, Up: Top +File: cvs.info, Node: Multiple developers, Next: Revisions and branches, Prev: Starting a new project, Up: Top Multiple developers ******************* @@ -1005,27 +928,145 @@ considered the best of both the reserved checkout and unreserved checkout worlds. -File: cvs.info, Node: Branches, Next: Merging, Prev: Multiple developers, Up: Top +File: cvs.info, Node: Revisions and branches, Next: Merging, Prev: Multiple developers, Up: Top + +Revisions and branches +********************** -Branches -******** + For many uses of CVS, one doesn't need to worry too much about +revision numbers; CVS assigns numbers such as `1.1', `1.2', and so on, +and that is all one needs to know. However, some people prefer to have +more knowledge and control concerning how CVS assigns revision numbers. - So far, all revisions shown in this manual have been on the "main -trunk" of the revision tree, i.e., all revision numbers have been of -the form X.Y. One useful feature, especially when maintaining several -releases of a software product at once, is the ability to make branches -on the revision tree. "Tags", symbolic names for revisions, will also -be introduced in this chapter. + If one wants to keep track of a set of revisions involving more than +one file, such as which revisions went into a particular release, one +uses a "tag", which is a symbolic revision which can be assigned to a +numeric revision in each file. + + Another useful feature, especially when maintaining several releases +of a software product at once, is the ability to make branches on the +revision tree. * Menu: +* Revision numbers:: The meaning of a revision number +* Versions revisions releases:: Terminology used in this manual +* Assigning revisions:: Assigning revisions * Tags:: Tags-Symbolic revisions * Branches motivation:: What branches are good for * Creating a branch:: Creating a branch * Sticky tags:: Sticky tags -File: cvs.info, Node: Tags, Next: Branches motivation, Up: Branches +File: cvs.info, Node: Revision numbers, Next: Versions revisions releases, Up: Revisions and branches + +Revision numbers +================ + + Each version of a file has a unique "revision number". Revision +numbers look like `1.1', `1.2', `1.3.2.2' or even `1.3.2.2.4.5'. A +revision number always has an even number of period-separated decimal +integers. By default revision 1.1 is the first revision of a file. +Each successive revision is given a new number by increasing the +rightmost number by one. The following figure displays a few +revisions, with newer revisions to the right. + + +-----+ +-----+ +-----+ +-----+ +-----+ + ! 1.1 !----! 1.2 !----! 1.3 !----! 1.4 !----! 1.5 ! + +-----+ +-----+ +-----+ +-----+ +-----+ + + CVS is not limited to linear development. The "revision tree" can +be split into "branches", where each branch is a self-maintained line of +development. Changes made on one branch can easily be moved back to +the main trunk. + + Each branch has a "branch number", consisting of an odd number of +period-separated decimal integers. The branch number is created by +appending an integer to the revision number where the corresponding +branch forked off. Having branch numbers allows more than one branch +to be forked off from a certain revision. + + All revisions on a branch have revision numbers formed by appending +an ordinal number to the branch number. The following figure +illustrates branching with an example. + + +-------------+ + Branch 1.2.2.3.2 -> ! 1.2.2.3.2.1 ! + / +-------------+ + / + / + +---------+ +---------+ +---------+ +---------+ + Branch 1.2.2 -> _! 1.2.2.1 !----! 1.2.2.2 !----! 1.2.2.3 !----! 1.2.2.4 ! + / +---------+ +---------+ +---------+ +---------+ + / + / + +-----+ +-----+ +-----+ +-----+ +-----+ + ! 1.1 !----! 1.2 !----! 1.3 !----! 1.4 !----! 1.5 ! <- The main trunk + +-----+ +-----+ +-----+ +-----+ +-----+ + ! + ! + ! +---------+ +---------+ +---------+ + Branch 1.2.4 -> +---! 1.2.4.1 !----! 1.2.4.2 !----! 1.2.4.3 ! + +---------+ +---------+ +---------+ + + The exact details of how the branch number is constructed is not +something you normally need to be concerned about, but here is how it +works: When CVS creates a branch number it picks the first unused even +integer, starting with 2. So when you want to create a branch from +revision 6.4 it will be numbered 6.4.2. All branch numbers ending in a +zero (such as 6.4.0) are used internally by CVS (*note Magic branch +numbers::.). The branch 1.1.1 has a special meaning. *Note Tracking +sources::. + + +File: cvs.info, Node: Versions revisions releases, Next: Assigning revisions, Prev: Revision numbers, Up: Revisions and branches + +Versions, revisions and releases +================================ + + A file can have several versions, as described above. Likewise, a +software product can have several versions. A software product is +often given a version number such as `4.1.1'. + + Versions in the first sense are called "revisions" in this document, +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 ======================= @@ -1151,7 +1192,7 @@ of revisions that is "flat" along the tagged revisions, like this: 1.5 -File: cvs.info, Node: Branches motivation, Next: Creating a branch, Prev: Tags, Up: Branches +File: cvs.info, Node: Branches motivation, Next: Creating a branch, Prev: Tags, Up: Revisions and branches What branches are good for ========================== @@ -1171,62 +1212,3 @@ 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: Branches - -Creating a branch -================= - - The `rtag' command can be used to create a branch. The `rtag' -command is much like `tag', but it does not require that you have a -working copy of the module. *Note rtag::. (You can also use the `tag' -command; *note tag::.). - - $ cvs rtag -b -r release-1-0 release-1-0-patches tc - - The `-b' flag makes `rtag' create a branch (rather than just a -symbolic revision name). `-r release-1-0' says that this branch should -be rooted at the node (in the revision tree) that corresponds to the tag -`release-1-0'. Note that the numeric revision number that matches -`release-1-0' will probably be different from file to file. The name -of the new branch is `release-1-0-patches', and the module affected is -`tc'. - - To fix the problem in release 1.0, you need a working copy of the -branch you just created. - - $ cvs checkout -r release-1-0-patches tc - $ cvs status -v driver.c backend.c - =================================================================== - File: driver.c Status: Up-to-date - - Version: 1.7 Sat Dec 5 18:25:54 1992 - RCS Version: 1.7 /usr/local/cvsroot/yoyodyne/tc/driver.c,v - Sticky Tag: release-1-0-patches (branch: 1.7.2) - Sticky Date: (none) - Sticky Options: (none) - - Existing Tags: - release-1-0-patches (branch: 1.7.2) - release-1-0 (revision: 1.7) - - =================================================================== - 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: release-1-0-patches (branch: 1.4.2) - Sticky Date: (none) - Sticky Options: (none) - - Existing Tags: - release-1-0-patches (branch: 1.4.2) - release-1-0 (revision: 1.4) - release-0-4 (revision: 1.4) - - As the output from the `status' command shows the branch number is -created by adding a digit at the tail of the revision number it is -based on. (If `release-1-0' corresponds to revision 1.4, the branch's -revision number will be 1.4.2. For obscure reasons CVS always gives -branches even numbers, starting at 2. *Note Revision numbers::.). - diff --git a/gnu/usr.bin/cvs/doc/cvs.info-6 b/gnu/usr.bin/cvs/doc/cvs.info-6 index 34c06796543..40ac18a420b 100644 --- a/gnu/usr.bin/cvs/doc/cvs.info-6 +++ b/gnu/usr.bin/cvs/doc/cvs.info-6 @@ -22,6 +22,632 @@ 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: Invoking CVS, Next: Administrative files, Prev: CVS commands, Up: Top + +Quick reference to CVS commands +******************************* + + This appendix describes how to invoke CVS, with references to where +each command or feature is described in detail. Other relevant +references are the `--help'/`-H' option to CVS (*note Global +options::.) and *Note Index::. + +`add [OPTIONS] [FILES...]' + Add a new file/directory. See *Note Adding files::. + + `-k KFLAG' + Set keyword expansion. + + `-m MSG' + Set file description. + +`admin [OPTIONS] [FILES...]' + Administration of history files in the repository. See *Note + admin::. + + `-b[REV]' + Set default branch. + + `-cSTRING' + Set comment leader. + + `-kSUBST' + Set keyword substitution. See *Note Keyword substitution::. + + `-l[REV]' + Lock revision REV, or latest revision. + + `-mREV:MSG' + Replace the log message of revision REV with MSG. + + `-oRANGE' + Delete revisions from the history files + + `-q' + Run quietly; do not print diagnostics. + + `-sSTATE[:REV]' + Set the state. + + `-t' + Set file description from standard input. + + `-tFILE' + Set file description from FILE. + + `-t-STRING' + Set file description to STRING. + + `-u[REV]' + Unlock revision REV, or latest revision. + +`annotate [OPTIONS] [FILES...]' + Show last revision where each line was modified. See *Note + annotate::. + + `-D DATE' + Annotate the most recent revision no later than DATE. See + *Note Common options::. + + `-f' + Use head revision if tag/date not found. See *Note Common + options::. + + `-l' + Local; run only in current working directory. *Note + Recursive behavior::. + + `-r TAG' + Annotate revision TAG. See *Note Common options::. + +`checkout [OPTIONS] MODULES...' + Get a copy of the sources. See *Note checkout::. + + `-A' + Reset any sticky tags/date/kopts. See *Note Sticky tags:: + and *Note Keyword substitution::. + + `-c' + Output the module database. See *Note checkout options::. + + `-D DATE' + Check out revisions as of DATE (is sticky). See *Note Common + options::. + + `-d DIR' + Check out into DIR. See *Note checkout options::. + + `-f' + Use head revision if tag/date not found. See *Note Common + options::. + + `-j REV' + Merge in changes. See *Note checkout options::. + + `-k KFLAG' + Use KFLAG keyword expansion. See *Note Substitution modes::. + + `-l' + Local; run only in current working directory. *Note + Recursive behavior::. + + `-N' + Don't shorten module paths if -d specified. See *Note + checkout options::. + + `-n' + Do not run module program (if any). See *Note checkout + options::. + + `-P' + Prune empty directories. See *Note Moving directories::. + + `-p' + Check out files to standard output (avoids stickiness). See + *Note checkout options::. + + `-r TAG' + Checkout revision TAG (is sticky). See *Note Common + options::. + + `-s' + Like -c, but include module status. See *Note checkout + options::. + +`commit [OPTIONS] [FILES...]' + Check changes into the repository. See *Note commit::. + + `-F FILE' + Read log message from FILE. See *Note commit options::. + + `-f' + Force the file to be committed; disables recursion. See + *Note commit options::. + + `-l' + Local; run only in current working directory. See *Note + Recursive behavior::. + + `-m MSG' + Use MSG as log message. See *Note commit options::. + + `-n' + Do not run module program (if any). See *Note commit + options::. + + `-R' + Operate recursively (default). *Note Recursive behavior::. + + `-r REV' + Commit to REV. See *Note commit options::. + +`diff [OPTIONS] [FILES...]' + Show differences between revisions. See *Note diff::. In + addition to the options shown below, accepts a wide variety of + options to control output style, for example `-c' for context + diffs. + + `-D DATE1' + Diff revision for date against working file. See *Note diff + options::. + + `-D DATE2' + Diff REV1/DATE1 against DATE2. See *Note diff options::. + + `-l' + Local; run only in current working directory. See *Note + Recursive behavior::. + + `-N' + Include diffs for added and removed files. See *Note diff + options::. + + `-r REV1' + Diff revision for REV1 against working file. See *Note diff + options::. + + `-r REV2' + Diff rev1/date1 against rev2. See *Note diff options::. + +`edit [OPTIONS] [FILES...]' + Get ready to edit a watched file. See *Note Editing files::. + + `-a ACTIONS' + Specify actions for temporary watch, where ACTIONS is `edit', + `unedit', `commit', `all', or `none'. See *Note Editing + files::. + + `-l' + Local; run only in current working directory. See *Note + Recursive behavior::. + +`editors [OPTIONS] [FILES...]' + See who is editing a watched file. See *Note Watch information::. + + `-l' + Local; run only in current working directory. See *Note + Recursive behavior::. + +`export [OPTIONS] MODULES...' + Export files from CVS. See *Note export::. + + `-D DATE' + Check out revisions as of DATE. See *Note Common options::. + + `-d DIR' + Check out into DIR. See *Note export options::. + + `-f' + Use head revision if tag/date not found. See *Note Common + options::. + + `-k KFLAG' + Use KFLAG keyword expansion. See *Note Substitution modes::. + + `-l' + Local; run only in current working directory. *Note + Recursive behavior::. + + `-N' + Don't shorten module paths if -d specified. See *Note export + options::. + + `-n' + Do not run module program (if any). See *Note export + options::. + + `-P' + Prune empty directories. See *Note Moving directories::. + + `-r TAG' + Checkout revision TAG (is sticky). See *Note Common + options::. + +`history [OPTIONS] [FILES...]' + Show repository access history. See *Note history::. + + `-a' + All users (default is self). See *Note history options::. + + `-b STR' + Back to record with STR in module/file/repos field. See + *Note history options::. + + `-c' + Report on committed (modified) files. See *Note history + options::. + + `-D DATE' + Since DATE. See *Note history options::. + + `-e' + Report on all record types. See *Note history options::. + + `-l' + Last modified (committed or modified report). See *Note + history options::. + + `-m MODULE' + Report on MODULE (repeatable). See *Note history options::. + + `-n MODULE' + In MODULE. See *Note history options::. + + `-o' + Report on checked out modules. See *Note history options::. + + `-r REV' + Since revision REV. See *Note history options::. + + `-T' + Produce report on all TAGs. See *Note history options::. + + `-t TAG' + Since tag record placed in history file (by anyone). See + *Note history options::. + + `-u USER' + For user USER (repeatable). See *Note history options::. + + `-w' + Working directory must match. See *Note history options::. + + `-x TYPES' + Report on TYPES, one or more of `TOEFWUCGMAR'. See *Note + history options::. + + `-z ZONE' + Output for time zone ZONE. See *Note history options::. + +`import [OPTIONS] REPOSITORY VENDOR-TAG RELEASE-TAGS...' + Import files into CVS, using vendor branches. See *Note import::. + + `-b BRA' + Import to vendor branch BRA. See *Note import options::. + + `-d' + Use the file's modification time as the time of import. See + *Note import options::. + + `-k KFLAG' + Set default RCS keyword substitution mode. See *Note import + options::. + + `-m MSG' + Use MSG for log message. See *Note import options::. + + `-I IGN' + More files to ignore (! to reset). See *Note import + options::. + + `-W SPEC' + More wrappers. See *Note import options::. + +`init' + Create a CVS repository if it doesn't exist. See *Note Creating a + repository::. + +`log [OPTIONS] [FILES...]' + Print out history information for files. See *Note log::. + + `-b' + Only list revisions on the default branch. See *Note log + options::. + + `-d DATES' + Specify dates (D1<D2 for range, D for latest before). See + *Note log options::. + + `-h' + Only print header. See *Note log options::. + + `-l' + Local; run only in current working directory. See *Note + Recursive behavior::. + + `-N' + Do not list tags. See *Note log options::. + + `-R' + Only print name of RCS file. See *Note log options::. + + `-r REVS' + Only list revisions REVS. See *Note log options::. + + `-s STATES' + Only list revisions with specified states. See *Note log + options::. + + `-t' + Only print header and descriptive text. See *Note log + options::. + + `-w LOGINS' + Only list revisions checked in by specified logins. See + *Note log options::. + +`login' + Prompt for password for authenticating server. See *Note Password + authentication client::. + +`logout' + Remove stored password for authenticating server. See *Note + Password authentication client::. + +`rdiff [OPTIONS] MODULES...' + Show differences between releases. See *Note rdiff::. + + `-c' + Context diff output format (default). See *Note rdiff + options::. + + `-D DATE' + Select revisions based on DATE. See *Note Common options::. + + `-f' + Use head revision if tag/date not found. See *Note Common + options::. + + `-l' + Local; run only in current working directory. See *Note + Recursive behavior::. + + `-r REV' + Select revisions based on REV. See *Note Common options::. + + `-s' + Short patch - one liner per file. See *Note rdiff options::. + + `-t' + Top two diffs - last change made to the file. See *Note diff + options::. + + `-u' + Unidiff output format. See *Note rdiff options::. + + `-V VERS' + Use RCS Version VERS for keyword expansion. See *Note rdiff + options::. + +`release [OPTIONS] DIRECTORY' + Indicate that a directory is no longer in use. See *Note + release::. + + `-d' + Delete the given directory. See *Note release options::. + +`remove [OPTIONS] [FILES...]' + Remove an entry from the repository. See *Note Removing files::. + + `-f' + Delete the file before removing it. See *Note Removing + files::. + + `-l' + Local; run only in current working directory. See *Note + Recursive behavior::. + + `-R' + Operate recursively (default). *Note Recursive behavior::. + +`rtag [OPTIONS] TAG MODULES...' + Add a symbolic tag to a module. See *Note rtag::. + + `-a' + Clear tag from removed files that would not otherwise be + tagged. See *Note rtag options::. + + `-b' + Create a branch named TAG. See *Note rtag options::. + + `-D DATE' + Tag revisions as of DATE. See *Note rtag options::. + + `-d' + Delete the given tag. See *Note rtag options::. + + `-F' + Move tag if it already exists. See *Note rtag options::. + + `-f' + Force a head revision match if tag/date not found. See *Note + rtag options::. + + `-l' + Local; run only in current working directory. See *Note + Recursive behavior::. + + `-n' + No execution of tag program. See *Note rtag options::. + + `-R' + Operate recursively (default). *Note Recursive behavior::. + + `-r TAG' + Tag existing tag TAG. See *Note rtag options::. + +`status [OPTIONS] FILES...' + Display status information in a working directory. See *Note + status::. + + `-l' + Local; run only in current working directory. See *Note + Recursive behavior::. + + `-R' + Operate recursively (default). *Note Recursive behavior::. + + `-v' + Include tag information for file. See *Note status options::. + +`tag [OPTIONS] TAG [FILES...]' + Add a symbolic tag to checked out version of files. See *Note + tag::. + + `-b' + Create a branch named TAG. See *Note tag options::. + + `-D DATE' + Tag revisions as of DATE. See *Note tag options::. + + `-d' + Delete the given tag. See *Note tag options::. + + `-F' + Move tag if it already exists. See *Note tag options::. + + `-f' + Force a head revision match if tag/date not found. See *Note + tag options::. + + `-l' + Local; run only in current working directory. See *Note + Recursive behavior::. + + `-n' + No execution of tag program. See *Note tag options::. + + `-R' + Operate recursively (default). *Note Recursive behavior::. + + `-r TAG' + Tag existing tag TAG. See *Note tag options::. + +`unedit [OPTIONS] [FILES...]' + Undo an edit command. See *Note Editing files::. + + `-a ACTIONS' + Specify actions for temporary watch, where ACTIONS is `edit', + `unedit', `commit', `all', or `none'. See *Note Editing + files::. + + `-l' + Local; run only in current working directory. See *Note + Recursive behavior::. + +`update [OPTIONS] [FILES...]' + Bring work tree in sync with repository. See *Note update::. + + `-A' + Reset any sticky tags/date/kopts. See *Note Sticky tags:: + and *Note Keyword substitution::. + + `-D DATE' + Check out revisions as of DATE (is sticky). See *Note Common + options::. + + `-d' + Create directories. See *Note update options::. + + `-f' + Use head revision if tag/date not found. See *Note Common + options::. + + `-I IGN' + More files to ignore (! to reset). See *Note import + options::. + + `-j REV' + Merge in changes. See *Note update options::. + + `-k KFLAG' + Use KFLAG keyword expansion. See *Note Substitution modes::. + + `-l' + Local; run only in current working directory. *Note + Recursive behavior::. + + `-P' + Prune empty directories. See *Note Moving directories::. + + `-p' + Check out files to standard output (avoids stickiness). See + *Note update options::. + + `-R' + Operate recursively (default). *Note Recursive behavior::. + + `-r TAG' + Checkout revision TAG (is sticky). See *Note Common + options::. + + `-W SPEC' + More wrappers. See *Note import options::. + +`watch [on|off|add|remove] [OPTIONS] [FILES...]' + on/off: turn on/off read-only checkouts of files. See *Note + Setting a watch::. + + add/remove: add or remove notification on actions. See *Note + Getting Notified::. + + `-a ACTIONS' + Specify actions for temporary watch, where ACTIONS is `edit', + `unedit', `commit', `all', or `none'. See *Note Editing + files::. + + `-l' + Local; run only in current working directory. See *Note + Recursive behavior::. + +`watchers [OPTIONS] [FILES...]' + See who is watching a file. See *Note Watch information::. + + `-l' + Local; run only in current working directory. See *Note + Recursive behavior::. + + +File: cvs.info, Node: Administrative files, Next: Environment variables, Prev: Invoking CVS, Up: Top + +Reference manual for the Administrative files +********************************************* + + Inside the repository, in the directory `$CVSROOT/CVSROOT', there +are a number of supportive files for CVS. You can use CVS in a limited +fashion without any of them, but if they are set up properly they can +help make life easier. For a discussion of how to edit them, *Note +Intro administrative files::. + + The most important of these files is the `modules' file, which +defines the modules inside the repository. + +* Menu: + +* modules:: Defining modules +* Wrappers:: Treat directories as files +* commit files:: The commit support files +* commitinfo:: Pre-commit checking +* verifymsg:: How are log messages evaluated? +* editinfo:: Specifying how log messages are created + (obsolete) +* loginfo:: Where should log messages be sent? +* rcsinfo:: Templates for the log messages +* cvsignore:: Ignoring files via cvsignore +* history file:: History information +* Variables:: Various variables are expanded + + File: cvs.info, Node: modules, Next: Wrappers, Up: Administrative files The modules file @@ -755,175 +1381,3 @@ to `sh /work/local/tests/runtests'. All other strings containing `$' are reserved; there is no way to quote a `$' character so that `$' represents itself. - -File: cvs.info, Node: Environment variables, Next: Troubleshooting, Prev: Administrative files, Up: Top - -All environment variables which affect CVS -****************************************** - - This is a complete list of all environment variables that affect CVS. - -`$CVSIGNORE' - A whitespace-separated list of file name patterns that CVS should - ignore. *Note cvsignore::. - -`$CVSWRAPPERS' - A whitespace-separated list of file name patterns that CVS should - treat as wrappers. *Note Wrappers::. - -`$CVSREAD' - If this is set, `checkout' and `update' will try hard to make the - files in your working directory read-only. When this is not set, - the default behavior is to permit modification of your working - files. - -`$CVSROOT' - Should contain the full pathname to the root of the CVS source - repository (where the RCS history files are kept). This - information must be available to CVS for most commands to execute; - if `$CVSROOT' is not set, or if you wish to override it for one - invocation, you can supply it on the command line: `cvs -d cvsroot - cvs_command...' Once you have checked out a working directory, CVS - stores the appropriate root (in the file `CVS/Root'), so normally - you only need to worry about this when initially checking out a - working directory. - -`$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'. - -`$PATH' - If `$RCSBIN' is not set, and no path is compiled into CVS, it will - use `$PATH' to try to find all programs it uses. - -`$RCSBIN' - This is the value CVS is using for where to find RCS binaries. - *Note Global options::, for a description of how to specify this. - If not set, a compiled-in value is used, or your `$PATH' is - searched. - -`$HOME' -`$HOMEPATH' - Used to locate the directory where the `.cvsrc' file is searched - (`$HOMEPATH' is used for Windows-NT). *note ~/.cvsrc::. - -`$CVS_RSH' - Specifies the external program which CVS connects with, when - `:ext:' access method is specified. *note Connecting via rsh::.. - -`$CVS_SERVER' - Used in client-server mode when accessing a remote repository - using RSH. It specifies the name of the program to start on the - server side when accessing a remote repository using RSH. The - default value is `cvs'. *note Connecting via rsh::. - -`$CVS_PASSFILE' - Used in client-server mode when accessing the `cvs login server'. - Default value is `$HOME/.cvspass'. *note Password authentication - client::. - -`$CVS_CLIENT_PORT' - Used in client-server mode when accessing the server via Kerberos. - *note Kerberos authenticated::. - -`$CVS_RCMD_PORT' - Used in client-server mode. If set, specifies the port number to - be used when accessing the RCMD demon on the server side. - (Currently not used for Unix clients). - -`$CVS_CLIENT_LOG' - Used for debugging only in client-server mode. If set, everything - send to the server is logged into ``$CVS_CLIENT_LOG'.in' and - everything send from the server is logged into - ``$CVS_CLIENT_LOG'.out'. - -`$CVS_SERVER_SLEEP' - Used only for debugging the server side in client-server mode. If - set, delays the start of the server child process the the - specified amount of seconds so that you can attach to it with a - debugger. - -`$CVS_IGNORE_REMOTE_ROOT' - (What is the purpose of this variable?) - -`$COMSPEC' - Used under OS/2 only. It specifies the name of the command - interpreter and defaults to CMD.EXE. - -`$TMPDIR' -`$TMP' -`$TEMP' - Directory in which temporary files are located. Those parts of - CVS which are implemented using RCS inspect the above variables in - the order they appear above and the first value found is taken; if - none of them are set, a host-dependent default is used, typically - `/tmp'. The CVS server uses `TMPDIR'. *Note Global options::, - for a description of how to specify this. Some parts of CVS will - always use `/tmp' (via the `tmpnam' function provided by the - system). - - On Windows NT, `TMP' is used (via the `_tempnam' function provided - by the system). - - The `patch' program which is used by the CVS client uses `TMPDIR', - and if it is not set, uses `/tmp' (at least with GNU patch 2.1). - - CVS invokes RCS to perform certain operations. The following -environment variables affect RCS. Note that if you are using the -client/server CVS, these variables need to be set on the server side -(which may or not may be possible depending on how you are connecting). -There is probably not any need to set any of them, however. - -`$LOGNAME' -`$USER' - If set, they affect who RCS thinks you are. If you have trouble - checking in files it might be because your login name differs from - the setting of e.g. `$LOGNAME'. - -`$RCSINIT' - Options prepended to the argument list, separated by spaces. A - backslash escapes spaces within an option. The `$RCSINIT' options - are prepended to the argument lists of most RCS commands. - - -File: cvs.info, Node: Troubleshooting, Next: Copying, Prev: Environment variables, Up: Top - -Troubleshooting -*************** - -* Menu: - -* Magic branch numbers:: Magic branch numbers - - -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). - diff --git a/gnu/usr.bin/cvs/doc/cvs.info-8 b/gnu/usr.bin/cvs/doc/cvs.info-8 new file mode 100644 index 00000000000..f9909aa4b92 --- /dev/null +++ b/gnu/usr.bin/cvs/doc/cvs.info-8 @@ -0,0 +1,476 @@ +This is Info file cvs.info, produced by Makeinfo-1.64 from the input +file ../../work/ccvs/doc/cvs.texinfo. + + Copyright (C) 1992, 1993 Signum Support AB Copyright (C) 1993, 1994 +Free Software Foundation, Inc. + + Permission is granted to make and distribute verbatim copies of this +manual provided the copyright notice and this permission notice are +preserved on all copies. + + Permission is granted to copy and distribute modified versions of +this manual under the conditions for verbatim copying, provided also +that the section entitled "GNU General Public License" is included +exactly as in the original, and provided that the entire resulting +derived work is distributed under the terms of a permission notice +identical to this one. + + Permission is granted to copy and distribute translations of this +manual into another language, under the above conditions for modified +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: Index, Prev: Copying, Up: Top + +Index +***** + +* Menu: + +* -j (merging branches): Merging a branch. +* -k (RCS kflags): Substitution modes. +* .# files: update output. +* .bashrc, setting CVSROOT in: Specifying a repository. +* .cshrc, setting CVSROOT in: Specifying a repository. +* .cvsrc file: ~/.cvsrc. +* .profile, setting CVSROOT in: Specifying a repository. +* .tcshrc, setting CVSROOT in: Specifying a repository. +* /usr/local/cvsroot, as example repository: Repository. +* :ext:: Connecting via rsh. +* :kserver:: Kerberos authenticated. +* :local:: Repository. +* :pserver:: Password authentication client. +* :server:: Connecting via rsh. +* <<<<<<<: Conflicts example. +* =======: Conflicts example. +* >>>>>>>: Conflicts example. +* __ files (VMS): update output. +* A sample session: A sample session. +* abandoning work: Editing files. +* About this manual: Preface. +* add (subcommand): Adding files. +* Adding a tag: Tags. +* Adding files: Adding files. +* Admin (subcommand): admin. +* Administrative files (intro): Intro administrative files. +* Administrative files (reference): Administrative files. +* Administrative files, editing them: Intro administrative files. +* ALL in commitinfo: commitinfo. +* annotate (subcommand): annotate. +* Atomic transactions, lack of: Concurrency. +* 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. +* bill of materials: Builds. +* Binary files: Binary files. +* Branch merge example: Merging a branch. +* Branch number: Revision numbers. +* Branch numbers: Creating a branch. +* Branch, creating a: Creating a branch. +* Branch, vendor-: Tracking sources. +* Branches: Revisions and branches. +* Branches motivation: Branches motivation. +* Branches, copying changes between: Merging. +* Branches, sticky: Sticky tags. +* Bringing a file up to date: Updating a file. +* Bugs, known in this manual: BUGS. +* Bugs, reporting (CVS): What is CVS?. +* Bugs, reporting (manual): BUGS. +* builds: Builds. +* Changes, copying between branches: Merging. +* Changing a log message: admin options. +* checked out copy, keeping: Keeping a checked out copy. +* Checkin program: modules. +* Checking commits: commitinfo. +* Checking out source: Getting the source. +* Checkout (subcommand): checkout. +* Checkout program: modules. +* checkout, as term for getting ready to edit: Editing files. +* Checkout, example: Getting the source. +* choosing, reserved or unreserved checkouts: Choosing a model. +* Cleaning up: Cleaning up. +* Client/Server Operation: Remote repositories. +* Co (subcommand): checkout. +* Command reference: Invoking CVS. +* Command structure: Structure. +* Comment leader: admin examples. +* Commit (subcommand): commit. +* Commit files: commit files. +* Commit, when to: When to commit. +* Commitinfo: commitinfo. +* Committing changes: Committing your changes. +* Common options: Common options. +* Common syntax of info files: syntax. +* compatibility, between CVS versions: Compatibility. +* COMSPEC: Environment variables. +* Conflict markers: Conflicts example. +* Conflict resolution: Conflicts example. +* Conflicts (merge example): Conflicts example. +* Contributors (CVS program): What is CVS?. +* Contributors (manual): Credits. +* Copying changes: Merging. +* Correcting a log message: admin options. +* Creating a branch: Creating a branch. +* Creating a project: Starting a new project. +* Creating a repository: Creating a repository. +* Credits (CVS program): What is CVS?. +* Credits (manual): Credits. +* CVS 1.6, and watches: Watches Compatibility. +* CVS command structure: Structure. +* CVS passwd file: Password authentication server. +* CVS, history of: What is CVS?. +* CVS, introduction to: What is CVS?. +* CVS, versions of: Compatibility. +* CVS_CLIENT_LOG: Environment variables. +* CVS_CLIENT_PORT: Kerberos authenticated. +* CVS_IGNORE_REMOTE_ROOT: Environment variables. +* CVS_PASSFILE, environment variable: Password authentication client. +* CVS_RCMD_PORT: Environment variables. +* CVS_RSH: Environment variables. +* CVS_SERVER: Connecting via rsh. +* CVS_SERVER_SLEEP: Environment variables. +* CVSEDITOR: Environment variables. +* CVSEDITOR, environment variable: Committing your changes. +* CVSIGNORE: Environment variables. +* cvsignore (admin file), global: cvsignore. +* CVSREAD: Environment variables. +* CVSREAD, overriding: Global options. +* CVSROOT: Environment variables. +* cvsroot: Repository. +* CVSROOT (file): Administrative files. +* CVSROOT, environment variable: Specifying a repository. +* CVSROOT, module name: Intro administrative files. +* CVSROOT, multiple repositories: Multiple repositories. +* CVSROOT, overriding: Global options. +* CVSUMASK: File permissions. +* CVSWRAPPERS: Environment variables. +* cvswrappers (admin file): Wrappers. +* CVSWRAPPERS, environment variable: Wrappers. +* Date keyword: Keyword list. +* Dates: Common options. +* Decimal revision number: Revision numbers. +* DEFAULT in commitinfo: commitinfo. +* DEFAULT in editinfo: editinfo. +* DEFAULT in verifymsg: verifymsg. +* Defining a module: Defining the module. +* Defining modules (intro): Intro administrative files. +* Defining modules (reference manual): modules. +* Deleting files: Removing files. +* Deleting revisions: admin options. +* Deleting sticky tags: Sticky tags. +* Descending directories: Recursive behavior. +* Diff: Viewing differences. +* Diff (subcommand): diff. +* Differences, merging: Merging two revisions. +* Directories, moving: Moving directories. +* directories, removing: Removing directories. +* Directory, descending: Recursive behavior. +* Disjoint repositories: Multiple repositories. +* Distributing log messages: loginfo. +* driver.c (merge example): Conflicts example. +* edit (subcommand): Editing files. +* editinfo (admin file): editinfo. +* Editing administrative files: Intro administrative files. +* Editing the modules file: Defining the module. +* EDITOR: Environment variables. +* Editor, avoiding invocation of: Common options. +* EDITOR, environment variable: Committing your changes. +* EDITOR, overriding: Global options. +* Editor, specifying per module: editinfo. +* editors (subcommand): Watch information. +* emerge: Conflicts example. +* Environment variables: Environment variables. +* Errors, reporting (CVS): What is CVS?. +* Errors, reporting (manual): BUGS. +* Example of a work-session: A sample session. +* Example of merge: Conflicts example. +* Example, branch merge: Merging a branch. +* Export (subcommand): export. +* Export program: modules. +* Fetching source: Getting the source. +* File had conflicts on merge: File status. +* File locking: Multiple developers. +* File permissions: File permissions. +* File status: File status. +* Files, moving: Moving files. +* Files, reference manual: Administrative files. +* Fixing a log message: admin options. +* Forcing a tag match: Common options. +* Form for log message: rcsinfo. +* Format of CVS commands: Structure. +* Getting started: A sample session. +* Getting the source: Getting the source. +* Global cvsignore: cvsignore. +* Global options: Global options. +* Group: File permissions. +* Header keyword: Keyword list. +* History (subcommand): history. +* History browsing: History browsing. +* History file: history file. +* History files: Repository files. +* History of CVS: What is CVS?. +* HOME: Environment variables. +* HOMEPATH: Environment variables. +* Id keyword: Keyword list. +* Ident (shell command): Using keywords. +* Identifying files: Keyword substitution. +* Ignored files: cvsignore. +* Ignoring files: cvsignore. +* Import (subcommand): import. +* Importing files: From files. +* Importing files, from other version control systesm: From other version control systems. +* Importing modules: First import. +* Index: Index. +* Info files (syntax): syntax. +* Informing others: Informing others. +* init (subcommand): Creating a repository. +* Introduction to CVS: What is CVS?. +* Invoking CVS: Invoking CVS. +* Isolation: History browsing. +* Join: Merging a branch. +* keeping a checked out copy: Keeping a checked out copy. +* kerberos: Kerberos authenticated. +* Keyword expansion: Keyword substitution. +* Keyword substitution: Keyword substitution. +* Kflag: Substitution modes. +* kinit: Kerberos authenticated. +* Known bugs in this manual: BUGS. +* Layout of repository: Repository. +* Left-hand options: Global options. +* Linear development: Revision numbers. +* link, symbolic, importing: import output. +* List, mailing list: What is CVS?. +* Locally Added: File status. +* Locally Modified: File status. +* Locally Removed: File status. +* Locker keyword: Keyword list. +* Locking files: Multiple developers. +* locks, cvs: Concurrency. +* Log (subcommand): log. +* Log information, saving: history file. +* Log keyword: Keyword list. +* Log keyword, selecting comment leader: admin examples. +* Log message entry: Committing your changes. +* Log message template: rcsinfo. +* Log message, correcting: admin options. +* log message, verifying: verifymsg. +* Log messages: loginfo. +* Log messages, editing: editinfo. +* Login (subcommand): Password authentication client. +* loginfo (admin file): loginfo. +* LOGNAME: Environment variables. +* Logout (subcommand): Password authentication client. +* 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. +* Markers, conflict: Conflicts example. +* Merge, an example: Conflicts example. +* Merge, branch example: Merging a branch. +* Merging: Merging. +* Merging a branch: Merging a branch. +* Merging a file: Updating a file. +* Merging two revisions: Merging two revisions. +* Modifications, copying between branches: Merging. +* Module status: modules. +* Module, defining: Defining the module. +* Modules (admin file): modules. +* Modules file: Intro administrative files. +* Modules file, changing: Defining the module. +* Motivation for branches: Branches motivation. +* Moving directories: Moving directories. +* Moving files: Moving files. +* Multiple developers: Multiple developers. +* Multiple repositories: Multiple repositories. +* Name keyword: Keyword list. +* Name, symbolic (tag): Tags. +* Needs Checkout: File status. +* Needs Merge: File status. +* Needs Patch: File status. +* Newsgroups: What is CVS?. +* notify (admin file): Getting Notified. +* Nroff (selecting comment leader): admin examples. +* Number, branch: Revision numbers. +* Number, revision-: Revision numbers. +* option defaults: ~/.cvsrc. +* Options, global: Global options. +* Outdating revisions: admin options. +* Overlap: Updating a file. +* Overriding CVSREAD: Global options. +* Overriding CVSROOT: Global options. +* Overriding EDITOR: Global options. +* Overriding RCSBIN: Global options. +* Overriding TMPDIR: Global options. +* Parallel repositories: Multiple repositories. +* passwd (admin file): Password authentication server. +* password client, using: Password authentication client. +* password server, setting up: Password authentication server. +* PATH: Environment variables. +* Per-module editor: editinfo. +* Policy: When to commit. +* Precommit checking: commitinfo. +* Preface: Preface. +* Pserver (subcommand): Password authentication server. +* RCS history files: Repository files. +* RCS keywords: Keyword list. +* RCS revision numbers: Tags. +* RCS, importing files from: From other version control systems. +* RCS-style locking: Multiple developers. +* RCSBIN: Environment variables. +* RCSBIN, overriding: Global options. +* RCSfile keyword: Keyword list. +* rcsinfo (admin file): rcsinfo. +* RCSINIT: Environment variables. +* Rdiff (subcommand): rdiff. +* read-only files, and -r: Global options. +* read-only files, and CVSREAD: Environment variables. +* read-only files, and watches: Setting a watch. +* read-only files, in repository: File permissions. +* Read-only mode: Global options. +* read-only repository access: Read-only access. +* readers (admin file): Read-only access. +* Recursive (directory descending): Recursive behavior. +* Reference manual (files): Administrative files. +* Reference manual for variables: Environment variables. +* Reference, commands: Invoking CVS. +* regular expression syntax: syntax. +* Release (subcommand): release. +* Releases, revisions and versions: Versions revisions releases. +* Releasing your working copy: Cleaning up. +* Remote repositories: Remote repositories. +* Remove (subcommand): Removing files. +* Removing a change: Merging two revisions. +* removing directories: Removing directories. +* Removing files: Removing files. +* Removing your working copy: Cleaning up. +* Renaming directories: Moving directories. +* Renaming files: Moving files. +* Replacing a log message: admin options. +* Reporting bugs (CVS): What is CVS?. +* Reporting bugs (manual): BUGS. +* Repositories, multiple: Multiple repositories. +* Repositories, remote: Remote repositories. +* Repository (intro): Repository. +* Repository, example: Repository. +* Repository, how data is stored: Repository storage. +* Repository, setting up: Creating a repository. +* reserved checkouts: Multiple developers. +* Resetting sticky tags: Sticky tags. +* Resolving a conflict: Conflicts example. +* Restoring old version of removed file: Sticky tags. +* Resurrecting old version of dead file: Sticky tags. +* Retrieving an old revision using tags: Tags. +* reverting to repository version: Editing files. +* Revision keyword: Keyword list. +* Revision management: Revision management. +* Revision numbers: Revision numbers. +* Revision tree: Revision numbers. +* Revision tree, making branches: Revisions and branches. +* Revisions, merging differences between: Merging two revisions. +* Revisions, versions and releases: Versions revisions releases. +* Right-hand options: Common options. +* rsh: Connecting via rsh. +* Rtag (subcommand): rtag. +* rtag, creating a branch using: Creating a branch. +* Saving space: admin options. +* SCCS, importing files from: From other version control systems. +* Security: File permissions. +* server, CVS: Remote repositories. +* setgid: File permissions. +* Setting up a repository: Creating a repository. +* setuid: File permissions. +* Signum Support: Preface. +* Source keyword: Keyword list. +* Source, getting CVS source: What is CVS?. +* Source, getting from CVS: Getting the source. +* Specifying dates: Common options. +* Spreading information: Informing others. +* Starting a project with CVS: Starting a new project. +* State keyword: Keyword list. +* Status (subcommand): status. +* Status of a file: File status. +* Status of a module: modules. +* sticky date: Sticky tags. +* Sticky tags: Sticky tags. +* Sticky tags, resetting: Sticky tags. +* Storing log messages: loginfo. +* Structure: Structure. +* Subdirectories: Recursive behavior. +* Support, getting CVS support: Preface. +* symbolic link, importing: import output. +* Symbolic name (tag): Tags. +* Syntax of info files: syntax. +* Tag (subcommand): tag. +* Tag program: modules. +* tag, command, introduction: Tags. +* tag, example: Tags. +* Tag, retrieving old revisions: Tags. +* Tag, symbolic name: Tags. +* taginfo: user-defined logging. +* Tags: Tags. +* Tags, sticky: Sticky tags. +* tc, Trivial Compiler (example): A sample session. +* Team of developers: Multiple developers. +* TEMP: Environment variables. +* Template for log message: rcsinfo. +* temporary files, location of: Environment variables. +* Third-party sources: Tracking sources. +* Time: Common options. +* timezone, in input: Common options. +* timezone, in output: log. +* TMP: Environment variables. +* TMPDIR: Environment variables. +* TMPDIR, overriding: Global options. +* Trace: Global options. +* Traceability: History browsing. +* Tracking sources: Tracking sources. +* Transactions, atomic, lack of: Concurrency. +* Trivial Compiler (example): A sample session. +* Typical repository: Repository. +* umask, for repository files: File permissions. +* Undoing a change: Merging two revisions. +* unedit (subcommand): Editing files. +* Unknown: File status. +* unreserved checkouts: Multiple developers. +* Up-to-date: File status. +* Update (subcommand): update. +* Update program: modules. +* update, introduction: Updating a file. +* Updating a file: Updating a file. +* USER: Environment variables. +* user aliases: Password authentication server. +* users (admin file): Getting Notified. +* Vendor: Tracking sources. +* Vendor branch: Tracking sources. +* verifymsg (admin file): verifymsg. +* versions, of CVS: Compatibility. +* Versions, revisions and releases: Versions revisions releases. +* Viewing differences: Viewing differences. +* watch add (subcommand): Getting Notified. +* watch off (subcommand): Setting a watch. +* watch on (subcommand): Setting a watch. +* watch remove (subcommand): Getting Notified. +* watchers (subcommand): Watch information. +* Watches: Watches. +* Wdiff (import example): First import. +* web pages, maintaining with CVS: Keeping a checked out copy. +* What (shell command): Using keywords. +* What branches are good for: Branches motivation. +* What is CVS?: What is CVS?. +* When to commit: When to commit. +* Work-session, example of: A sample session. +* Working copy: Multiple developers. +* Working copy, removing: Cleaning up. +* Wrappers: Wrappers. +* writers (admin file): Read-only access. +* zone, time, in input: Common options. +* zone, time, in output: log. + + diff --git a/gnu/usr.bin/cvs/doc/cvs.ps b/gnu/usr.bin/cvs/doc/cvs.ps index 7ebbfcc112d..200420e8d81 100644 --- a/gnu/usr.bin/cvs/doc/cvs.ps +++ b/gnu/usr.bin/cvs/doc/cvs.ps @@ -8,7 +8,7 @@ %%EndComments %DVIPSCommandLine: dvips cvs.dvi -o cvs.ps %DVIPSParameters: dpi=600, compressed, comments removed -%DVIPSSource: TeX output 1997.03.16:1620 +%DVIPSSource: TeX output 1997.03.25:1328 %%BeginProcSet: texc.pro /TeXDict 250 dict def TeXDict begin /N{def}def /B{bind def}N /S{exch}N /X{S N}B /TR{translate}N /isls false N /vsize 11 72 mul N /hsize 8.5 72 @@ -557,7 +557,7 @@ A26E5AA26E5A352C7DAB3C>I<B5D8FE1FB539801FFFF0A500039027C0007FF0C7EAFE00 ED800F011F91B55C16F9DAFF01ECC01F6D02F092C7FC03816E5A6D0183153EEEE07F03C7 ECF07E6DDAC03F137C03E7ECF8FC6D01EF5DEE801F03FF14FD6DDA000F5B18FF6E486D5B A36E486D5BA26E486D5BA2020F93C8FC4B7FA26E48147E6E48143C4C2C7DAB53>I -E /Fk 54 122 df<922607FFE0EB1FFC92B5D8FC01B5FC0207DAFF0F1480021F039F14C0 +E /Fk 52 122 df<922607FFE0EB1FFC92B5D8FC01B5FC0207DAFF0F1480021F039F14C0 913D7FFE007FFFF83FE0902601FFF0011F9038E07FF049018049903880FFF84990C7485B D90FFC4A5A495A60495AF27FF0017F4CEB3FE04A027FEC1FC0053FEC0F80051F91C7FCAC BB12E0A526007FF0C7D81FFCC8FCB3B3A3007FB5D8F01FB512FEA54D4D7ECC48>11 @@ -639,126 +639,119 @@ D<B712FEA5D8000FEBE000B3B3B3ABB712FEA5274B7DCA2E>I<B700F8027FB512F0A5D8 E0814B6D7F8385717F717F83857180727F8486727F8486727F727F84867280737F858773 7F87B700F8010FB612FCA5564B7CCA60>75 D<B8FCA5D8001F01C0C9FCB3B3A4193EA419 7E197CA519FCA31801A2F003F8A21807180F181F183F187FEF01FF1707173FBA12F0A53F -4B7BCA4A>I<B600E092B612F88181A281D8001F6D9239001FE0006F705A82A28202BF7F -029F7FA2028F7F02877F02837F8214810280806F7F6F7F83816F7F6F7F6F7F83816F8070 -7F707F8482707F707F707FA2707F7014807113C019E0837113F07113F87113FC19FE8371 -13FF71148F7213CF1AEF847213FF8484A284848485A2858585A285858585497EB600F816 -7F1A3F1A1F1A0FA2554B7BCA60>78 D<EEFFF8031FEBFFC04AB612FC020715FF021FD9C0 -1F13C091277FFE000313F0902601FFF09038007FFC49496E7E490180EC0FFF4990C86C7F -49486F7F49486F7F017F8449486F7F4849707EA24849707E4885A24849701380A2481AC0 -4A82A2481AE0A34890CA6C13F0A5B519F8AE6C1AF0A26E5EA36C1AE0A26E5E6C1AC0A26C -1A806E5E6C1A006E5E6C616E16FF6C616C6D4B5B6D6C4B5B6E5D6D6D4A5B6D6D4A5B0107 -6D4A90C7FC6D01F8ECFFFE6D01FE01035B9028007FFFC01F13F0021F90B612C0020793C8 -FC020115FCDA001F14C0030101FCC9FC4D4D79CB5C>I<DA7FFCEB01C00103B5EAC00301 -1FECF00749ECFC0F90B7121F48D9E00F13BF4890C713FFD807FC141F4848804848140382 -484880177F485A173F171F12FFA2170F7FA217077F7F7F6D92C7FC6D7E6C13F014FF15F8 -6CECFF8016F86C15FF6C16C0836C826C826C826C82013F816D1680010716C01300020F15 -E01400030714F0ED007F160F16037013F882177F127800F8163FA3171FA27E18F0A27EA2 -6CEE3FE07F18C001E0157F6DEDFF8001FC160001FF140302E0EB0FFED97FFEEB3FFC486C -B612F0D8FC0F5DD8F803158048C66C49C7FC48010313F0354D79CB44>83 -D<003FBB12C0A5DA80019038FC001FD9FC001601D87FF09438007FE001C0183F49181F90 -C7170FA2007E1907A3007C1903A500FC1AF0481901A5C894C7FCB3B3A749B812FCA54C4A -7CC955>I<B700F8023FB512F8A5D8001F01C0C9380FE000745AB3B3AD6D180F63811A1F -6D96C7FC626D7F1A7E6D7F6D606E6C4B5A6E6CED07F06E6C4B5A6E01C0EC3FC06E01F049 -B45A020101FF011F90C8FC6E91B55A033F15F8030715E0030092C9FC040713F0554C7CCA -5E>I<B700F00203B6FCA5D8001F01E0C93803FC00745A6D61811A036D6D5F1A076D6D5F -1A0F6D616F161FA26D6D94C7FC626E6D153E1A7E6E177C7015FC6E5F8219016E6D5D1903 -6E5F7014076E5F82190F6E6D5D191F6E6D92C8FC616F153E83197E6F6D137C19FC6F6D5B -18016F5DEFF003A26F01F85B18076F01FC5B180F6F5DEFFE1F6F92C9FC17FF607013BE18 -FE705BA2705BA3705BA2705BA2705BA3705BA27090CAFCA2177EA2584C7ECA5D>I<B7D8 -E007B791B612C0A5D8003F0180C7000101FCC9387F80006F7070C7FC6D70183EA26F7016 -7E6D71177C876F1BFC6D715F6F831E016D656F4B6D14036D65876F92B515076D656F4A80 -07F3160F6E647001036E141F6E04E194C8FCA27001076E5C6E04C0163E8770010F177E6E -4C6C157C70011F814F6C15FC6E637049EDC0016E033E6D5D1CE070017E16036E037C6D5D -7001FC15F04E6D14076E63DCFF01EEF80F6F4A6D5DA20583EEFC1F6F4A6D92C9FC1CFE05 -C75F6F4A6D143E05EF16FF4E6E137E6F197C05FF17FC6F91C86C5BA36F496F5BA24D816F -61A26F496F5BA370486F5BA370486F90CAFCA24D81041F5FA27048167C7A4C7ECA7F>I< -ECFFFC010FEBFFC0017F14F090B612FC489038803FFE3B03FC0007FF80486C6D7F6D7F48 -6D6C7F83167F83A2707E6C90C7FC6C5A6C5AC9FCA5ED1FFF021FB5FC49B6FC130F013FEB -C03F9038FFFE00000313F04813C04890C7FC485A485AA2485AA2485AA4167FA26D14FF00 -7F15EF6D01017F6C6C903907CFFF806C6CD90F8F13FE6C9038E07F076C9038FFFE030001 -4A7ED8003F9038F0007F0103018090C7FC37347CB23C>97 D<EB7FC0B5FCA512037EB3ED -07FF037F13E002C1B512FC02C714FF9126CFF80F7F9126DFC0017F02FFC77F4AEC3FF002 -F8814A6E7E717E4A81831980A37113C0A319E0AC19C0A35F1980A219005F606E141F6E5D -4D5A6E4A5A02BF4A5A91261FC0035B9027FE0FF01F5B496CB548C7FCD9F80114F8496C6C -13E0C8D80FFEC8FC3B4D7CCB44>I<91380FFF8091B512F8010314FF010F15804948C613 -C0D97FF8EB1FE0D9FFE0EB3FF04849137F4849EBFFF84890C7FCA2485A121FA24848EC7F -F0EE3FE0EE1FC0007F92C7FC5BA212FFAC127FA27FA2123FA26C6C153EA26C6C157E177C -6C6D14FC6C6D14F86C6D13036C6DEB07F0D97FFCEB1FE06DB4EBFFC0010F90B512000103 -5C010014F0020F13802F347CB237>I<EF1FF0EE3FFFA51600177FB3EC0FFF91B512E001 -0314F8010F14FC013FEB01FF903A7FF8003FFFD9FFE0130F48497F48497F4890C77E4881 -5B121F5B123FA2127F5BA312FFAC127FA36C7EA3121F6D5C120F6C6C5C6C6D5B6C5D6C01 -E0013F7F6D6C49EBFFE090393FFE03FE6DB512F801075C0100148091261FFC00EBC0003B -4D7CCB44>I<EC0FFF91B512F0010314FC010F14FF90263FFE077F90267FF0007F49486D -7E4801806D7E486F7E4890C7120F484881707E121F491403003F82A2127F5B701380A212 -FFA390B8FCA401F8CAFCA5127FA27FA2123FA26C6CED0F80A26C6C151F6C17006E5C6C6D -147E6C6D5C6C6D495AD93FFCEB07F0903A1FFF803FE0010790B55A010192C7FC6D6C13FC -020713C031347DB238>I<ED7FF0913807FFFC023F7F4A7F902601FFE0138049018113C0 -49484813E0EB0FFCEB1FF8A2EB3FF0A2017F6D13C04A6C1380EE7F00163E93C7FCACB77E -A526007FF0C8FCB3B3A3003FB512F8A52B4D7DCC26>I<DA7FFCEB0FE00103B538807FF8 -010F9138E1FFFC013F02FB13FE903A7FF01FFFF39026FFC007138348D900011303481683 -48486DEBC1FCEFC0F8000FEEE00049147F001F82A9000F5E6D14FF00075EA26C6C495B6C -93C7FC6C9038C007FE9138F01FFC4890B55A01EF14E0D803C314809026C07FFCC8FC0007 -90CAFCA47FA27F13FC90B612FCEEFFC06C16F817FE6C8218806C17C06D16E00003B812F0 -120FD81FFCC7000F13F8D83FF0140049153F4848ED1FFC00FF160F491507A56D150F007F -17F86D151F6C6CED3FF06C6CED7FE0D80FFE913801FFC06C6C6C010713806C01F8017F13 -00C690B612FC013F15F001071580D9003F01F0C7FC37497DB13D>I<EB7FC0B5FCA51203 -7EB3923801FFC0030F13F8033F7F4B13FFDBFE077F9138C1F0039126C3E0017FDAC78080 -ECCF0014DE02DC6D7F14FC5CA25CA35CB3AAB6D8C07FEBFFE0A53B4C7BCB44>I<13FCEA -03FF487F487FA2487FA66C5BA26C5B6C90C7FCEA00FC90C8FCABEB7FC0B5FCA512037EB3 -B3A2B61280A5194D7BCC22>I<EC01F8EC07FE4A7E4A1380A24A13C0A66E1380A26E1300 -6E5AEC01F891C8FCABEDFFC049B5FCA5EB000380B3B3AC1202EA1FC0EA3FE0EA7FF0EAFF -F84A1380A216005C5D6C48485A49485A003FEB7FF06CB55A6C1480000349C7FC38007FF0 -226386CC26>I<EB7FC0B5FCA512037EB3A293383FFFFEA5040390C7FC17FC4C5AEE0FE0 -EE3FC04C5A4CC8FC4B5AED03F8ED0FF04B5A4B5A4B5A4BC9FC14C302C77F02CF7F02DF7F -91B5FC824A7F4A6C7EECF83F9138E01FFE02C07F6F7F816F7F836F7F81707E83707E161F -707E84707F84B6D8803FEBFF80A5394C7CCB41>I<EB7FC0B5FCA512037EB3B3B3AAB612 -80A5194C7BCB22>I<90287FC001FFC0EC7FF0B5010F01FC0103B5FC033F6D010F804B6D -4980DBFE079026803F817F9126C1F801903AC07E007FF00003D9C3E0DAE0F8806C9026C7 -8000D9F1E06D7E02CFC7EBF3C002DEEDF780DD7FFF6E7E02FC93C7FC4A5DA24A5DA34A5D -B3AAB6D8C03FB5D8F00FB512FCA55E327BB167>I<903A7FC001FFC0B5010F13F8033F7F -4B13FFDBFE077F9138C1F00300039026C3E0017F6CD9C78080ECCF0014DE02DC6D7F14FC -5CA25CA35CB3AAB6D8C07FEBFFE0A53B327BB144>I<913807FF80027F13F80103B6FC01 -0F15C090261FFE017F903A7FF0003FF849486D7E480180EB07FE4890C76C7E4817804980 -000F17C048486E13E0A2003F17F0A249157F007F17F8A400FF17FCAB007F17F8A46C6CED -FFF0A2001F17E0A26C6C4A13C0A26C6C4A13806C6D4913006C5E6C01E0EB1FFC6D6C495A -903A3FFE01FFF0010FB612C0010392C7FCD9007F13F80207138036347DB23D>I<90397F -C007FFB5017F13E002C1B512FC02C714FF9126CFF80F7F9126DFC0037F000301FFC77F6C -496E7E02F8814A6E7E717E4A81831980A28319C0A37113E0AC19C05FA319805F19005F60 -6E143F6E5D4D5A6E4A5A02FF495BDBC0075B9126EFF01F5B02E7B548C7FC02E114F8DAE0 -7F13E0DB0FFEC8FC92CAFCAFB612C0A53B477CB144>I<DA0FFE14F091B5EAC0010103EC -F003010F14F8013F903801FC0790397FFC007ED9FFF0EB1F0F4849EB0F9F4849EB07DF48 -4914FF488191C7FC48815B003F815B127F177FA25B12FFAC6C7EA3123F6D15FFA2001F5D -7F6C5D6C6D5B6C7F6C151F6C6D5BD97FF813FE90393FFE03FC6DB55A010714E001001480 -91381FFC0091C8FCAF047FEBFFE0A53B477CB141>I<9039FF803FE0B5EBFFF8028113FE -02837FDA87E11380EC8F830003D99F0713C06C139E14BCA214F8A24A6C13806F13006F5A -4A90C7FCA45CB3A8B612E0A52A327CB132>I<903907FF8070017FEBF1F048B6FC120738 -0FFC01391FE0003F4848130F491307127F90C71203A2481401A27FA27F01F090C7FC13FC -EBFFC06C13FEECFFE06C14FC6C806CECFF806C15C06C15E06C15F06C7E011F14F8010114 -FCEB000FEC007FED1FFE0078140F00F8140715037E1501A27E16FC7E15036D14F86D1307 -6D14F001F8EB1FE001FFEBFFC04890B51280486C1400D8F81F13FCD8E00313C027347CB2 -30>I<14F8A51301A41303A21307A2130FA2131F133F137F13FF1203000F90B512F0B7FC -A426007FF8C7FCB3A7167CAA013F14F880A290391FFE01F0010F1303903907FF87E06DEB -FFC06D14806D6C1300EC0FFC26467EC430>I<D97FE0EC3FF0B5EC7FFFA5000315016C81 -B3AC5EA25EA25E7E6EEB0F7F017F021E7F6E017CEBFFE090393FFE01F86DB512F0010714 -E0010114C09027003FFE00EBC0003B337BB144>I<B600C090387FFFF0A5C601F0C73803 -F8006E5D017F5E801707013F5E6E140F011F5E6E141F6D93C7FC6F5B6D153E81177E6D15 -7C6F13FC6D5DEDF0016D5DEDF803027F5CA2EDFC07023F5CEDFE0F021F5CEDFF1F6E91C8 -FC169F16BF6E13BE16FE6E5BA26E5BA26E5BA36F5AA26F5AA26F5AA23C327EB041>I<B6 -0081B500FC90387FFFF0A500019026E0000390C73801FC006E6F5C6C6F5E6E6F1303017F -61A26E6F1307013F4A5E846E49150F011F616E6F131F6D4A93C7FC179F03806E5B6D021F -153EEF0FFE6DD9C03F5DEE3E0703E06E13FC6D027E5DEE7C0303F015816D4A6C5C03F815 -C3DA7FF95E4C7E03FD15E7DA3FFF5E4C137F19FF6E496D5BA26E94C8FC4C7FA26E5E93C7 -120FA26E486E5AA202015E4B1403A26E486E5A54327EB059>I<B6D88007B512C0A52600 -7FF8C7387F80006D6C92C7FC6E14FE6D6C495A6D6D485A6D01C05B6D4A5A6F485A6DEBF0 -1F6D6D485A6E6C48C8FC023F137E6F5A6E6C5A806E5B6E5BA26E7F6E7F6F7E15FF4A7F4A -7F4A8003E77FEC0FC3DA1F837FDA3F817F4AC67F02FE6D7E4948133F4A8049486D7E0107 -6E7F49486D7F49487F494881017F6E7FB500F8011FEBFFF0A53C317EB041>I<007FB500 -C090387FFFE0A5C601F0C73803F8006E5D017F5E6E1407013F5E80170F011F5E6E141F6D -93C7FC6F5B6D153E6F137E6D157C6F13FCA26D6D5B16016D5DEDF803027F5CEDFC07023F -5CEDFE0F021F5C15FF161F6E91C8FC16BF6E13BE16FE6E5BA26E5BA36E5BA26F5AA26F5A -A26F5AA393C9FC5D153E157E157CD81F8013FC486C5B387FE001D8FFF05B14035D14074A -5A49485A007F133F4948CAFC383F81FE381FFFF86C5B6C13C0C648CBFC3B477EB041>I +4B7BCA4A>I<EEFFF8031FEBFFC04AB612FC020715FF021FD9C01F13C091277FFE000313 +F0902601FFF09038007FFC49496E7E490180EC0FFF4990C86C7F49486F7F49486F7F017F +8449486F7F4849707EA24849707E4885A24849701380A2481AC04A82A2481AE0A34890CA +6C13F0A5B519F8AE6C1AF0A26E5EA36C1AE0A26E5E6C1AC0A26C1A806E5E6C1A006E5E6C +616E16FF6C616C6D4B5B6D6C4B5B6E5D6D6D4A5B6D6D4A5B01076D4A90C7FC6D01F8ECFF +FE6D01FE01035B9028007FFFC01F13F0021F90B612C0020793C8FC020115FCDA001F14C0 +030101FCC9FC4D4D79CB5C>79 D<DA7FFCEB01C00103B5EAC003011FECF00749ECFC0F90 +B7121F48D9E00F13BF4890C713FFD807FC141F4848804848140382484880177F485A173F +171F12FFA2170F7FA217077F7F7F6D92C7FC6D7E6C13F014FF15F86CECFF8016F86C15FF +6C16C0836C826C826C826C82013F816D1680010716C01300020F15E01400030714F0ED00 +7F160F16037013F882177F127800F8163FA3171FA27E18F0A27EA26CEE3FE07F18C001E0 +157F6DEDFF8001FC160001FF140302E0EB0FFED97FFEEB3FFC486CB612F0D8FC0F5DD8F8 +03158048C66C49C7FC48010313F0354D79CB44>83 D<003FBB12C0A5DA80019038FC001F +D9FC001601D87FF09438007FE001C0183F49181F90C7170FA2007E1907A3007C1903A500 +FC1AF0481901A5C894C7FCB3B3A749B812FCA54C4A7CC955>I<B700F8023FB512F8A5D8 +001F01C0C9380FE000745AB3B3AD6D180F63811A1F6D96C7FC626D7F1A7E6D7F6D606E6C +4B5A6E6CED07F06E6C4B5A6E01C0EC3FC06E01F049B45A020101FF011F90C8FC6E91B55A +033F15F8030715E0030092C9FC040713F0554C7CCA5E>I<B700F00203B6FCA5D8001F01 +E0C93803FC00745A6D61811A036D6D5F1A076D6D5F1A0F6D616F161FA26D6D94C7FC626E +6D153E1A7E6E177C7015FC6E5F8219016E6D5D19036E5F7014076E5F82190F6E6D5D191F +6E6D92C8FC616F153E83197E6F6D137C19FC6F6D5B18016F5DEFF003A26F01F85B18076F +01FC5B180F6F5DEFFE1F6F92C9FC17FF607013BE18FE705BA2705BA3705BA2705BA2705B +A3705BA27090CAFCA2177EA2584C7ECA5D>I<B7D8E007B791B612C0A5D8003F0180C700 +0101FCC9387F80006F7070C7FC6D70183EA26F70167E6D71177C876F1BFC6D715F6F831E +016D656F4B6D14036D65876F92B515076D656F4A8007F3160F6E647001036E141F6E04E1 +94C8FCA27001076E5C6E04C0163E8770010F177E6E4C6C157C70011F814F6C15FC6E6370 +49EDC0016E033E6D5D1CE070017E16036E037C6D5D7001FC15F04E6D14076E63DCFF01EE +F80F6F4A6D5DA20583EEFC1F6F4A6D92C9FC1CFE05C75F6F4A6D143E05EF16FF4E6E137E +6F197C05FF17FC6F91C86C5BA36F496F5BA24D816F61A26F496F5BA370486F5BA370486F +90CAFCA24D81041F5FA27048167C7A4C7ECA7F>I<ECFFFC010FEBFFC0017F14F090B612 +FC489038803FFE3B03FC0007FF80486C6D7F6D7F486D6C7F83167F83A2707E6C90C7FC6C +5A6C5AC9FCA5ED1FFF021FB5FC49B6FC130F013FEBC03F9038FFFE00000313F04813C048 +90C7FC485A485AA2485AA2485AA4167FA26D14FF007F15EF6D01017F6C6C903907CFFF80 +6C6CD90F8F13FE6C9038E07F076C9038FFFE0300014A7ED8003F9038F0007F0103018090 +C7FC37347CB23C>97 D<EB7FC0B5FCA512037EB3ED07FF037F13E002C1B512FC02C714FF +9126CFF80F7F9126DFC0017F02FFC77F4AEC3FF002F8814A6E7E717E4A81831980A37113 +C0A319E0AC19C0A35F1980A219005F606E141F6E5D4D5A6E4A5A02BF4A5A91261FC0035B +9027FE0FF01F5B496CB548C7FCD9F80114F8496C6C13E0C8D80FFEC8FC3B4D7CCB44>I< +91380FFF8091B512F8010314FF010F15804948C613C0D97FF8EB1FE0D9FFE0EB3FF04849 +137F4849EBFFF84890C7FCA2485A121FA24848EC7FF0EE3FE0EE1FC0007F92C7FC5BA212 +FFAC127FA27FA2123FA26C6C153EA26C6C157E177C6C6D14FC6C6D14F86C6D13036C6DEB +07F0D97FFCEB1FE06DB4EBFFC0010F90B5120001035C010014F0020F13802F347CB237> +I<EF1FF0EE3FFFA51600177FB3EC0FFF91B512E0010314F8010F14FC013FEB01FF903A7F +F8003FFFD9FFE0130F48497F48497F4890C77E48815B121F5B123FA2127F5BA312FFAC12 +7FA36C7EA3121F6D5C120F6C6C5C6C6D5B6C5D6C01E0013F7F6D6C49EBFFE090393FFE03 +FE6DB512F801075C0100148091261FFC00EBC0003B4D7CCB44>I<EC0FFF91B512F00103 +14FC010F14FF90263FFE077F90267FF0007F49486D7E4801806D7E486F7E4890C7120F48 +4881707E121F491403003F82A2127F5B701380A212FFA390B8FCA401F8CAFCA5127FA27F +A2123FA26C6CED0F80A26C6C151F6C17006E5C6C6D147E6C6D5C6C6D495AD93FFCEB07F0 +903A1FFF803FE0010790B55A010192C7FC6D6C13FC020713C031347DB238>I<ED7FF091 +3807FFFC023F7F4A7F902601FFE0138049018113C049484813E0EB0FFCEB1FF8A2EB3FF0 +A2017F6D13C04A6C1380EE7F00163E93C7FCACB77EA526007FF0C8FCB3B3A3003FB512F8 +A52B4D7DCC26>I<DA7FFCEB0FE00103B538807FF8010F9138E1FFFC013F02FB13FE903A +7FF01FFFF39026FFC007138348D90001130348168348486DEBC1FCEFC0F8000FEEE00049 +147F001F82A9000F5E6D14FF00075EA26C6C495B6C93C7FC6C9038C007FE9138F01FFC48 +90B55A01EF14E0D803C314809026C07FFCC8FC000790CAFCA47FA27F13FC90B612FCEEFF +C06C16F817FE6C8218806C17C06D16E00003B812F0120FD81FFCC7000F13F8D83FF01400 +49153F4848ED1FFC00FF160F491507A56D150F007F17F86D151F6C6CED3FF06C6CED7FE0 +D80FFE913801FFC06C6C6C010713806C01F8017F1300C690B612FC013F15F001071580D9 +003F01F0C7FC37497DB13D>I<EB7FC0B5FCA512037EB3923801FFC0030F13F8033F7F4B +13FFDBFE077F9138C1F0039126C3E0017FDAC78080ECCF0014DE02DC6D7F14FC5CA25CA3 +5CB3AAB6D8C07FEBFFE0A53B4C7BCB44>I<13FCEA03FF487F487FA2487FA66C5BA26C5B +6C90C7FCEA00FC90C8FCABEB7FC0B5FCA512037EB3B3A2B61280A5194D7BCC22>I<EB7F +C0B5FCA512037EB3A293383FFFFEA5040390C7FC17FC4C5AEE0FE0EE3FC04C5A4CC8FC4B +5AED03F8ED0FF04B5A4B5A4B5A4BC9FC14C302C77F02CF7F02DF7F91B5FC824A7F4A6C7E +ECF83F9138E01FFE02C07F6F7F816F7F836F7F81707E83707E161F707E84707F84B6D880 +3FEBFF80A5394C7CCB41>107 D<EB7FC0B5FCA512037EB3B3B3AAB61280A5194C7BCB22> +I<90287FC001FFC0EC7FF0B5010F01FC0103B5FC033F6D010F804B6D4980DBFE07902680 +3F817F9126C1F801903AC07E007FF00003D9C3E0DAE0F8806C9026C78000D9F1E06D7E02 +CFC7EBF3C002DEEDF780DD7FFF6E7E02FC93C7FC4A5DA24A5DA34A5DB3AAB6D8C03FB5D8 +F00FB512FCA55E327BB167>I<903A7FC001FFC0B5010F13F8033F7F4B13FFDBFE077F91 +38C1F00300039026C3E0017F6CD9C78080ECCF0014DE02DC6D7F14FC5CA25CA35CB3AAB6 +D8C07FEBFFE0A53B327BB144>I<913807FF80027F13F80103B6FC010F15C090261FFE01 +7F903A7FF0003FF849486D7E480180EB07FE4890C76C7E4817804980000F17C048486E13 +E0A2003F17F0A249157F007F17F8A400FF17FCAB007F17F8A46C6CEDFFF0A2001F17E0A2 +6C6C4A13C0A26C6C4A13806C6D4913006C5E6C01E0EB1FFC6D6C495A903A3FFE01FFF001 +0FB612C0010392C7FCD9007F13F80207138036347DB23D>I<90397FC007FFB5017F13E0 +02C1B512FC02C714FF9126CFF80F7F9126DFC0037F000301FFC77F6C496E7E02F8814A6E +7E717E4A81831980A28319C0A37113E0AC19C05FA319805F19005F606E143F6E5D4D5A6E +4A5A02FF495BDBC0075B9126EFF01F5B02E7B548C7FC02E114F8DAE07F13E0DB0FFEC8FC +92CAFCAFB612C0A53B477CB144>I<DA0FFE14F091B5EAC0010103ECF003010F14F8013F +903801FC0790397FFC007ED9FFF0EB1F0F4849EB0F9F4849EB07DF484914FF488191C7FC +48815B003F815B127F177FA25B12FFAC6C7EA3123F6D15FFA2001F5D7F6C5D6C6D5B6C7F +6C151F6C6D5BD97FF813FE90393FFE03FC6DB55A010714E00100148091381FFC0091C8FC +AF047FEBFFE0A53B477CB141>I<9039FF803FE0B5EBFFF8028113FE02837FDA87E11380 +EC8F830003D99F0713C06C139E14BCA214F8A24A6C13806F13006F5A4A90C7FCA45CB3A8 +B612E0A52A327CB132>I<903907FF8070017FEBF1F048B6FC1207380FFC01391FE0003F +4848130F491307127F90C71203A2481401A27FA27F01F090C7FC13FCEBFFC06C13FEECFF +E06C14FC6C806CECFF806C15C06C15E06C15F06C7E011F14F8010114FCEB000FEC007FED +1FFE0078140F00F8140715037E1501A27E16FC7E15036D14F86D13076D14F001F8EB1FE0 +01FFEBFFC04890B51280486C1400D8F81F13FCD8E00313C027347CB230>I<14F8A51301 +A41303A21307A2130FA2131F133F137F13FF1203000F90B512F0B7FCA426007FF8C7FCB3 +A7167CAA013F14F880A290391FFE01F0010F1303903907FF87E06DEBFFC06D14806D6C13 +00EC0FFC26467EC430>I<D97FE0EC3FF0B5EC7FFFA5000315016C81B3AC5EA25EA25E7E +6EEB0F7F017F021E7F6E017CEBFFE090393FFE01F86DB512F0010714E0010114C0902700 +3FFE00EBC0003B337BB144>I<B600C090387FFFF0A5C601F0C73803F8006E5D017F5E80 +1707013F5E6E140F011F5E6E141F6D93C7FC6F5B6D153E81177E6D157C6F13FC6D5DEDF0 +016D5DEDF803027F5CA2EDFC07023F5CEDFE0F021F5CEDFF1F6E91C8FC169F16BF6E13BE +16FE6E5BA26E5BA26E5BA36F5AA26F5AA26F5AA23C327EB041>I<B60081B500FC90387F +FFF0A500019026E0000390C73801FC006E6F5C6C6F5E6E6F1303017F61A26E6F1307013F +4A5E846E49150F011F616E6F131F6D4A93C7FC179F03806E5B6D021F153EEF0FFE6DD9C0 +3F5DEE3E0703E06E13FC6D027E5DEE7C0303F015816D4A6C5C03F815C3DA7FF95E4C7E03 +FD15E7DA3FFF5E4C137F19FF6E496D5BA26E94C8FC4C7FA26E5E93C7120FA26E486E5AA2 +02015E4B1403A26E486E5A54327EB059>I<B6D88007B512C0A526007FF8C7387F80006D +6C92C7FC6E14FE6D6C495A6D6D485A6D01C05B6D4A5A6F485A6DEBF01F6D6D485A6E6C48 +C8FC023F137E6F5A6E6C5A806E5B6E5BA26E7F6E7F6F7E15FF4A7F4A7F4A8003E77FEC0F +C3DA1F837FDA3F817F4AC67F02FE6D7E4948133F4A8049486D7E01076E7F49486D7F4948 +7F494881017F6E7FB500F8011FEBFFF0A53C317EB041>I<007FB500C090387FFFE0A5C6 +01F0C73803F8006E5D017F5E6E1407013F5E80170F011F5E6E141F6D93C7FC6F5B6D153E +6F137E6D157C6F13FCA26D6D5B16016D5DEDF803027F5CEDFC07023F5CEDFE0F021F5C15 +FF161F6E91C8FC16BF6E13BE16FE6E5BA26E5BA36E5BA26F5AA26F5AA26F5AA393C9FC5D +153E157E157CD81F8013FC486C5B387FE001D8FFF05B14035D14074A5A49485A007F133F +4948CAFC383F81FE381FFFF86C5B6C13C0C648CBFC3B477EB041>I E /Fl 1 59 df<120FEA3FC0EA7FE0EAFFF0A6EA7FE0EA3FC0EA0F000C0C768B21>58 D E /Fm 73 125 df<922601FFFC903801FFE0033F9026FF801F13F84AB6D8E07F13FE02 0F03F9B6FC023FD9C00FB500C0138091277FFC0003D9FE0113C0902601FFE049495A4949 @@ -2240,7 +2233,7 @@ end %%Page: 1 1 1 0 bop 1056 1884 a Ft(V)-16 b(ersion)65 b(Managemen)-5 b(t)1762 2172 y(with)1753 2421 y(CVS)1696 2795 y Fs(for)30 -b Fr(cvs)g Fs(1.9.4)1551 3293 y(P)m(er)h(Cederqvist)e(et)i(al)p +b Fr(cvs)g Fs(1.9.6)1551 3293 y(P)m(er)h(Cederqvist)e(et)i(al)p eop %%Page: 2 2 2 1 bop 0 3629 a Fs(Cop)m(yrigh)m(t)452 3626 y(c)427 @@ -2341,11 +2334,11 @@ Fn(-a)p Fs(')g(\015ag)g(\(release)h(1.15)g(and)f(later)g(are)g(OK\).)g Fr(r)n(cs)f Fs(and)h Fr(cvs)f Fs(to)i(handle)e(binary)g(\014les)g(when) h(y)m(ou)g(install)f(them.)480 1839 y(Keyw)m(ord)40 b(substitution)e (can)j(b)s(e)f(a)h(source)f(of)h(trouble)f(with)f(binary)f(\014les.)70 -b(See)41 b(Chapter)f(17)480 1964 y([Keyw)m(ord)30 b(substitution],)f -(page)i(77,)g(for)g(solutions.)0 2140 y(The)f Fn(admin)f +b(See)41 b(Chapter)f(16)480 1964 y([Keyw)m(ord)30 b(substitution],)f +(page)i(79,)g(for)g(solutions.)0 2140 y(The)f Fn(admin)f Fs(command)480 2265 y(Careless)j(use)g(of)g(the)h Fn(admin)e Fs(command)h(can)h(cause)g Fr(cvs)e Fs(to)i(cease)h(w)m(orking.)46 -b(See)33 b(Section)f(A.5)480 2389 y([admin],)e(page)h(95,)g(b)s(efore)f +b(See)33 b(Section)f(A.5)480 2389 y([admin],)e(page)h(97,)g(b)s(efore)f (trying)g(to)h(use)f(it.)0 2845 y Fm(Credits)125 3120 y Fs(Roland)e(P)m(esc)m(h,)i(then)f(of)g(Cygn)m(us)f(Supp)s(ort)f Fn(<roland@wrs.com>)e Fs(wrote)k(the)h(man)m(ual)e(pages)i(whic)m(h)d @@ -2527,8 +2520,8 @@ Fr(cvs)p Fs(.)480 4685 y(Figuring)c(out)i(what)g(\014les)f(need)h(to)g (e)f(of)h Fr(cvs)p Fs(.)54 b(One)35 b(traditional)e(approac)m(h)j(is)e (to)i(use)f Fn(make)f Fs(for)480 4934 y(building,)k(and)h(use)g(some)g (automated)i(to)s(ol)e(for)g(generating)h(the)g(dep)s(endencies)d(whic) -m(h)h Fn(make)480 5059 y Fs(uses.)480 5215 y(See)30 b(Chapter)g(19)h -([Builds],)e(page)i(83,)g(for)f(more)g(information)f(on)h(doing)f +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(in)i(conjunction)480 5340 y(with)g Fr(cvs)p Fs(.)p eop %%Page: 7 9 @@ -2633,142 +2626,51 @@ 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 (hanges)h(o)m(v)m(er)h(to)f(a)g(stable)f(tree)h(only)f(once)h(they)f (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(Basic)31 b(concepts)2810 -b(9)0 366 y Fp(2)80 b(Basic)31 b(concepts)125 1062 y -Fr(cvs)e Fs(stores)i(all)e(\014les)g(in)g(a)i(cen)m(tralized)g -Fo(rep)s(ository)37 b Fs(\(see)31 b(Chapter)f(4)g([Rep)s(ository],)h -(page)g(15\).)125 1401 y(The)g(rep)s(ository)g(con)m(tains)h -(directories)f(and)h(\014les,)f(in)g(an)h(arbitrary)f(tree.)46 -b(The)32 b Fo(mo)s(dules)i Fs(feature)e(can)h(b)s(e)0 -1525 y(used)h(to)h(group)e(together)j(a)f(set)g(of)f(directories)f(or)i -(\014les)e(in)m(to)h(a)h(single)e(en)m(tit)m(y)i(\(see)g(Section)f(C.1) -h([mo)s(dules],)0 1650 y(page)c(137\).)42 b(A)31 b(t)m(ypical)f(usage)h -(is)e(to)i(de\014ne)f(one)h(mo)s(dule)d(p)s(er)i(pro)5 -b(ject.)0 2679 y Fm(2.1)68 b(Revision)32 b(n)l(um)l(b)t(ers)125 -3017 y Fs(Eac)m(h)37 b(v)m(ersion)f(of)h(a)h(\014le)e(has)g(a)h(unique) -e Fo(revision)g(n)m(um)m(b)s(er)p Fs(.)59 b(Revision)36 -b(n)m(um)m(b)s(ers)f(lo)s(ok)i(lik)m(e)f(`)p Fn(1.1)p -Fs(',)i(`)p Fn(1.2)p Fs(',)0 3142 y(`)p Fn(1.3.2.2)p -Fs(')19 b(or)h(ev)m(en)h(`)p Fn(1.3.2.2.4.5)p Fs('.)35 -b(A)20 b(revision)f(n)m(um)m(b)s(er)g(alw)m(a)m(ys)i(has)f(an)g(ev)m -(en)h(n)m(um)m(b)s(er)e(of)h(p)s(erio)s(d-separated)0 -3266 y(decimal)34 b(in)m(tegers.)53 b(By)35 b(default)f(revision)f(1.1) -j(is)e(the)g(\014rst)g(revision)f(of)i(a)g(\014le.)53 -b(Eac)m(h)35 b(successiv)m(e)g(revision)e(is)0 3391 y(giv)m(en)i(a)g -(new)f(n)m(um)m(b)s(er)g(b)m(y)h(increasing)e(the)i(righ)m(tmost)g(n)m -(um)m(b)s(er)f(b)m(y)g(one.)55 b(The)34 b(follo)m(wing)f(\014gure)i -(displa)m(ys)e(a)0 3515 y(few)d(revisions,)f(with)g(new)m(er)h -(revisions)f(to)i(the)f(righ)m(t.)574 3833 y Fn(+-----+)189 -b(+-----+)g(+-----+)g(+-----+)g(+-----+)574 3937 y(!)48 -b(1.1)e(!----!)h(1.2)f(!----!)h(1.3)f(!----!)h(1.4)f(!----!)h(1.5)f(!) -574 4040 y(+-----+)189 b(+-----+)g(+-----+)g(+-----+)g(+-----+)125 -4379 y Fr(cvs)34 b Fs(is)g(not)h(limited)e(to)j(linear)e(dev)m(elopmen) -m(t.)55 b(The)35 b Fo(revision)f(tree)41 b Fs(can)35 -b(b)s(e)g(split)e(in)m(to)i Fo(branc)m(hes)p Fs(,)h(where)0 -4503 y(eac)m(h)e(branc)m(h)f(is)f(a)h(self-main)m(tained)f(line)f(of)j -(dev)m(elopmen)m(t.)49 b(Changes)33 b(made)g(on)g(one)g(branc)m(h)g -(can)g(easily)g(b)s(e)0 4628 y(mo)m(v)m(ed)e(bac)m(k)g(to)h(the)e(main) -f(trunk.)125 4966 y(Eac)m(h)38 b(branc)m(h)e(has)i(a)g -Fo(branc)m(h)e(n)m(um)m(b)s(er)p Fs(,)j(consisting)d(of)h(an)h(o)s(dd)e -(n)m(um)m(b)s(er)g(of)i(p)s(erio)s(d-separated)e(decimal)0 -5091 y(in)m(tegers.)41 b(The)28 b(branc)m(h)g(n)m(um)m(b)s(er)g(is)g -(created)i(b)m(y)f(app)s(ending)d(an)j(in)m(teger)h(to)f(the)g -(revision)f(n)m(um)m(b)s(er)f(where)i(the)0 5215 y(corresp)s(onding)24 -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: 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)125 589 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 -714 y(branc)m(h)h(n)m(um)m(b)s(er.)39 b(The)30 b(follo)m(wing)f -(\014gure)h(illustrates)e(branc)m(hing)h(with)g(an)h(example.)2770 -967 y Fn(+-------------+)1481 1071 y(Branch)46 b(1.2.2.3.2)f(->)382 -b(!)47 b(1.2.2.3.2.1)e(!)2674 1175 y(/)j(+-------------+)2626 -1279 y(/)2579 1382 y(/)1051 1486 y(+---------+)188 b(+---------+)g -(+---------+)g(+---------+)240 1590 y(Branch)46 b(1.2.2)g(->)i(_!)f -(1.2.2.1)f(!----!)g(1.2.2.2)g(!----!)g(1.2.2.3)f(!----!)i(1.2.2.4)e(!) -956 1694 y(/)i(+---------+)188 b(+---------+)g(+---------+)g -(+---------+)908 1797 y(/)860 1901 y(/)240 2005 y(+-----+)h(+-----+)g -(+-----+)g(+-----+)g(+-----+)240 2109 y(!)47 b(1.1)g(!----!)f(1.2)h -(!----!)f(1.3)h(!----!)f(1.4)h(!----!)f(1.5)h(!)286 b(<-)48 -b(The)f(main)f(trunk)240 2213 y(+-----+)189 b(+-----+)g(+-----+)g -(+-----+)g(+-----+)1004 2316 y(!)1004 2420 y(!)1004 2524 -y(!)143 b(+---------+)187 b(+---------+)h(+---------+)240 -2628 y(Branch)46 b(1.2.4)g(->)i(+---!)e(1.2.4.1)g(!----!)g(1.2.4.2)g -(!----!)g(1.2.4.3)g(!)1195 2731 y(+---------+)187 b(+---------+)h -(+---------+)125 3088 y Fs(The)28 b(exact)i(details)d(of)i(ho)m(w)g -(the)g(branc)m(h)f(n)m(um)m(b)s(er)f(is)h(constructed)h(is)e(not)i -(something)f(y)m(ou)h(normally)e(need)0 3213 y(to)32 -b(b)s(e)f(concerned)h(ab)s(out,)g(but)f(here)g(is)g(ho)m(w)g(it)g(w)m -(orks:)44 b(When)31 b Fr(cvs)f Fs(creates)j(a)f(branc)m(h)f(n)m(um)m(b) -s(er)g(it)g(pic)m(ks)g(the)0 3337 y(\014rst)26 b(un)m(used)g(ev)m(en)i -(in)m(teger,)g(starting)f(with)f(2.)40 b(So)27 b(when)f(y)m(ou)i(w)m -(an)m(t)g(to)g(create)g(a)g(branc)m(h)e(from)h(revision)e(6.4)j(it)0 -3462 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 -3587 y Fr(cvs)i Fs(\(see)i(Section)f(E.1)g([Magic)h(branc)m(h)f(n)m(um) -m(b)s(ers],)f(page)i(155\).)42 b(The)29 b(branc)m(h)h(1.1.1)i(has)d(a)i -(sp)s(ecial)d(meaning.)0 3711 y(See)j(Chapter)e(13)j([T)-8 -b(rac)m(king)30 b(sources],)h(page)g(65.)0 4159 y Fm(2.2)68 -b(V)-11 b(ersions,)31 b(revisions)g(and)f(releases)125 -4433 y Fs(A)40 b(\014le)g(can)h(ha)m(v)m(e)h(sev)m(eral)f(v)m(ersions,) -h(as)f(describ)s(ed)e(ab)s(o)m(v)m(e.)72 b(Lik)m(ewise,)42 -b(a)f(soft)m(w)m(are)h(pro)s(duct)e(can)h(ha)m(v)m(e)0 -4558 y(sev)m(eral)31 b(v)m(ersions.)40 b(A)30 b(soft)m(w)m(are)i(pro)s -(duct)d(is)h(often)g(giv)m(en)h(a)g(v)m(ersion)e(n)m(um)m(b)s(er)g(suc) -m(h)i(as)f(`)p Fn(4.1.1)p Fs('.)125 4832 y(V)-8 b(ersions)25 -b(in)h(the)g(\014rst)g(sense)g(are)h(called)f Fo(revisions)i -Fs(in)d(this)h(do)s(cumen)m(t,)h(and)f(v)m(ersions)g(in)f(the)h(second) -h(sense)0 4956 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: 11 13 -11 12 bop 0 -116 a Fs(Chapter)30 b(3:)41 b(A)30 b(sample)g(session)2672 -b(11)0 366 y Fp(3)80 b(A)31 b(sample)f(session)125 755 -y Fs(This)g(section)j(describ)s(es)e(a)j(t)m(ypical)e(w)m(ork-session)g -(using)g Fr(cvs)p Fs(.)46 b(It)33 b(assumes)g(that)g(a)g(rep)s(ository) -f(is)g(set)h(up)0 880 y(\(see)e(Chapter)f(4)h([Rep)s(ository],)f(page)h -(15\).)125 1157 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 1281 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 1406 y(there)e(is)e(a)i(mo)s(dule)d -(called)i(`)p Fn(tc)p Fs('.)0 1881 y Fm(3.1)68 b(Getting)31 -b(the)g(source)125 2158 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 2282 y(use)j(the)h Fn(checkout)d -Fs(command:)240 2539 y Fn($)47 b(cvs)g(checkout)f(tc)0 -2816 y Fs(This)29 b(will)e(create)32 b(a)f(new)f(directory)g(called)f +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 +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 +(\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 +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 +(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 +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) +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 (`)p Fn(tc)p Fs(')i(and)e(p)s(opulate)h(it)f(with)h(the)g(source)h -(\014les.)240 3072 y Fn($)47 b(cd)h(tc)240 3176 y($)f(ls)240 -3279 y(CVS)429 b(Makefile)188 b(backend.c)141 b(driver.c)189 -b(frontend.c)93 b(parser.c)125 3556 y Fs(The)30 b(`)p +(\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 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 3681 y(of)e(the)f(\014les)f(in)g -(it.)125 3958 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 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 (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 -4082 y(added)24 b(an)g(optimization)f(pass)h(to)h(the)f(compiler.)38 +4125 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 4207 +b(There)23 b(is)h(no)g(need)g(to)h(lo)s(c)m(k)0 4249 y(the)31 b(\014les)e(that)i(y)m(ou)g(w)m(an)m(t)g(to)g(edit.)40 -b(See)31 b(Chapter)e(6)i([Multiple)e(dev)m(elop)s(ers],)h(page)h(35,)g -(for)g(an)f(explanation.)0 4682 y Fm(3.2)68 b(Committing)32 -b(y)l(our)f(c)l(hanges)125 4959 y Fs(When)f(y)m(ou)i(ha)m(v)m(e)g(c)m +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 (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 -5084 y(of)h(`)p Fn(backend.c)p Fs('.)240 5340 y Fn($)47 +5087 y(of)h(`)p Fn(backend.c)p Fs('.)240 5340 y Fn($)47 b(cvs)g(commit)f(backend.c)p eop -%%Page: 12 14 -12 13 bop 0 -116 a Fs(12)2411 b(CVS|Concurren)m(t)29 +%%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 @@ -2785,14 +2687,14 @@ 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(3.3)68 b(Cleaning)32 b(up)125 +(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 (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 Fn(release)f Fs(command)h(\(see)h(Section)f(A.14)i([release],)g(page)f -(116\):)240 3248 y Fn($)47 b(cd)h(..)240 3352 y($)f(cvs)g(release)f(-d) +(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\)) @@ -2815,12 +2717,12 @@ b(`)p Fn(tc)p Fs(')22 b(is)g(the)g(executable)h(compiler,)0 (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(117,)j(for)c(a)0 +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 -%%Page: 13 15 -13 14 bop 0 -116 a Fs(Chapter)30 b(3:)41 b(A)30 b(sample)g(session)2672 -b(13)125 366 y(`)p Fn(M)30 b(driver.c)p Fs(')g(is)i(more)g(serious.)46 +%%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 @@ -2831,7 +2733,7 @@ m(our)0 890 y(w)m(orking)g(cop)m(y)h(of)f(the)h(sources,)g(and)f(then)g (\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(3.4)68 b(Viewing)31 +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 @@ -2852,12 +2754,12 @@ 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 -%%Page: 14 16 -14 15 bop 0 -116 a Fs(14)2411 b(CVS|Concurren)m(t)29 +%%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 -%%Page: 15 17 -15 16 bop 0 -116 a Fs(Chapter)30 b(4:)41 b(The)30 b(Rep)s(ository)2725 -b(15)0 366 y Fp(4)80 b(The)30 b(Rep)t(ository)125 743 +%%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 y Fs(The)23 b Fr(cvs)h Fo(rep)s(ository)31 b Fs(stores)25 b(a)g(complete)g(cop)m(y)g(of)f(all)g(the)g(\014les)f(and)h (directories)g(whic)m(h)f(are)i(under)d(v)m(ersion)0 @@ -2888,7 +2790,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(4.6)g([Remote)h(rep)s(ositories],)d(page)i(21.)125 +(see)h(Section)g(3.6)g([Remote)h(rep)s(ositories],)d(page)i(19.)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 @@ -2906,7 +2808,7 @@ Fs(.)125 3585 y(The)i(rep)s(ository)f(is)h(split)f(in)g(t)m(w)m(o)j (parts.)44 b(`)p Fn($CVSROOT/CVSROOT)p Fs(')28 b(con)m(tains)k (administrativ)m(e)e(\014les)g(for)i Fr(cvs)p Fs(.)0 3710 y(The)e(other)g(directories)g(con)m(tain)h(the)f(actual)h -(user-de\014ned)e(mo)s(dules.)0 4163 y Fm(4.1)68 b(T)-11 +(user-de\014ned)e(mo)s(dules.)0 4163 y Fm(3.1)68 b(T)-11 b(elling)31 b(CVS)f(where)h(y)l(our)f(rep)t(ository)h(is)125 4438 y Fs(There)d(are)i(a)f(couple)g(of)g(di\013eren)m(t)f(w)m(a)m(ys)i (to)g(tell)f Fr(cvs)f Fs(where)g(to)i(\014nd)e(the)h(rep)s(ository)-8 @@ -2922,8 +2824,8 @@ b(T)-8 b(o)26 b(set)f Fn($CVSROOT)p Fs(,)g(all)f Fn(csh)h Fs(and)f Fn(tcsh)g Fs(users)h(should)0 5340 y(ha)m(v)m(e)32 b(this)d(line)g(in)g(their)g(`)p Fn(.cshrc)p Fs(')g(or)i(`)p Fn(.tcshrc)p Fs(')d(\014les:)p eop -%%Page: 16 18 -16 17 bop 0 -116 a Fs(16)2411 b(CVS|Concurren)m(t)29 +%%Page: 14 16 +14 15 bop 0 -116 a Fs(14)2411 b(CVS|Concurren)m(t)29 b(V)-8 b(ersions)30 b(System)240 366 y Fn(setenv)46 b(CVSROOT)g (/usr/local/cvsroot)0 643 y(sh)30 b Fs(and)g Fn(bash)f Fs(users)g(should)g(instead)g(ha)m(v)m(e)j(these)f(lines)d(in)h(their)h @@ -2945,7 +2847,7 @@ b(ariable.)69 b(If)0 1930 y Fn(-d)33 b Fs(option)h(di\013ers)e(from)h Fs(')e(to)0 2054 y(b)s(e)37 b(up)s(dated\).)62 b(Of)38 b(course,)i(for)d(prop)s(er)g(op)s(eration)g(they)h(should)e(b)s(e)h(t) m(w)m(o)i(w)m(a)m(ys)g(of)f(referring)e(to)j(the)f(same)0 -2179 y(rep)s(ository)-8 b(.)0 2652 y Fm(4.2)68 b(Ho)l(w)31 +2179 y(rep)s(ository)-8 b(.)0 2652 y Fm(3.2)68 b(Ho)l(w)31 b(data)g(is)g(stored)g(in)f(the)h(rep)t(ository)125 2929 y Fs(F)-8 b(or)30 b(most)h(purp)s(oses)d(it)h(isn't)g(imp)s(ortan)m(t)g Fo(ho)m(w)38 b Fr(cvs)29 b Fs(stores)h(information)f(in)f(the)i(rep)s @@ -2958,11 +2860,11 @@ Fs(commands;)h(suc)m(h)h(c)m(hanges)g(need)f(not)h(b)s(e)e(disruptiv)m s(e)e(necessary)i(to)g(understand)e(ho)m(w)h Fr(cvs)f Fs(stores)i(data)g(in)e(the)h(rep)s(ository)-8 b(,)0 3579 y(for)34 b(example)g(y)m(ou)h(migh)m(t)f(need)g(to)h(trac)m(k)h -(do)m(wn)e Fr(cvs)f Fs(lo)s(c)m(ks)h(\(see)i(Section)e(6.5)h -([Concurrency],)g(page)g(40\))h(or)0 3703 y(y)m(ou)31 +(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 b(migh)m(t)f(need)g(to)h(deal)f(with)f(the)i(\014le)e(p)s(ermissions)e (appropriate)j(for)g(the)g(rep)s(ository)-8 b(.)0 4143 -y Fk(4.2.1)63 b(Where)30 b(\014les)h(are)f(stored)h(within)f(the)h(rep) +y Fk(3.2.1)63 b(Where)30 b(\014les)h(are)f(stored)h(within)f(the)h(rep) s(ository)125 4420 y Fs(The)c(o)m(v)m(erall)g(structure)g(of)h(the)g (rep)s(ository)e(is)h(a)g(directory)g(tree)i(corresp)s(onding)c(to)j (the)g(directories)f(in)f(the)0 4544 y(w)m(orking)36 @@ -2972,9 +2874,9 @@ Fs(',)f(here)j(is)f(a)0 4669 y(p)s(ossible)28 b(directory)i(tree)h (\(sho)m(wing)f(only)f(the)i(directories\):)240 4925 y Fn(/usr)288 5029 y(|)288 5132 y(+--local)288 5236 y(|)143 b(|)288 5340 y(|)g(+--cvsroot)p eop -%%Page: 17 19 -17 18 bop 0 -116 a Fs(Chapter)30 b(4:)41 b(The)30 b(Rep)s(ository)2725 -b(17)288 366 y Fn(|)143 b(|)190 b(|)288 470 y(|)143 b(|)190 +%%Page: 15 17 +15 16 bop 0 -116 a Fs(Chapter)30 b(3:)41 b(The)30 b(Rep)s(ository)2725 +b(15)288 366 y Fn(|)143 b(|)190 b(|)288 470 y(|)143 b(|)190 b(+--CVSROOT)717 574 y(|)286 b(\(administrative)44 b(files\))717 678 y(|)717 782 y(+--gnu)717 885 y(|)143 b(|)717 989 y(|)g(+--diff)717 1093 y(|)g(|)g(\(source)46 b(code)h(to)g @@ -3000,8 +2902,8 @@ y(+--driver.c,v)813 4510 y(+--frontend.c,v)813 4614 y(+--parser.c,v)813 4717 y(+--man)813 4821 y(|)190 b(|)813 4925 y(|)g(+--tc.1,v)813 5029 y(|)813 5132 y(+--testing)1051 5236 y(|)1051 5340 y(+--testpgm.t,v)p eop -%%Page: 18 20 -18 19 bop 0 -116 a Fs(18)2411 b(CVS|Concurren)m(t)29 +%%Page: 16 18 +16 17 bop 0 -116 a Fs(16)2411 b(CVS|Concurren)m(t)29 b(V)-8 b(ersions)30 b(System)1051 366 y Fn(+--test2.t,v)125 650 y Fs(The)36 b(history)f(\014les)g(con)m(tain,)k(among)e(other)g (things,)g(enough)f(information)f(to)i(recreate)h(an)m(y)f(revision)e @@ -3025,8 +2927,8 @@ Fs(\014les)g(used)g(in)g Fr(cvs)g Fs(di\013er)g(in)f(a)j(few)e(w)m(a)m (ers],)g(page)i(155.)51 b(Also)0 1805 y(in)27 b Fr(cvs)h Fs(the)h(v)-5 b(alid)27 b(tag)j(names)f(are)g(a)g(subset)g(of)f(what)h Fr(r)n(cs)f Fs(accepts;)j(for)d Fr(cvs)p Fs('s)g(rules)g(see)h(Section) -g(7.1)g([T)-8 b(ags],)0 1929 y(page)31 b(47.)0 2429 y -Fk(4.2.2)63 b(File)30 b(p)s(ermissions)125 2712 y Fs(All)25 +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 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 @@ -3043,7 +2945,7 @@ b(.)125 3494 y(This)28 b(means)i(that)h(y)m(ou)g(can)g(only)e(con)m 3777 y(Note)h(that)g(users)f(m)m(ust)g(also)g(ha)m(v)m(e)i(write)d (access)j(to)f(c)m(hec)m(k)h(out)f(\014les,)e(b)s(ecause)i Fr(cvs)e Fs(needs)h(to)h(create)h(lo)s(c)m(k)0 3902 y(\014les)e(\(see)j -(Section)e(6.5)h([Concurrency],)f(page)i(40\).)125 4185 +(Section)e(5.5)h([Concurrency],)f(page)i(38\).)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 @@ -3066,15 +2968,15 @@ b Fs(do)s(es)0 5215 y(not)g(a\013ect)i(the)e(\014le)g(p)s(ermissions)d (newly)f(created)j(\014les,)e(except)h(that)g(sometimes)f Fr(cvs)g Fs(creates)i(them)e(read-only)g(\(see)h(the)g(sections)p eop -%%Page: 19 21 -19 20 bop 0 -116 a Fs(Chapter)30 b(4:)41 b(The)30 b(Rep)s(ository)2725 -b(19)0 366 y(on)33 b(w)m(atc)m(hes,)j(Section)d(6.6.1)i([Setting)e(a)h -(w)m(atc)m(h],)i(page)e(42;)h(-r,)g(Section)e(A.3)h([Global)e -(options],)i(page)g(91;)i(or)0 491 y(CVSREAD,)30 b(App)s(endix)e(D)j +%%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(4.6)i([Remote)g(rep)s(ositories],)e(page) -h(21\),)h(there)f(is)0 928 y(no)26 b(go)s(o)s(d)h(w)m(a)m(y)g(to)h(set) +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) 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 @@ -3088,7 +2990,7 @@ y(setting)c(of)h Fn(CVSUMASK)d Fs(on)i(the)h(clien)m(t)f(ha)m(ving)g (to)h(b)s(e)f(run)f(setuid,)g(it)h(is)f(unsafe)h(to)h(try)f(to)h(run)e (it)h(setuid.)39 b(Y)-8 b(ou)31 b(cannot)g(use)0 1738 y(the)g(setuid)e(features)h(of)h Fr(r)n(cs)e Fs(together)j(with)d -Fr(cvs)p Fs(.)0 2533 y Fm(4.3)68 b(The)30 b(administrativ)l(e)j +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 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 @@ -3116,9 +3018,9 @@ b(The)32 b(directory)g(is)f(a)i(path)f(relativ)m(e)0 (explained)d(here.)40 b(See)0 5340 y(Section)30 b(C.1)h([mo)s(dules],)e (page)i(137,)h(for)e(a)h(full)d(explanation)i(of)g(all)f(the)i(a)m(v)-5 b(ailable)30 b(features.)p eop -%%Page: 20 22 -20 21 bop 0 -116 a Fs(20)2411 b(CVS|Concurren)m(t)29 -b(V)-8 b(ersions)30 b(System)0 366 y Fk(4.3.1)63 b(Editing)30 +%%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 @@ -3131,7 +3033,7 @@ 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(4.4)68 b(Multiple)31 b(rep)t(ositories)125 +1892 y Fm(3.4)68 b(Multiple)31 b(rep)t(ositories)125 2168 y Fs(In)44 b(some)h(situations)f(it)h(is)f(a)h(go)s(o)s(d)g(idea)g (to)h(ha)m(v)m(e)g(more)f(than)g(one)h(rep)s(ository)-8 b(,)48 b(for)d(instance)g(if)f(y)m(ou)0 2293 y(ha)m(v)m(e)37 @@ -3146,8 +3048,8 @@ b(the)f(`)p Fn(-d)p Fs(')h(option)f(to)i Fr(cvs)p Fs(,)e(or)h(\(once)h (directory\))0 2666 y(b)m(y)c(simply)d(allo)m(wing)h Fr(cvs)h Fs(to)h(use)g(the)g(rep)s(ository)e(that)i(w)m(as)g(used)f(to) i(c)m(hec)m(k)g(out)f(the)g(w)m(orking)f(directory)g(\(see)0 -2791 y(Section)j(4.1)i([Sp)s(ecifying)c(a)j(rep)s(ository],)e(page)i -(15\).)125 3068 y(The)k(big)f(adv)-5 b(an)m(tage)38 b(of)e(ha)m(ving)f +2791 y(Section)j(3.1)i([Sp)s(ecifying)c(a)j(rep)s(ository],)e(page)i +(13\).)125 3068 y(The)k(big)f(adv)-5 b(an)m(tage)38 b(of)e(ha)m(ving)f (m)m(ultiple)e(rep)s(ositories)i(is)f(that)i(they)g(can)g(reside)f(on)g (di\013eren)m(t)h(serv)m(ers.)0 3192 y(The)28 b(big)f(disadv)-5 b(an)m(tage)28 b(is)f(that)i(y)m(ou)f(cannot)h(ha)m(v)m(e)g(a)g(single) @@ -3159,7 +3061,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(4.5)68 b(Creating)32 b(a)f(rep)t(ository) +(rep)s(ositories.)0 4316 y Fm(3.5)68 b(Creating)32 b(a)f(rep)t(ository) 125 4593 y Fs(T)-8 b(o)34 b(set)h(up)e(a)h Fr(cvs)f Fs(rep)s(ository)-8 b(,)35 b(\014rst)e(c)m(ho)s(ose)i(the)f(mac)m(hine)g(and)g(disk)e(on)i (whic)m(h)f(y)m(ou)h(w)m(an)m(t)h(to)g(store)g(the)0 @@ -3178,9 +3080,9 @@ 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: 21 23 -21 22 bop 0 -116 a Fs(Chapter)30 b(4:)41 b(The)30 b(Rep)s(ository)2725 -b(21)0 366 y(On)25 b(the)i(mac)m(hines)f(on)g(whic)m(h)f(the)i(dev)m +%%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 @@ -3199,12 +3101,12 @@ 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 (to)j(use)f Fr(cvs)f Fs(to)i(read)f(from)g(a)g(rep)s(ository)g(whic)m (h)f(one)0 1394 y(only)35 b(has)h(read)g(access)h(to;)j Fr(cvs)35 b Fs(needs)g(to)i(b)s(e)f(able)f(to)i(create)g(lo)s(c)m(k)f -(\014les)f(\(see)i(Section)f(6.5)h([Concurrency],)0 1518 -y(page)31 b(40\).)125 1798 y(T)-8 b(o)34 b(create)i(a)f(rep)s(ository) +(\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 1923 y Fr(cvs)c Fs(ro)s(ot)i(sp)s(eci\014ed)e(in)g(the)h(usual)f(w)m(a) -m(y)j(\(see)f(Chapter)f(4)g([Rep)s(ository],)h(page)g(15\).)42 +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 (/usr/local/cvsroot)c(init)125 2462 y(cvs)29 b(init)h Fs(is)f(careful)h(to)i(nev)m(er)f(o)m(v)m(erwrite)g(an)m(y)g(existing)e @@ -3215,7 +3117,7 @@ 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(4.6)68 b(Remote)32 b(rep)t(ositories)125 3774 +3494 y Fm(3.6)68 b(Remote)32 b(rep)t(ositories)125 3774 y Fs(Y)-8 b(our)29 b(w)m(orking)f(cop)m(y)i(of)g(the)f(sources)g(can)h (b)s(e)e(on)h(a)h(di\013eren)m(t)f(mac)m(hine)f(than)h(the)h(rep)s (ository)-8 b(.)40 b(Using)28 b Fr(cvs)0 3898 y Fs(in)k(this)g(manner)g @@ -3236,11 +3138,11 @@ 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(4.6.2)h([Connecting) -e(via)h(rsh],)0 5340 y(page)31 b(22.)p eop -%%Page: 22 24 -22 23 bop 0 -116 a Fs(22)2411 b(CVS|Concurren)m(t)29 -b(V)-8 b(ersions)30 b(System)0 366 y Fk(4.6.1)63 b(Serv)m(er)30 +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 @@ -3269,7 +3171,7 @@ b(.)125 2483 y(Resource)40 b(consumption)f(for)h(the)h(clien)m(t)f(or)g (the)g(non-clien)m(t/serv)m(er)h Fr(cvs)e Fs(is)g(ev)m(en)i(more)g(mo)s (dest|an)m(y)0 2608 y(mac)m(hine)30 b(with)f(enough)h(capacit)m(y)i(to) f(run)e(the)h(op)s(erating)g(system)h(in)e(question)g(should)g(ha)m(v)m -(e)i(little)f(trouble.)0 3078 y Fk(4.6.2)63 b(Connecting)30 +(e)i(little)f(trouble.)0 3078 y Fk(3.6.2)63 b(Connecting)30 b(with)g(rsh)125 3358 y Fs(CVS)e(uses)g(the)h(`)p Fn(rsh)p Fs(')f(proto)s(col)h(to)h(p)s(erform)d(these)i(op)s(erations,)g(so)g (the)g(remote)h(user)e(host)h(needs)f(to)i(ha)m(v)m(e)0 @@ -3294,9 +3196,9 @@ 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: 23 25 -23 24 bop 0 -116 a Fs(Chapter)30 b(4:)41 b(The)30 b(Rep)s(ository)2725 -b(23)0 366 y(`)p Fn(.profile)p Fs('.)48 b(Alternately)-8 +%%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 @@ -3338,7 +3240,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(4.6.3)63 b(Direct)29 +(and)f(remote)j(hosts.\))0 3615 y Fk(3.6.3)63 b(Direct)29 b(connection)i(with)f(passw)m(ord)h(authen)m(tication)125 3889 y Fs(The)k Fr(cvs)f Fs(clien)m(t)h(can)h(also)g(connect)g(to)h (the)f(serv)m(er)g(using)e(a)i(passw)m(ord)f(proto)s(col.)56 @@ -3348,7 +3250,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(4.6.3.1)63 b(Setting)31 b(up)f(the)h(serv)m +4537 y(sides.)0 4941 y Fk(3.6.3.1)63 b(Setting)31 b(up)f(the)h(serv)m (er)f(for)g(passw)m(ord)h(authen)m(tication)125 5215 y Fs(On)j(the)i(serv)m(er)g(side,)f(the)h(\014le)f(`)p Fn(/etc/inetd.conf)p Fs(')d(needs)j(to)h(b)s(e)f(edited)f(so)i @@ -3356,8 +3258,8 @@ Fn(inetd)e Fs(kno)m(ws)i(to)g(run)e(the)0 5340 y(command)22 b Fn(cvs)30 b(pserver)20 b Fs(when)h(it)h(receiv)m(es)h(a)g(connection) g(on)f(the)g(righ)m(t)g(p)s(ort.)38 b(By)23 b(default,)g(the)f(p)s(ort) g(n)m(um)m(b)s(er)p eop -%%Page: 24 26 -24 25 bop 0 -116 a Fs(24)2411 b(CVS|Concurren)m(t)29 +%%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 @@ -3383,14 +3285,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 -(4.6.3.3)0 3419 y([P)m(assw)m(ord)27 b(authen)m(tication)h(securit)m -(y],)f(page)h(26,)h(for)e(details\),)g(a)g(separate)h +(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 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(4.3)h([In)m(tro)g(administrativ)m(e)e -(\014les],)i(page)g(19\).)63 b(Its)37 b(format)h(is)0 +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 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 @@ -3413,9 +3315,9 @@ 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: 25 27 -25 26 bop 0 -116 a Fs(Chapter)30 b(4:)41 b(The)30 b(Rep)s(ository)2725 -b(25)0 366 y(this)34 b(w)m(a)m(y)j Fr(cvs)d Fs(allo)m(ws)h(imaginary)f +%%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 @@ -3446,10 +3348,10 @@ b(And)25 b(as)0 2923 y(the)31 b(example)f(ab)s(o)m(v)m(e)h(indicates,)f (on)m(to)j(a)f(single)e(system)0 3048 y(username.)125 3327 y(This)f(feature)j(is)e(designed)g(to)i(allo)m(w)f(p)s(eople)f (rep)s(ository)h(access)h(without)f(full)e(system)i(access)i(\(in)d -(partic-)0 3451 y(ular,)i(see)i(See)f(Section)f(4.7)i([Read-only)f -(access],)i(page)f(28\);)h(ho)m(w)m(ev)m(er,)g(also)d(See)i(Section)e -(4.6.3.3)k([P)m(assw)m(ord)0 3576 y(authen)m(tication)42 -b(securit)m(y],)i(page)e(26.)74 b(An)m(y)42 b(sort)f(of)h(rep)s +(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 (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 @@ -3457,7 +3359,7 @@ b(securit)m(y],)i(page)e(26.)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(4.6.3.2)63 b(Using)32 b(the)e(clien)m(t)f(with)h(passw)m(ord) +4563 y Fk(3.6.3.2)63 b(Using)32 b(the)e(clien)m(t)f(with)h(passw)m(ord) h(authen)m(tication)125 4842 y Fs(Before)i(connecting)f(to)h(the)g (serv)m(er,)g(the)f(clien)m(t)g(m)m(ust)g Fo(log)h(in)e Fs(with)g(the)h(command)g Fn(cvs)e(login)p Fs(.)45 b(Logging)0 @@ -3469,8 +3371,8 @@ 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: 26 28 -26 27 bop 0 -116 a Fs(26)2411 b(CVS|Concurren)m(t)29 +%%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 @@ -3487,7 +3389,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(4.6.2)h([Connecting)f(via)f(rsh],)h(page)h(22\).)49 +(\(see)h(Section)f(3.6.2)h([Connecting)f(via)f(rsh],)h(page)h(20\).)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 @@ -3516,7 +3418,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(4.6.3.3)63 b(Securit)m(y)30 b(considerations)h(with)f(passw)m +4676 y Fk(3.6.3.3)63 b(Securit)m(y)30 b(considerations)h(with)f(passw)m (ord)h(authen)m(tication)125 4966 y Fs(The)22 b(passw)m(ords)h(are)g (stored)h(on)f(the)g(clien)m(t)g(side)f(in)g(a)i(trivial)d(enco)s(ding) h(of)i(the)f(cleartext,)j(and)d(transmitted)0 5091 y(in)36 @@ -3526,11 +3428,11 @@ 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: 27 29 -27 28 bop 0 -116 a Fs(Chapter)30 b(4:)41 b(The)30 b(Rep)s(ository)2725 -b(27)125 366 y(The)32 b(separate)j Fr(cvs)d Fs(passw)m(ord)h(\014le)g -(\(see)h(Section)f(4.6.3.1)j([P)m(assw)m(ord)e(authen)m(tication)g -(serv)m(er],)h(page)f(23\))0 491 y(allo)m(ws)d(p)s(eople)f(to)i(use)f +%%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 @@ -3552,7 +3454,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(4.6.4)63 b(Direct)29 +b(,)30 b(get)i(Kerb)s(eros.)0 2284 y Fk(3.6.4)63 b(Direct)29 b(connection)i(with)f(k)m(erb)s(eros)125 2581 y Fs(The)j(main)g(disadv) -5 b(an)m(tage)34 b(of)g(using)f(rsh)f(is)h(that)i(all)e(the)h(data)g (needs)g(to)h(pass)e(through)g(additional)f(pro-)0 2706 @@ -3588,13 +3490,13 @@ 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: 28 30 -28 29 bop 0 -116 a Fs(28)2411 b(CVS|Concurren)m(t)29 -b(V)-8 b(ersions)30 b(System)0 366 y Fm(4.7)68 b(Read-only)31 +%%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(4.6.3)j([P)m(assw)m(ord)e(authen)m(ticated],)i(page)f(23\).) +(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 @@ -3608,12 +3510,12 @@ 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 -(4.6.3.1)k([P)m(assw)m(ord)0 1859 y(authen)m(tication)32 -b(serv)m(er],)g(page)g(23\).)46 b(Ho)m(w)m(ev)m(er,)34 +(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 -(4.6.3.3)j([P)m(assw)m(ord)e(authen)m(tication)f(securit)m(y],)h(page)g -(26.)125 2294 y(There)e(are)i(t)m(w)m(o)h(w)m(a)m(ys)f(to)g(sp)s(ecify) +(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 @@ -3636,8 +3538,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(4.6.3.1)i([P)m(assw)m(ord)f(authen)m -(tication)f(serv)m(er],)k(page)c(23\),)46 b(mak)m(e)c(sure)e(y)m(ou)i +(\(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 (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 @@ -3647,9 +3549,9 @@ 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: 29 31 -29 30 bop 0 -116 a Fs(Chapter)30 b(4:)41 b(The)30 b(Rep)s(ository)2725 -b(29)125 366 y(If)31 b(`)p Fn(readers)p Fs(')f(exists,)i(and)g(this)e +%%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) @@ -3663,13 +3565,13 @@ y(conserv)-5 b(ativ)m(e)37 b(w)m(a)m(y)-8 b(,)39 b(it)d(b)s(eing)f(b)s (etter)h(to)h(protect)g(the)f(rep)s(ository)f(to)s(o)i(m)m(uc)m(h)f (than)g(to)s(o)g(little:)51 b(suc)m(h)36 b(a)h(user)0 1139 y(gets)31 b(read-only)f(access.)p eop -%%Page: 30 32 -30 31 bop 0 -116 a Fs(30)2411 b(CVS|Concurren)m(t)29 +%%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: 31 33 -31 32 bop 0 -116 a Fs(Chapter)30 b(5:)41 b(Starting)30 -b(a)g(pro)5 b(ject)31 b(with)e(CVS)2212 b(31)0 366 y -Fp(5)80 b(Starting)30 b(a)h(pro)9 b(ject)29 b(with)h(CVS)125 +%%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 +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 (the)f(\014rst)0 874 y(thing)34 b(y)m(ou)g(do)h(when)e(y)m(ou)i(start)g @@ -3679,13 +3581,13 @@ b(not)h(imp)s(ossible)c(to)k(rename)g(or)f(mo)m(v)m(e)j(\014les,)c(but) h(it)h(do)s(es)f(increase)g(the)h(p)s(oten)m(tial)f(for)h(confusion)e (and)h Fr(cvs)0 1123 y Fs(do)s(es)36 b(ha)m(v)m(e)i(some)e(quirks)f (particularly)f(in)h(the)h(area)h(of)g(renaming)e(directories.)58 -b(See)36 b(Chapter)g(14)h([Mo)m(ving)0 1247 y(\014les],)30 -b(page)h(69.)125 1523 y(What)g(to)g(do)f(next)h(dep)s(ends)d(on)i(the)h -(situation)e(at)i(hand.)0 1988 y Fm(5.1)68 b(Setting)31 +b(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 +(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 b(.)38 b(This)24 b(can)i(b)s(e)f(done)h(in)e(a)i(couple)g(of)f -(di\013eren)m(t)0 2388 y(w)m(a)m(ys.)0 2820 y Fk(5.1.1)63 +(di\013eren)m(t)0 2388 y(w)m(a)m(ys.)0 2820 y Fk(4.1.1)63 b(Creating)30 b(a)g(directory)g(tree)g(from)g(a)g(n)m(um)m(b)s(er)f(of) i(\014les)125 3095 y Fs(When)38 b(y)m(ou)h(b)s(egin)e(using)g Fr(cvs)p Fs(,)j(y)m(ou)f(will)c(probably)i(already)h(ha)m(v)m(e)i(sev)m @@ -3710,16 +3612,16 @@ Fn(start)p Fs(')h(is)f(a)i Fo(release)g(tag)p Fs(.)42 b(They)30 b(ma)m(y)h(\014ll)d(no)j(purp)s(ose)0 4477 y(in)41 b(this)h(con)m(text,)47 b(but)42 b(since)g Fr(cvs)g Fs(requires)f(them)h(they)h(m)m(ust)f(b)s(e)g(presen)m(t.)77 -b(See)43 b(Chapter)f(13)i([T)-8 b(rac)m(king)0 4602 y(sources],)31 -b(page)g(65,)g(for)g(more)f(information)f(ab)s(out)h(them.)125 +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 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: 32 34 -32 33 bop 0 -116 a Fs(32)2411 b(CVS|Concurren)m(t)29 +%%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)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 @@ -3737,14 +3639,14 @@ b(course,)i(it)e(w)m(ould)g(b)s(e)h(wise)f(to)h(mak)m(e)h(sure)f(that)g (idea)g(to)h(c)m(hec)m(k)h(that)e(the)h(p)s(ermissions)c Fr(cvs)i Fs(sets)h(on)g(the)h(directories)e(inside)f(`)p Fn($CVSROOT)p Fs(')0 1820 y(are)h(reasonable,)i(and)e(that)h(they)f(b)s -(elong)f(to)i(the)f(prop)s(er)f(groups.)60 b(See)37 b(Section)g(4.2.2)i -([File)e(p)s(ermissions],)0 1944 y(page)31 b(18.)125 +(elong)f(to)i(the)f(prop)s(er)f(groups.)60 b(See)37 b(Section)g(3.2.2)i +([File)e(p)s(ermissions],)0 1944 y(page)31 b(16.)125 2228 y(If)g(some)i(of)f(the)h(\014les)e(y)m(ou)i(w)m(an)m(t)g(to)g(imp) 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 -2856 y Fk(5.1.2)63 b(Creating)30 b(Files)h(F)-10 b(rom)30 +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 b(whic)m(h)e(y)m(ou)i(are)g(main)m(taining)d(with)h(another)i(v)m @@ -3783,9 +3685,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: 33 35 -33 34 bop 0 -116 a Fs(Chapter)30 b(5:)41 b(Starting)30 -b(a)g(pro)5 b(ject)31 b(with)e(CVS)2212 b(33)0 366 y(F)-8 +%%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 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 @@ -3795,7 +3697,7 @@ h(on)g(a)h(ma-)480 740 y(c)m(hine)33 b(whic)m(h)g(has)g(b)s(oth)g Fr(sccs)f Fs(and)i Fr(r)n(cs)e Fs(installed,)h(and)g(lik)m(e)g(ev)m (erything)g(else)h(in)e(con)m(trib)i(it)f(is)480 865 y(unsupp)s(orted)28 b(\(y)m(our)i(mileage)g(ma)m(y)h(v)-5 -b(ary\).)0 1367 y Fk(5.1.3)63 b(Creating)30 b(a)g(directory)g(tree)g +b(ary\).)0 1367 y Fk(4.1.3)63 b(Creating)30 b(a)g(directory)g(tree)g (from)g(scratc)m(h)125 1650 y Fs(F)-8 b(or)35 b(a)f(new)g(pro)5 b(ject,)37 b(the)d(easiest)h(thing)f(to)h(do)f(is)f(probably)g(to)i (create)h(an)e(empt)m(y)h(directory)f(structure,)0 1775 @@ -3810,7 +3712,7 @@ b(start)125 3304 y Fs(Then,)29 b(use)h Fn(add)g Fs(to)h(add)f(\014les)f (\(and)h(new)g(directories\))g(as)g(they)h(app)s(ear.)125 3587 y(Chec)m(k)f(that)h(the)g(p)s(ermissions)c Fr(cvs)i Fs(sets)i(on)f(the)h(directories)e(inside)f(`)p Fn($CVSROOT)p -Fs(')h(are)i(reasonable.)0 4122 y Fm(5.2)68 b(De\014ning)31 +Fs(')h(are)i(reasonable.)0 4122 y Fm(4.2)68 b(De\014ning)31 b(the)f(mo)t(dule)125 4406 y Fs(The)j(next)g(step)h(is)e(to)j(de\014ne) e(the)g(mo)s(dule)f(in)g(the)i(`)p Fn(modules)p Fs(')e(\014le.)50 b(This)31 b(is)i(not)h(strictly)e(necessary)-8 b(,)36 @@ -3821,12 +3723,12 @@ 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: 34 36 -34 35 bop 0 -116 a Fs(34)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)49 366 y(2.)61 b(Edit)34 b(the)h(\014le)f(and)g(insert)g(a)i(line)d(that)i(de\014nes)f(the)h(mo) -s(dule.)53 b(See)35 b(Section)g(4.3)h([In)m(tro)g(administrativ)m(e)180 -491 y(\014les],)31 b(page)h(19,)g(for)f(an)h(in)m(tro)s(duction.)41 +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 (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) @@ -3837,9 +3739,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: 35 37 -35 36 bop 0 -116 a Fs(Chapter)30 b(6:)41 b(Multiple)28 -b(dev)m(elop)s(ers)2565 b(35)0 366 y Fp(6)80 b(Multiple)32 +%%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 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 @@ -3854,7 +3756,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(95\).)0 1366 y(This)29 b(is)g(not)i(as)g +([admin)d(options],)j(page)f(97\).)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 @@ -3884,7 +3786,7 @@ b(This)29 b(pro)s(cess)h(is)f(almost)i(automatic.)125 (c)m(hapter)h(describ)s(es)f(ho)m(w)h(these)g(v)-5 b(arious)22 b(mo)s(dels)g(w)m(ork,)j(and)d(some)i(of)f(the)g(issues)f(in)m(v)m(olv) m(ed)0 3311 y(in)29 b(c)m(ho)s(osing)h(b)s(et)m(w)m(een)h(them.)0 -3765 y Fm(6.1)68 b(File)31 b(status)125 4040 y Fs(Based)26 +3765 y Fm(5.1)68 b(File)31 b(status)125 4040 y Fs(Based)26 b(on)g(what)g(op)s(erations)g(y)m(ou)g(ha)m(v)m(e)i(p)s(erformed)c(on)i (a)h(c)m(hec)m(k)m(ed)h(out)e(\014le,)h(and)e(what)h(op)s(erations)g (others)0 4165 y(ha)m(v)m(e)39 b(p)s(erformed)e(to)h(that)h(\014le)e @@ -3900,8 +3802,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: 36 38 -36 37 bop 0 -116 a Fs(36)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)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 @@ -3924,8 +3826,8 @@ b(is)h(lik)m(e)g(Lo)s(cally)f(Mo)s(di\014ed,)i(except)h(that)f(a)g (previous)e Fn(update)g Fs(command)i(ga)m(v)m(e)i(a)e(con\015ict.)37 b(If)480 2323 y(y)m(ou)23 b(ha)m(v)m(e)h(not)f(already)f(done)h(so,)i (y)m(ou)e(need)f(to)i(resolv)m(e)f(the)g(con\015ict)f(as)h(describ)s -(ed)e(in)g(Section)i(6.3)480 2448 y([Con\015icts)30 b(example],)g(page) -h(37.)0 2626 y(Unkno)m(wn)103 b Fr(Cvs)33 b Fs(do)s(esn't)g(kno)m(w)g +(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 (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 @@ -3937,13 +3839,13 @@ 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(119.)42 b(F)-8 b(or)32 b(information)0 +([status],)h(page)f(121.)42 b(F)-8 b(or)32 b(information)0 3702 y(on)c(its)f Fn(Sticky)i(tag)e Fs(and)h Fn(Sticky)g(date)f -Fs(output,)h(see)h(Section)f(7.4)h([Stic)m(ky)f(tags],)i(page)f(51.)41 +Fs(output,)h(see)h(Section)f(6.7)h([Stic)m(ky)f(tags],)i(page)f(52.)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(122.)0 4290 -y Fm(6.2)68 b(Bringing)31 b(a)f(\014le)h(up)f(to)h(date)125 +(A.18.1)j([up)s(date)c(options],)i(page)g(123.)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 b(F)-8 b(or)27 b(\014les)e(that)i(are)g(not)f(up)f(to)0 @@ -3959,9 +3861,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: 37 39 -37 38 bop 0 -116 a Fs(Chapter)30 b(6:)41 b(Multiple)28 -b(dev)m(elop)s(ers)2565 b(37)125 366 y(F)-8 b(or)29 b(instance,)g +%%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 (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 @@ -3976,9 +3878,9 @@ 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(122,)0 +b(See)24 b(Section)f(A.18)h([up)s(date],)h(page)e(123,)0 1263 y(for)30 b(a)h(complete)g(description)d(of)j(the)f -Fn(update)f Fs(command.)0 1691 y Fm(6.3)68 b(Con\015icts)31 +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 Fn(driver.c)p Fs(')d(con)m(tains)j(this:)240 2218 y Fn(#include)46 b(<stdio.h>)240 2426 y(void)h(main\(\))240 2530 y({)431 @@ -3994,8 +3896,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: 38 40 -38 39 bop 0 -116 a Fs(38)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)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 @@ -4024,9 +3926,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: 39 41 -39 40 bop 0 -116 a Fs(Chapter)30 b(6:)41 b(Multiple)28 -b(dev)m(elop)s(ers)2565 b(39)431 366 y Fn(if)47 b(\(nerr)f(==)i(0\))622 +%%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 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 @@ -4056,8 +3958,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: 40 42 -40 41 bop 0 -116 a Fs(40)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(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 @@ -4078,7 +3980,7 @@ Fr(gnu)f Fs(Emacs)h(fron)m(t-end)f(for)h Fr(cvs)p Fs(\))e(y)m(ou)i(can) g(use)f(an)h(Emacs)0 1687 y(pac)m(k)-5 b(age)32 b(called)e(emerge)h(to) g(help)e(y)m(ou)i(resolv)m(e)g(con\015icts.)40 b(See)31 b(the)f(do)s(cumen)m(tation)h(for)f(p)s(cl-cvs.)0 2247 -y Fm(6.4)68 b(Informing)31 b(others)g(ab)t(out)f(commits)125 +y Fm(5.4)68 b(Informing)31 b(others)g(ab)t(out)f(commits)125 2534 y Fs(It)35 b(is)g(often)h(useful)e(to)j(inform)d(others)h(when)g (y)m(ou)h(commit)g(a)g(new)f(revision)f(of)i(a)g(\014le.)56 b(The)35 b(`)p Fn(-i)p Fs(')g(option)0 2658 y(of)e(the)f(`)p @@ -4090,7 +3992,7 @@ 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 (or)g(p)s(ost)f(a)h(message)h(to)g(a)f(lo)s(cal)f(newsgroup.)0 -3468 y Fm(6.5)68 b(Sev)l(eral)32 b(dev)l(elop)t(ers)f(sim)l +3468 y Fm(5.5)68 b(Sev)l(eral)32 b(dev)l(elop)t(ers)f(sim)l (ultaneously)h(attempting)h(to)d(run)g(CVS)125 3754 y Fs(If)f(sev)m(eral)i(dev)m(elop)s(ers)f(try)g(to)h(run)e Fr(cvs)h Fs(at)h(the)f(same)h(time,)f(one)h(ma)m(y)g(get)g(the)g(follo) @@ -4113,11 +4015,11 @@ Fs('.)125 5091 y(Note)j(that)f(these)h(lo)s(c)m(ks)f(are)g(to)h m(v)m(e)h(no)f(relationship)d(to)0 5215 y(the)24 b(w)m(ord)g Fo(lo)s(c)m(k)30 b Fs(in)23 b(the)h(sense)g(used)f(b)m(y)h Fr(r)n(cs)p Fs(|whic)m(h)e(refers)i(to)h(reserv)m(ed)f(c)m(hec)m(k)m -(outs)j(\(see)e(Chapter)e(6)i([Multiple)0 5340 y(dev)m(elop)s(ers],)30 -b(page)h(35\).)p eop -%%Page: 41 43 -41 42 bop 0 -116 a Fs(Chapter)30 b(6:)41 b(Multiple)28 -b(dev)m(elop)s(ers)2565 b(41)125 366 y(An)m(y)30 b(n)m(um)m(b)s(er)g +(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 (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 @@ -4136,7 +4038,7 @@ y Fs(and)26 b(someone)j(else)e(runs)f Fn(cvs)k(update)25 b Fs(at)k(the)e(same)h(time,)g(the)g(p)s(erson)e(running)f Fn(update)h Fs(migh)m(t)h(get)i(only)0 3177 y(the)i(c)m(hange)g(to)g(`) p Fn(b/three.c)p Fs(')e(and)g(not)i(the)f(c)m(hange)i(to)f(`)p -Fn(a/two.c)p Fs('.)0 3867 y Fm(6.6)68 b(Mec)l(hanisms)31 +Fn(a/two.c)p Fs('.)0 3867 y Fm(5.6)68 b(Mec)l(hanisms)31 b(to)g(trac)l(k)g(who)f(is)h(editing)g(\014les)125 4168 y Fs(F)-8 b(or)30 b(man)m(y)f(groups,)g(use)g(of)h Fr(cvs)e Fs(in)g(its)h(default)f(mo)s(de)h(is)g(p)s(erfectly)f(satisfactory)-8 @@ -4161,9 +4063,9 @@ 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: 42 44 -42 43 bop 0 -116 a Fs(42)2411 b(CVS|Concurren)m(t)29 -b(V)-8 b(ersions)30 b(System)0 366 y Fk(6.6.1)63 b(T)-10 +%%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)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) g(\014rst)f(sp)s(ecify)f(that)i(certain)f(\014les)f(are)i(to)g(b)s(e)f @@ -4192,7 +4094,7 @@ b(not)g(pro)m(vide)f(noti\014cation)g(ab)s(out)g(w)m(ork)g(on)h Fo(\014les)p Fs(.)39 b(CVS)26 b(will)f(create)k(w)m(orking)e(copies)g (of)h Fo(\014les)240 2841 y Fs(read-write.)240 3116 y(The)i Fo(\014les)j Fs(and)d Fn(-l)f Fs(argumen)m(ts)i(are)g(pro)s(cessed)f -(as)g(for)g Fn(cvs)g(watch)f(on)p Fs(.)0 3540 y Fk(6.6.2)63 +(as)g(for)g Fn(cvs)g(watch)f(on)p Fs(.)0 3540 y Fk(5.6.2)63 b(T)-10 b(elling)31 b(CVS)f(to)g(notify)g(y)m(ou)125 3815 y Fs(Y)-8 b(ou)36 b(can)h(tell)f Fr(cvs)f Fs(that)i(y)m(ou)g(w)m (an)m(t)g(to)h(receiv)m(e)f(noti\014cations)f(ab)s(out)g(v)-5 @@ -4213,9 +4115,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: 43 45 -43 44 bop 0 -116 a Fs(Chapter)30 b(6:)41 b(Multiple)28 -b(dev)m(elop)s(ers)2565 b(43)240 366 y Fn(unedit)192 +%%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 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 @@ -4242,8 +4144,8 @@ 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(4.3)h([In)m(tro)g(administrativ)m(e)d -(\014les],)0 3020 y(page)28 b(19\).)41 b(This)26 b(\014le)g(follo)m(ws) +(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) 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 @@ -4278,8 +4180,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: 44 46 -44 45 bop 0 -116 a Fs(44)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(of)j(the)g(p)s(erson)f(getting)i (noti\014cation.)48 b(In)32 b(fact,)j(in)d(general,)i(the)f(w)m(atc)m (hes)i(features)e(only)f(trac)m(k)i(one)g(edit)e(b)m(y)0 @@ -4287,7 +4189,7 @@ b(V)-8 b(ersions)30 b(System)0 366 y(of)j(the)g(p)s(erson)f(getting)i (useful)e(if)h(w)m(atc)m(hes)j(trac)m(k)m(ed)g(eac)m(h)f(w)m(orking)e (directory)h(separately)-8 b(,)0 616 y(so)31 b(this)e(b)s(eha)m(vior)g (migh)m(t)h(b)s(e)g(w)m(orth)h(c)m(hanging.)0 1021 y -Fk(6.6.3)63 b(Ho)m(w)29 b(to)i(edit)f(a)g(\014le)h(whic)m(h)e(is)i(b)s +Fk(5.6.3)63 b(Ho)m(w)29 b(to)i(edit)f(a)g(\014le)h(whic)m(h)e(is)i(b)s (eing)h(w)m(atc)m(hed)125 1295 y Fs(Since)39 b(a)i(\014le)f(whic)m(h)f (is)h(b)s(eing)f(w)m(atc)m(hed)j(is)e(c)m(hec)m(k)m(ed)j(out)d (read-only)-8 b(,)44 b(y)m(ou)d(cannot)g(simply)d(edit)i(it.)71 @@ -4296,9 +4198,9 @@ b(T)-8 b(o)0 1419 y(mak)m(e)28 b(it)f(read-write,)g(and)g(inform)e g Fn(cvs)j(edit)c Fs(command.)0 1544 y(Some)k(systems)g(call)f(this)f (a)i Fo(c)m(hec)m(k)m(out)p Fs(,)j(but)c Fr(cvs)g Fs(uses)g(that)h (term)g(for)f(obtaining)g(a)h(cop)m(y)g(of)g(the)g(sources)g(\(see)0 -1668 y(Section)g(3.1)i([Getting)f(the)f(source],)h(page)h(11\),)f(an)g -(op)s(eration)e(whic)m(h)h(those)g(systems)h(call)f(a)g -Fo(get)k Fs(or)c(a)h Fo(fetc)m(h)p Fs(.)3391 1987 y(Command)-3801 +1668 y(Section)g(2.1)i([Getting)f(the)f(source],)h(page)h(9\),)f(an)f +(op)s(eration)g(whic)m(h)f(those)i(systems)f(call)g(a)h +Fo(get)i Fs(or)e(a)f Fo(fetc)m(h)p Fs(.)3391 1987 y(Command)-3801 b Fj(cvs)39 b(edit)44 b Fi([)p Fo(options)p Fi(])30 b Fo(\014les)g Fh(:)15 b(:)g(:)240 2112 y Fs(Prepare)39 b(to)h(edit)f(the)g(w)m(orking)g(\014les)f Fo(\014les)p @@ -4340,9 +4242,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: 45 47 -45 46 bop 0 -116 a Fs(Chapter)30 b(6:)41 b(Multiple)28 -b(dev)m(elop)s(ers)2565 b(45)240 366 y(a)32 b(new)g(cop)m(y)-8 +%%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 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) @@ -4353,7 +4255,7 @@ b Fs(and)i Fn(cvs)j(unedit)24 b Fs(commands)i(ev)m(en)g(if)f Fr(cvs)0 1066 y Fs(is)31 b(unable)g(to)i(succesfully)e(comm)m(unicate)i (with)e(the)h(serv)m(er;)i(the)f(noti\014cations)e(will)f(b)s(e)i(sen)m (t)g(up)s(on)f(the)i(next)0 1191 y(successful)c Fr(cvs)h -Fs(command.)0 1614 y Fk(6.6.4)63 b(Information)29 b(ab)s(out)i(who)f +Fs(command.)0 1614 y Fk(5.6.4)63 b(Information)29 b(ab)s(out)i(who)f (is)h(w)m(atc)m(hing)e(and)h(editing)3391 1940 y Fs(Command)-3801 b Fj(cvs)39 b(w)m(atc)m(hers)k Fi([)p Fn(-l)p Fi(])31 b Fo(\014les)e Fh(:)15 b(:)g(:)240 2065 y Fs(List)33 @@ -4372,7 +4274,7 @@ m(orking)f(on)i Fo(\014les)p Fs(.)40 b(The)30 b(rep)s(ort)g(includes)e (directory)g(con)m(taining)f(the)i(\014le.)240 3491 y(The)f Fo(\014les)j Fs(and)d Fn(-l)f Fs(argumen)m(ts)i(are)g(pro)s(cessed)f (as)g(for)g(the)h Fn(cvs)f(watch)e Fs(commands.)0 3914 -y Fk(6.6.5)63 b(Using)31 b(w)m(atc)m(hes)e(with)h(old)h(v)m(ersions)g +y Fk(5.6.5)63 b(Using)31 b(w)m(atc)m(hes)e(with)h(old)h(v)m(ersions)g (of)f(CVS)125 4188 y Fs(If)i(y)m(ou)i(use)f(the)g(w)m(atc)m(h)i (features)e(on)g(a)h(rep)s(ository)-8 b(,)34 b(it)e(creates)j(`)p Fn(CVS)p Fs(')e(directories)f(in)g(the)h(rep)s(ository)g(and)0 @@ -4392,9 +4294,9 @@ 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: 46 48 -46 47 bop 0 -116 a Fs(46)2411 b(CVS|Concurren)m(t)29 -b(V)-8 b(ersions)30 b(System)0 366 y Fm(6.7)68 b(Cho)t(osing)31 +%%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 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 (outs)j(eac)m(h)e(ha)m(v)m(e)h(pros)e(and)g(cons.)56 @@ -4446,8 +4348,8 @@ b(programs\),)j(and)c(it)h(is)g(not)g(desirable)e(to)j(c)m(hange)h(to)f s(e)i(b)s(etter)0 3729 y(o\013)h(to)g(simply)d(a)m(v)m(oid)j(the)f (con\015icts)g(instead,)g(b)m(y)g(using)f(reserv)m(ed)i(c)m(hec)m(k)m (outs.)125 4003 y(The)36 b(w)m(atc)m(hes)i(features)f(describ)s(ed)e -(ab)s(o)m(v)m(e)j(in)d(Section)h(6.6)i([W)-8 b(atc)m(hes],)42 -b(page)37 b(41)h(can)f(b)s(e)f(considered)f(to)0 4127 +(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 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 @@ -4461,328 +4363,468 @@ 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 +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 +Fs(assigns)0 1009 y(n)m(um)m(b)s(ers)34 b(suc)m(h)i(as)g +Fn(1.1)p Fs(,)h Fn(1.2)p Fs(,)f(and)f(so)h(on,)i(and)d(that)h(is)f(all) +g(one)h(needs)g(to)g(kno)m(w.)57 b(Ho)m(w)m(ev)m(er,)40 +b(some)c(p)s(eople)0 1134 y(prefer)30 b(to)h(ha)m(v)m(e)g(more)g(kno)m +(wledge)f(and)g(con)m(trol)h(concerning)f(ho)m(w)g Fr(cvs)f +Fs(assigns)h(revision)f(n)m(um)m(b)s(ers.)125 1436 y(If)40 +b(one)i(w)m(an)m(ts)g(to)g(k)m(eep)g(trac)m(k)g(of)g(a)f(set)h(of)f +(revisions)f(in)m(v)m(olving)g(more)h(than)g(one)g(\014le,)j(suc)m(h)d +(as)g(whic)m(h)0 1561 y(revisions)30 b(w)m(en)m(t)j(in)m(to)g(a)f +(particular)f(release,)i(one)g(uses)f(a)g Fo(tag)p Fs(,)j(whic)m(h)c +(is)g(a)i(sym)m(b)s(olic)d(revision)h(whic)m(h)g(can)i(b)s(e)0 +1685 y(assigned)d(to)h(a)f(n)m(umeric)g(revision)e(in)h(eac)m(h)j +(\014le.)125 1988 y(Another)37 b(useful)f(feature,)41 +b(esp)s(ecially)36 b(when)h(main)m(taining)f(sev)m(eral)i(releases)g +(of)g(a)g(soft)m(w)m(are)i(pro)s(duct)c(at)0 2113 y(once,)31 +b(is)f(the)g(abilit)m(y)f(to)i(mak)m(e)h(branc)m(hes)e(on)g(the)g +(revision)f(tree.)0 2821 y Fm(6.1)68 b(Revision)32 b(n)l(um)l(b)t(ers) +125 3124 y Fs(Eac)m(h)37 b(v)m(ersion)f(of)h(a)h(\014le)e(has)g(a)h +(unique)e Fo(revision)g(n)m(um)m(b)s(er)p Fs(.)59 b(Revision)36 +b(n)m(um)m(b)s(ers)f(lo)s(ok)i(lik)m(e)f(`)p Fn(1.1)p +Fs(',)i(`)p Fn(1.2)p Fs(',)0 3248 y(`)p Fn(1.3.2.2)p +Fs(')19 b(or)h(ev)m(en)h(`)p Fn(1.3.2.2.4.5)p Fs('.)35 +b(A)20 b(revision)f(n)m(um)m(b)s(er)g(alw)m(a)m(ys)i(has)f(an)g(ev)m +(en)h(n)m(um)m(b)s(er)e(of)h(p)s(erio)s(d-separated)0 +3373 y(decimal)34 b(in)m(tegers.)53 b(By)35 b(default)f(revision)f(1.1) +j(is)e(the)g(\014rst)g(revision)f(of)i(a)g(\014le.)53 +b(Eac)m(h)35 b(successiv)m(e)g(revision)e(is)0 3497 y(giv)m(en)i(a)g +(new)f(n)m(um)m(b)s(er)g(b)m(y)h(increasing)e(the)i(righ)m(tmost)g(n)m +(um)m(b)s(er)f(b)m(y)g(one.)55 b(The)34 b(follo)m(wing)f(\014gure)i +(displa)m(ys)e(a)0 3622 y(few)d(revisions,)f(with)g(new)m(er)h +(revisions)f(to)i(the)f(righ)m(t.)574 3904 y Fn(+-----+)189 +b(+-----+)g(+-----+)g(+-----+)g(+-----+)574 4008 y(!)48 +b(1.1)e(!----!)h(1.2)f(!----!)h(1.3)f(!----!)h(1.4)f(!----!)h(1.5)f(!) +574 4112 y(+-----+)189 b(+-----+)g(+-----+)g(+-----+)g(+-----+)125 +4414 y Fr(cvs)34 b Fs(is)g(not)h(limited)e(to)j(linear)e(dev)m(elopmen) +m(t.)55 b(The)35 b Fo(revision)f(tree)41 b Fs(can)35 +b(b)s(e)g(split)e(in)m(to)i Fo(branc)m(hes)p Fs(,)h(where)0 +4539 y(eac)m(h)e(branc)m(h)f(is)f(a)h(self-main)m(tained)f(line)f(of)j +(dev)m(elopmen)m(t.)49 b(Changes)33 b(made)g(on)g(one)g(branc)m(h)g +(can)g(easily)g(b)s(e)0 4664 y(mo)m(v)m(ed)e(bac)m(k)g(to)h(the)e(main) +f(trunk.)125 4966 y(Eac)m(h)38 b(branc)m(h)e(has)i(a)g +Fo(branc)m(h)e(n)m(um)m(b)s(er)p Fs(,)j(consisting)d(of)h(an)h(o)s(dd)e +(n)m(um)m(b)s(er)g(of)i(p)s(erio)s(d-separated)e(decimal)0 +5091 y(in)m(tegers.)41 b(The)28 b(branc)m(h)g(n)m(um)m(b)s(er)g(is)g +(created)i(b)m(y)f(app)s(ending)d(an)j(in)m(teger)h(to)f(the)g +(revision)f(n)m(um)m(b)s(er)f(where)i(the)0 5215 y(corresp)s(onding)24 +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 +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 +741 y(branc)m(h)h(n)m(um)m(b)s(er.)39 b(The)30 b(follo)m(wing)f +(\014gure)h(illustrates)e(branc)m(hing)h(with)g(an)h(example.)2770 +1022 y Fn(+-------------+)1481 1126 y(Branch)46 b(1.2.2.3.2)f(->)382 +b(!)47 b(1.2.2.3.2.1)e(!)2674 1230 y(/)j(+-------------+)2626 +1333 y(/)2579 1437 y(/)1051 1541 y(+---------+)188 b(+---------+)g +(+---------+)g(+---------+)240 1645 y(Branch)46 b(1.2.2)g(->)i(_!)f +(1.2.2.1)f(!----!)g(1.2.2.2)g(!----!)g(1.2.2.3)f(!----!)i(1.2.2.4)e(!) +956 1748 y(/)i(+---------+)188 b(+---------+)g(+---------+)g +(+---------+)908 1852 y(/)860 1956 y(/)240 2060 y(+-----+)h(+-----+)g +(+-----+)g(+-----+)g(+-----+)240 2164 y(!)47 b(1.1)g(!----!)f(1.2)h +(!----!)f(1.3)h(!----!)f(1.4)h(!----!)f(1.5)h(!)286 b(<-)48 +b(The)f(main)f(trunk)240 2267 y(+-----+)189 b(+-----+)g(+-----+)g +(+-----+)g(+-----+)1004 2371 y(!)1004 2475 y(!)1004 2579 +y(!)143 b(+---------+)187 b(+---------+)h(+---------+)240 +2682 y(Branch)46 b(1.2.4)g(->)i(+---!)e(1.2.4.1)g(!----!)g(1.2.4.2)g +(!----!)g(1.2.4.3)g(!)1195 2786 y(+---------+)187 b(+---------+)h +(+---------+)125 3171 y Fs(The)28 b(exact)i(details)d(of)i(ho)m(w)g +(the)g(branc)m(h)f(n)m(um)m(b)s(er)f(is)h(constructed)h(is)e(not)i +(something)f(y)m(ou)h(normally)e(need)0 3295 y(to)32 +b(b)s(e)f(concerned)h(ab)s(out,)g(but)f(here)g(is)g(ho)m(w)g(it)g(w)m +(orks:)44 b(When)31 b Fr(cvs)f Fs(creates)j(a)f(branc)m(h)f(n)m(um)m(b) +s(er)g(it)g(pic)m(ks)g(the)0 3420 y(\014rst)26 b(un)m(used)g(ev)m(en)i +(in)m(teger,)g(starting)f(with)f(2.)40 b(So)27 b(when)f(y)m(ou)i(w)m +(an)m(t)g(to)g(create)g(a)g(branc)m(h)e(from)h(revision)e(6.4)j(it)0 +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 +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 +b(a)f(soft)m(w)m(are)h(pro)s(duct)e(can)h(ha)m(v)m(e)0 +4914 y(sev)m(eral)31 b(v)m(ersions.)40 b(A)30 b(soft)m(w)m(are)i(pro)s +(duct)d(is)h(often)g(giv)m(en)h(a)g(v)m(ersion)e(n)m(um)m(b)s(er)g(suc) +m(h)i(as)f(`)p Fn(4.1.1)p Fs('.)125 5215 y(V)-8 b(ersions)25 +b(in)h(the)g(\014rst)g(sense)g(are)h(called)f Fo(revisions)i +Fs(in)d(this)h(do)s(cumen)m(t,)h(and)f(v)m(ersions)g(in)f(the)h(second) +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(7:)41 b(Branc)m(hes)2984 -b(47)0 366 y Fp(7)80 b(Branc)l(hes)125 759 y Fs(So)28 -b(far,)h(all)f(revisions)f(sho)m(wn)h(in)f(this)h(man)m(ual)g(ha)m(v)m -(e)i(b)s(een)e(on)g(the)h Fo(main)f(trunk)33 b Fs(of)c(the)g(revision)e -(tree,)j(i.e.,)0 883 y(all)k(revision)g(n)m(um)m(b)s(ers)g(ha)m(v)m(e)i -(b)s(een)f(of)h(the)f(form)g Fo(x)p Fs(.)p Fo(y)p Fs(.)56 -b(One)35 b(useful)e(feature,)38 b(esp)s(ecially)33 b(when)i(main)m -(taining)0 1008 y(sev)m(eral)c(releases)f(of)h(a)f(soft)m(w)m(are)i -(pro)s(duct)d(at)i(once,)g(is)e(the)i(abilit)m(y)e(to)i(mak)m(e)g -(branc)m(hes)f(on)g(the)g(revision)f(tree.)0 1132 y Fo(T)-8 -b(ags)p Fs(,)31 b(sym)m(b)s(olic)e(names)h(for)h(revisions,)d(will)g -(also)i(b)s(e)g(in)m(tro)s(duced)f(in)g(this)g(c)m(hapter.)0 -1614 y Fm(7.1)68 b(T)-11 b(ags{Sym)l(b)t(olic)31 b(revisions)125 -1892 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 2016 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 2141 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 2265 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 -2522 y Fn(ci.c)572 b(5.21)240 2626 y(co.c)g(5.9)240 2730 -y(ident.c)428 b(5.3)240 2834 y(rcs.c)524 b(5.12)240 2937 -y(rcsbase.h)332 b(5.11)240 3041 y(rcsdiff.c)g(5.10)240 -3145 y(rcsedit.c)g(5.11)240 3249 y(rcsfcmp.c)g(5.9)240 -3352 y(rcsgen.c)380 b(5.10)240 3456 y(rcslex.c)g(5.11)240 -3560 y(rcsmap.c)g(5.2)240 3664 y(rcsutil.c)332 b(5.10)125 -3942 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 4066 -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 4191 -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 4315 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 -4440 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 -4564 y(b)m(y)g(starting)g(with)f(`)p Fn(.)p Fs(',)j(rather)e(than)g(b)s +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) +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 +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 +(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 +(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 +(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)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 +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 +(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 +(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 +(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 +(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 +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 +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 +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 +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 +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(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 +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 +(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 (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 -4689 y(actual)31 b(tag)g(names.)125 4966 y(Y)-8 b(ou'll)27 +1797 y(actual)31 b(tag)g(names.)125 2168 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 5091 y(of)34 b(the)h(program)f(and)f(the)i(v)m(ersion)e(n)m(um)m(b)s +0 2293 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 5215 y(the)k(program,)i(immediately)c +(t)e(tak)m(e)j(the)f(name)f(of)0 2417 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 5340 y(1.9)45 b(w)m(ould)e(b)s(e)g(tagged)j(with)d(the)h(name)g +(CVS)0 2542 y(1.9)45 b(w)m(ould)e(b)s(e)g(tagged)j(with)d(the)h(name)g Fn(cvs1-9)p Fs(.)80 b(If)44 b(y)m(ou)g(c)m(ho)s(ose)h(a)g(consisten)m -(t)f(con)m(v)m(en)m(tion,)49 b(then)44 b(y)m(ou)p eop -%%Page: 48 50 -48 49 bop 0 -116 a Fs(48)2411 b(CVS|Concurren)m(t)29 -b(V)-8 b(ersions)30 b(System)0 366 y(w)m(on't)j(constan)m(tly)h(b)s(e)e -(guessing)g(whether)g(a)h(tag)h(is)d Fn(cvs-1-9)g Fs(or)i -Fn(cvs1_9)e Fs(or)h(what.)48 b(Y)-8 b(ou)33 b(migh)m(t)g(ev)m(en)g(w)m -(an)m(t)0 491 y(to)40 b(consider)d(enforcing)h(y)m(our)h(con)m(v)m(en)m -(tion)h(in)e(the)h(taginfo)g(\014le)e(\(see)j(Section)f(16.3)h -([user-de\014ned)e(logging],)0 616 y(page)31 b(75\).)125 -898 y(The)h(follo)m(wing)g(example)h(sho)m(ws)h(ho)m(w)f(y)m(ou)h(can)f -(add)g(a)h(tag)h(to)f(a)g(\014le.)49 b(The)33 b(commands)g(m)m(ust)g(b) -s(e)g(issued)0 1022 y(inside)e(y)m(our)i(w)m(orking)f(cop)m(y)i(of)g -(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 1147 y(where)d(`)p -Fn(backend.c)p Fs(')e(resides.)240 1409 y Fn($)47 b(cvs)g(tag)g -(release-0-4)e(backend.c)240 1512 y(T)i(backend.c)240 -1616 y($)g(cvs)g(status)f(-v)i(backend.c)240 1720 y -(========================)o(====)o(====)o(===)o(====)o(====)o(===)o -(====)o(====)o(===)o(====)o(====)o(==)240 1824 y(File:)e(backend.c)427 -b(Status:)46 b(Up-to-date)431 2031 y(Version:)570 b(1.4)238 -b(Tue)47 b(Dec)95 b(1)47 b(14:39:01)f(1992)431 2135 y(RCS)h(Version:) -379 b(1.4)238 b(/usr/local/cvsroot/yoyody)o(ne/t)o(c/ba)o(cke)o(nd.c)o -(,v)431 2239 y(Sticky)46 b(Tag:)428 b(\(none\))431 2343 -y(Sticky)46 b(Date:)380 b(\(none\))431 2446 y(Sticky)46 -b(Options:)236 b(\(none\))431 2654 y(Existing)45 b(Tags:)622 -2758 y(release-0-4)999 b(\(revision:)45 b(1.4\))125 3144 -y Fs(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 3268 y(constitute)37 b(a)h(mo)s(dule)d(with)h -(the)h(same)g(tag)i(at)e(strategic)i(p)s(oin)m(ts)c(in)h(the)h(dev)m -(elopmen)m(t)h(life-cycle,)g(suc)m(h)f(as)0 3393 y(when)29 -b(a)i(release)g(is)e(made.)240 3654 y Fn($)47 b(cvs)g(tag)g -(release-1-0)e(.)240 3758 y(cvs)i(tag:)g(Tagging)e(.)240 -3862 y(T)i(Makefile)240 3966 y(T)g(backend.c)240 4070 -y(T)g(driver.c)240 4173 y(T)g(frontend.c)240 4277 y(T)g(parser.c)125 -4560 y Fs(\(When)32 b(y)m(ou)h(giv)m(e)h Fr(cvs)d Fs(a)j(directory)e -(as)h(argumen)m(t,)h(it)e(generally)g(applies)f(the)i(op)s(eration)f -(to)h(all)f(the)h(\014les)0 4684 y(in)41 b(that)j(directory)-8 -b(,)45 b(and)d(\(recursiv)m(ely\),)k(to)d(an)m(y)g(sub)s(directories)d -(that)j(it)g(ma)m(y)g(con)m(tain.)78 b(See)42 b(Chapter)h(9)0 -4809 y([Recursiv)m(e)30 b(b)s(eha)m(vior],)g(page)h(57.\))125 -5091 y(The)d Fn(checkout)e Fs(command)j(has)f(a)h(\015ag,)h(`)p +(t)f(con)m(v)m(en)m(tion,)49 b(then)44 b(y)m(ou)0 2666 +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 +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 +(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.) +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 +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 +(====)o(====)o(===)o(====)o(====)o(===)o(====)o(====)o(==)240 +4302 y(File:)e(backend.c)427 b(Status:)46 b(Up-to-date)431 +4510 y(Version:)570 b(1.4)238 b(Tue)47 b(Dec)95 b(1)47 +b(14:39:01)f(1992)431 4614 y(RCS)h(Version:)379 b(1.4)238 +b(/usr/local/cvsroot/yoyody)o(ne/t)o(c/ba)o(cke)o(nd.c)o(,v)431 +4717 y(Sticky)46 b(Tag:)428 b(\(none\))431 4821 y(Sticky)46 +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 +(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 +(at)e(strategic)i(p)s(oin)m(ts)c(in)h(the)h(dev)m(elopmen)m(t)h +(life-cycle,)g(suc)m(h)f(as)0 616 y(when)29 b(a)i(release)g(is)e(made.) +240 900 y Fn($)47 b(cvs)g(tag)g(release-1-0)e(.)240 1004 +y(cvs)i(tag:)g(Tagging)e(.)240 1108 y(T)i(Makefile)240 +1212 y(T)g(backend.c)240 1315 y(T)g(driver.c)240 1419 +y(T)g(frontend.c)240 1523 y(T)g(parser.c)125 1829 y Fs(\(When)32 +b(y)m(ou)h(giv)m(e)h Fr(cvs)d Fs(a)j(directory)e(as)h(argumen)m(t,)h +(it)e(generally)g(applies)f(the)i(op)s(eration)f(to)h(all)f(the)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 +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 5215 y(This)h(\015ag)i(mak)m(es)h +f(revision)f(of)i(a)g(mo)s(dule.)0 2508 y(This)h(\015ag)i(mak)m(es)h (it)f(easy)g(to)h(retriev)m(e)f(the)h(sources)f(that)g(mak)m(e)h(up)e (release)h(1.0)h(of)g(the)f(mo)s(dule)e(`)p Fn(tc)p Fs(')i(at)h(an)m(y) -0 5340 y(time)d(in)f(the)i(future:)p eop -%%Page: 49 51 -49 50 bop 0 -116 a Fs(Chapter)30 b(7:)41 b(Branc)m(hes)2984 -b(49)240 366 y Fn($)47 b(cvs)g(checkout)f(-r)h(release-1-0)e(tc)0 -641 y Fs(This)32 b(is)h(useful,)h(for)g(instance,)h(if)e(someone)i -(claims)e(that)h(there)g(is)g(a)g(bug)g(in)e(that)j(release,)h(but)d(y) -m(ou)h(cannot)0 766 y(\014nd)29 b(the)h(bug)g(in)f(the)i(curren)m(t)f -(w)m(orking)g(cop)m(y)-8 b(.)125 1041 y(Y)g(ou)42 b(can)g(also)f(c)m -(hec)m(k)i(out)f(a)g(mo)s(dule)e(as)i(it)f(w)m(as)h(at)g(an)m(y)g(giv)m -(en)g(date.)75 b(See)42 b(Section)f(A.6.1)i([c)m(hec)m(k)m(out)0 -1165 y(options],)30 b(page)h(100.)125 1440 y(When)j(y)m(ou)h(tag)h -(more)f(than)f(one)h(\014le)f(with)f(the)i(same)g(tag)h(y)m(ou)f(can)g -(think)f(ab)s(out)g(the)h(tag)h(as)f Fn(")p Fs(a)g(curv)m(e)0 -1565 y(dra)m(wn)e(through)h(a)g(matrix)f(of)i(\014lename)e(vs.)52 +0 2632 y(time)d(in)f(the)i(future:)240 2917 y Fn($)47 +b(cvs)g(checkout)f(-r)h(release-1-0)e(tc)0 3223 y Fs(This)32 +b(is)h(useful,)h(for)g(instance,)h(if)e(someone)i(claims)e(that)h +(there)g(is)g(a)g(bug)g(in)e(that)j(release,)h(but)d(y)m(ou)h(cannot)0 +3347 y(\014nd)29 b(the)h(bug)g(in)f(the)i(curren)m(t)f(w)m(orking)g +(cop)m(y)-8 b(.)125 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 +(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 b(revision)32 b(n)m(um)m(b)s(er.)p Fn(")h Fs(Sa)m(y)h(w)m(e)h(ha)m(v)m -(e)g(5)f(\014les)f(with)g(the)h(follo)m(wing)0 1689 y(revisions:)622 -1943 y Fn(file1)142 b(file2)f(file3)h(file4)g(file5)622 -2151 y(1.1)238 b(1.1)f(1.1)h(1.1)95 b(/--1.1*)284 b(<-*-)95 -b(TAG)622 2255 y(1.2*-)142 b(1.2)237 b(1.2)191 b(-1.2*-)622 -2358 y(1.3)94 b(\\-)48 b(1.3*-)141 b(1.3)i(/)47 b(1.3)622 -2462 y(1.4)476 b(\\)95 b(1.4)g(/)g(1.4)1290 2566 y(\\-1.5*-)141 -b(1.5)1385 2670 y(1.6)125 2924 y Fs(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 +(e)g(5)f(\014les)f(with)g(the)h(follo)m(wing)0 4332 y(revisions:)622 +4616 y Fn(file1)142 b(file2)f(file3)h(file4)g(file5)622 +4824 y(1.1)238 b(1.1)f(1.1)h(1.1)95 b(/--1.1*)284 b(<-*-)95 +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 +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 -3048 y(attac)m(hed)d(to)f(the)f(curv)m(e)g(dra)m(wn)f(through)g(the)i +491 y(attac)m(hed)d(to)f(the)f(curv)m(e)g(dra)m(wn)f(through)g(the)i (tagged)g(revisions.)44 b(When)31 b(y)m(ou)i(pull)c(on)j(the)g(handle,) -f(y)m(ou)i(get)0 3173 y(all)g(the)i(tagged)h(revisions.)51 +f(y)m(ou)i(get)0 616 y(all)g(the)i(tagged)h(revisions.)51 b(Another)35 b(w)m(a)m(y)g(to)h(lo)s(ok)e(at)h(it)f(is)g(that)h(y)m(ou) g Fn(")p Fs(sigh)m(t)p Fn(")e Fs(through)h(a)h(set)g(of)g(revisions)0 -3297 y(that)c(is)e Fn(")p Fs(\015at)p Fn(")h Fs(along)h(the)f(tagged)i -(revisions,)d(lik)m(e)h(this:)622 3551 y Fn(file1)142 -b(file2)f(file3)h(file4)g(file5)1385 3759 y(1.1)1385 -3863 y(1.2)1004 3967 y(1.1)237 b(1.3)1097 b(_)622 4070 -y(1.1)238 b(1.2)f(1.4)h(1.1)668 b(/)622 4174 y +740 y(that)c(is)e Fn(")p Fs(\015at)p Fn(")h Fs(along)h(the)f(tagged)i +(revisions,)d(lik)m(e)h(this:)622 1002 y Fn(file1)142 +b(file2)f(file3)h(file4)g(file5)1385 1209 y(1.1)1385 +1313 y(1.2)1004 1417 y(1.1)237 b(1.3)1097 b(_)622 1521 +y(1.1)238 b(1.2)f(1.4)h(1.1)668 b(/)622 1625 y (1.2*----1.3*----1.5*----)o(1.2)o(*---)o(-1.1)232 b(\(---)47 -b(<---)f(Look)h(here)622 4278 y(1.3)619 b(1.6)238 b(1.3)668 -b(\\_)622 4382 y(1.4)1001 b(1.4)1767 4485 y(1.5)0 4941 -y Fm(7.2)68 b(What)31 b(branc)l(hes)f(are)h(go)t(o)t(d)f(for)125 -5215 y Fs(Supp)s(ose)k(that)j(release)g(1.0)g(of)g(tc)g(has)f(b)s(een)f +b(<---)f(Look)h(here)622 1728 y(1.3)619 b(1.6)238 b(1.3)668 +b(\\_)622 1832 y(1.4)1001 b(1.4)1767 1936 y(1.5)0 2460 +y Fm(6.5)68 b(What)31 b(branc)l(hes)f(are)h(go)t(o)t(d)f(for)125 +2743 y Fs(Supp)s(ose)k(that)j(release)g(1.0)g(of)g(tc)g(has)f(b)s(een)f (made.)59 b(Y)-8 b(ou)37 b(are)g(con)m(tin)m(uing)e(to)i(dev)m(elop)g -(tc,)h(planning)c(to)0 5340 y(create)h(release)f(1.1)h(in)d(a)i(couple) +(tc,)h(planning)c(to)0 2867 y(create)h(release)f(1.1)h(in)d(a)i(couple) f(of)g(mon)m(ths.)50 b(After)34 b(a)g(while)e(y)m(our)h(customers)h -(start)g(to)g(complain)e(ab)s(out)i(a)p eop -%%Page: 50 52 -50 51 bop 0 -116 a Fs(50)2411 b(CVS|Concurren)m(t)29 -b(V)-8 b(ersions)30 b(System)0 366 y(fatal)d(bug.)39 -b(Y)-8 b(ou)28 b(c)m(hec)m(k)g(out)g(release)f(1.0)h(\(see)g(Section)f -(7.1)h([T)-8 b(ags],)29 b(page)f(47\))g(and)f(\014nd)e(the)j(bug)e -(\(whic)m(h)g(turns)0 491 y(out)36 b(to)g(ha)m(v)m(e)h(a)f(trivial)e -(\014x\).)56 b(Ho)m(w)m(ev)m(er,)39 b(the)d(curren)m(t)f(revision)f(of) -i(the)f(sources)h(are)g(in)e(a)i(state)h(of)f(\015ux)f(and)0 -616 y(are)29 b(not)g(exp)s(ected)f(to)i(b)s(e)d(stable)i(for)f(at)h -(least)g(another)f(mon)m(th.)41 b(There)28 b(is)f(no)h(w)m(a)m(y)i(to)f -(mak)m(e)g(a)g(bug\014x)f(release)0 740 y(based)i(on)g(the)h(new)m(est) -g(sources.)125 1019 y(The)c(thing)g(to)i(do)f(in)e(a)j(situation)e(lik) -m(e)g(this)g(is)g(to)i(create)g(a)g Fo(branc)m(h)e Fs(on)h(the)g -(revision)f(trees)h(for)g(all)f(the)h(\014les)0 1144 -y(that)i(mak)m(e)g(up)e(release)h(1.0)i(of)e(tc.)41 b(Y)-8 -b(ou)30 b(can)f(then)g(mak)m(e)h(mo)s(di\014cations)d(to)j(the)g(branc) -m(h)e(without)g(disturbing)0 1268 y(the)i(main)g(trunk.)39 +(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 +(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 +(and)0 3241 y(are)29 b(not)g(exp)s(ected)f(to)i(b)s(e)d(stable)i(for)f +(at)h(least)g(another)f(mon)m(th.)41 b(There)28 b(is)f(no)h(w)m(a)m(y)i +(to)f(mak)m(e)g(a)g(bug\014x)f(release)0 3365 y(based)i(on)g(the)h(new) +m(est)g(sources.)125 3648 y(The)c(thing)g(to)i(do)f(in)e(a)j(situation) +e(lik)m(e)g(this)g(is)g(to)i(create)g(a)g Fo(branc)m(h)e +Fs(on)h(the)g(revision)f(trees)h(for)g(all)f(the)h(\014les)0 +3772 y(that)i(mak)m(e)g(up)e(release)h(1.0)i(of)e(tc.)41 +b(Y)-8 b(ou)30 b(can)f(then)g(mak)m(e)h(mo)s(di\014cations)d(to)j(the)g +(branc)m(h)e(without)g(disturbing)0 3897 y(the)i(main)g(trunk.)39 b(When)30 b(the)h(mo)s(di\014cations)d(are)j(\014nished)c(y)m(ou)k(can) g(select)f(to)h(either)f(incorp)s(orate)g(them)g(on)0 -1393 y(the)h(main)e(trunk,)g(or)i(lea)m(v)m(e)g(them)g(on)f(the)h -(branc)m(h.)0 1889 y Fm(7.3)68 b(Creating)32 b(a)f(branc)l(h)125 -2168 y Fs(The)f Fn(rtag)f Fs(command)i(can)g(b)s(e)f(used)g(to)h +4021 y(the)h(main)e(trunk,)g(or)i(lea)m(v)m(e)g(them)g(on)f(the)h +(branc)m(h.)0 4547 y Fm(6.6)68 b(Creating)32 b(a)f(branc)l(h)125 +4829 y Fs(The)f Fn(rtag)f Fs(command)i(can)g(b)s(e)f(used)g(to)h (create)h(a)g(branc)m(h.)41 b(The)30 b Fn(rtag)f Fs(command)i(is)f(m)m -(uc)m(h)g(lik)m(e)g Fn(tag)p Fs(,)h(but)0 2293 y(it)d(do)s(es)h(not)g +(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(118.) -0 2417 y(\(Y)-8 b(ou)31 b(can)g(also)f(use)g(the)h Fn(tag)e -Fs(command;)i(see)g(Section)f(A.17)i([tag],)g(page)f(120\).)240 -2676 y Fn($)47 b(cvs)g(rtag)g(-b)g(-r)g(release-1-0)e -(release-1-0-patches)e(tc)125 2955 y Fs(The)d(`)p Fn(-b)p -Fs(')h(\015ag)g(mak)m(es)h Fn(rtag)d Fs(create)k(a)e(branc)m(h)f -(\(rather)h(than)g(just)f(a)h(sym)m(b)s(olic)f(revision)f(name\).)72 -b(`)p Fn(-r)0 3080 y(release-1-0)p Fs(')44 b(sa)m(ys)k(that)f(this)f +(the)h(mo)s(dule.)38 b(See)29 b(Section)g(A.15)h([rtag],)h(page)e(120.) +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 +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 +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 (branc)m(h)g(should)f(b)s(e)h(ro)s(oted)h(at)h(the)f(no)s(de)f(\(in)g -(the)h(revision)e(tree\))j(that)0 3204 y(corresp)s(onds)d(to)j(the)f +(the)h(revision)e(tree\))j(that)0 616 y(corresp)s(onds)d(to)j(the)f (tag)h(`)p Fn(release-1-0)p Fs('.)88 b(Note)48 b(that)f(the)g(n)m (umeric)f(revision)f(n)m(um)m(b)s(er)g(that)j(matc)m(hes)0 -3329 y(`)p Fn(release-1-0)p Fs(')h(will)h(probably)g(b)s(e)h -(di\013eren)m(t)g(from)h(\014le)f(to)h(\014le.)105 b(The)51 -b(name)h(of)g(the)g(new)g(branc)m(h)f(is)0 3453 y(`)p -Fn(release-1-0-patches)p Fs(',)26 b(and)k(the)g(mo)s(dule)f(a\013ected) -j(is)d(`)p Fn(tc)p Fs('.)125 3732 y(T)-8 b(o)30 b(\014x)g(the)h -(problem)e(in)g(release)h(1.0,)i(y)m(ou)f(need)f(a)h(w)m(orking)e(cop)m -(y)i(of)g(the)f(branc)m(h)g(y)m(ou)h(just)f(created.)240 -3991 y Fn($)47 b(cvs)g(checkout)f(-r)h(release-1-0-patches)c(tc)240 -4095 y($)k(cvs)g(status)f(-v)i(driver.c)d(backend.c)240 -4198 y(========================)o(====)o(====)o(===)o(====)o(====)o -(===)o(====)o(====)o(===)o(====)o(====)o(==)240 4302 +740 y(`)p Fn(release-1-0)p Fs(')h(will)h(probably)g(b)s(e)h(di\013eren) +m(t)g(from)h(\014le)f(to)h(\014le.)105 b(The)51 b(name)h(of)g(the)g +(new)g(branc)m(h)f(is)0 865 y(`)p Fn(release-1-0-patches)p +Fs(',)26 b(and)k(the)g(mo)s(dule)f(a\013ected)j(is)d(`)p +Fn(tc)p Fs('.)125 1270 y(T)-8 b(o)30 b(\014x)g(the)h(problem)e(in)g +(release)h(1.0,)i(y)m(ou)f(need)f(a)h(w)m(orking)e(cop)m(y)i(of)g(the)f +(branc)m(h)g(y)m(ou)h(just)f(created.)240 1655 y Fn($)47 +b(cvs)g(checkout)f(-r)h(release-1-0-patches)c(tc)240 +1759 y($)k(cvs)g(status)f(-v)i(driver.c)d(backend.c)240 +1863 y(========================)o(====)o(====)o(===)o(====)o(====)o +(===)o(====)o(====)o(===)o(====)o(====)o(==)240 1966 y(File:)h(driver.c)475 b(Status:)46 b(Up-to-date)431 -4510 y(Version:)570 b(1.7)238 b(Sat)47 b(Dec)95 b(5)47 -b(18:25:54)f(1992)431 4614 y(RCS)h(Version:)379 b(1.7)238 +2174 y(Version:)570 b(1.7)238 b(Sat)47 b(Dec)95 b(5)47 +b(18:25:54)f(1992)431 2278 y(RCS)h(Version:)379 b(1.7)238 b(/usr/local/cvsroot/yoyody)o(ne/t)o(c/dr)o(ive)o(r.c,)o(v)431 -4717 y(Sticky)46 b(Tag:)428 b(release-1-0-patches)43 -b(\(branch:)j(1.7.2\))431 4821 y(Sticky)g(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-1-0-patches)615 b(\(branch:)46 -b(1.7.2\))622 5340 y(release-1-0)999 b(\(revision:)45 -b(1.7\))p eop -%%Page: 51 53 -51 52 bop 0 -116 a Fs(Chapter)30 b(7:)41 b(Branc)m(hes)2984 -b(51)240 470 y Fn(========================)o(====)o(====)o(===)o(====)o -(====)o(===)o(====)o(====)o(===)o(====)o(====)o(==)240 -574 y(File:)46 b(backend.c)427 b(Status:)46 b(Up-to-date)431 -782 y(Version:)570 b(1.4)238 b(Tue)47 b(Dec)95 b(1)47 -b(14:39:01)f(1992)431 885 y(RCS)h(Version:)379 b(1.4)238 +2381 y(Sticky)46 b(Tag:)428 b(release-1-0-patches)43 +b(\(branch:)j(1.7.2\))431 2485 y(Sticky)g(Date:)380 b(\(none\))431 +2589 y(Sticky)46 b(Options:)236 b(\(none\))431 2797 y(Existing)45 +b(Tags:)622 2900 y(release-1-0-patches)615 b(\(branch:)46 +b(1.7.2\))622 3004 y(release-1-0)999 b(\(revision:)45 +b(1.7\))240 3212 y(========================)o(====)o(====)o(===)o(====) +o(====)o(===)o(====)o(====)o(===)o(====)o(====)o(==)240 +3315 y(File:)h(backend.c)427 b(Status:)46 b(Up-to-date)431 +3523 y(Version:)570 b(1.4)238 b(Tue)47 b(Dec)95 b(1)47 +b(14:39:01)f(1992)431 3627 y(RCS)h(Version:)379 b(1.4)238 b(/usr/local/cvsroot/yoyody)o(ne/t)o(c/ba)o(cke)o(nd.c)o(,v)431 -989 y(Sticky)46 b(Tag:)428 b(release-1-0-patches)43 b(\(branch:)j -(1.4.2\))431 1093 y(Sticky)g(Date:)380 b(\(none\))431 -1197 y(Sticky)46 b(Options:)236 b(\(none\))431 1404 y(Existing)45 -b(Tags:)622 1508 y(release-1-0-patches)615 b(\(branch:)46 -b(1.4.2\))622 1612 y(release-1-0)999 b(\(revision:)45 -b(1.4\))622 1716 y(release-0-4)999 b(\(revision:)45 b(1.4\))125 -2094 y Fs(As)26 b(the)h(output)g(from)f(the)h Fn(status)e +3731 y(Sticky)46 b(Tag:)428 b(release-1-0-patches)43 +b(\(branch:)j(1.4.2\))431 3834 y(Sticky)g(Date:)380 b(\(none\))431 +3938 y(Sticky)46 b(Options:)236 b(\(none\))431 4146 y(Existing)45 +b(Tags:)622 4249 y(release-1-0-patches)615 b(\(branch:)46 +b(1.4.2\))622 4353 y(release-1-0)999 b(\(revision:)45 +b(1.4\))622 4457 y(release-0-4)999 b(\(revision:)45 b(1.4\))125 +4966 y Fs(As)26 b(the)h(output)g(from)f(the)h Fn(status)e Fs(command)i(sho)m(ws)f(the)h(branc)m(h)g(n)m(um)m(b)s(er)e(is)h -(created)i(b)m(y)f(adding)e(a)i(digit)0 2218 y(at)38 +(created)i(b)m(y)f(adding)e(a)i(digit)0 5091 y(at)38 b(the)g(tail)e(of)i(the)f(revision)f(n)m(um)m(b)s(er)g(it)h(is)f(based) h(on.)62 b(\(If)37 b(`)p Fn(release-1-0)p Fs(')e(corresp)s(onds)h(to)i -(revision)e(1.4,)0 2343 y(the)h(branc)m(h's)g(revision)e(n)m(um)m(b)s +(revision)e(1.4,)0 5215 y(the)h(branc)m(h's)g(revision)e(n)m(um)m(b)s (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 -2467 y(n)m(um)m(b)s(ers,)29 b(starting)h(at)h(2.)42 b(See)30 -b(Section)g(2.1)i([Revision)d(n)m(um)m(b)s(ers],)g(page)j(9.\).)0 -2919 y Fm(7.4)68 b(Stic)l(ky)31 b(tags)125 3193 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 Fn(checkout)d Fs(in)h(the)h(previous) -f(example)h(is)0 3318 y Fo(stic)m(ky)p Fs(,)32 b(that)g(is,)f(it)g -(will)e(apply)h(to)i(subsequen)m(t)f(commands)g(in)f(this)h(directory) --8 b(.)44 b(If)31 b(y)m(ou)h(commit)f(an)m(y)h(mo)s(di\014-)0 -3442 y(cations,)i(they)g(are)f(committed)h(on)f(the)g(branc)m(h.)49 +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 +eop +%%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)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 +Fn(checkout)d Fs(in)h(the)h(previous)f(example)h(is)0 +822 y Fo(stic)m(ky)p Fs(,)32 b(that)g(is,)f(it)g(will)e(apply)h(to)i +(subsequen)m(t)f(commands)g(in)f(this)h(directory)-8 +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 3567 y(trunk.)40 b(See)30 b(Chapter)g(8)h -([Merging],)g(page)g(53.)125 3841 y(Y)-8 b(ou)30 b(can)h(use)f(the)h +(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 Fn(status)d Fs(command)j(to)g(see)g(what)f(stic)m(ky)g(tags)i(or)e -(dates)h(are)g(set:)240 4095 y Fn($)47 b(vi)h(driver.c)141 -b(#)47 b Fs(Fix)30 b(the)h(bugs)240 4198 y Fn($)47 b(cvs)g(commit)f(-m) -i("Fixed)e(initialization)e(bug")i(driver.c)240 4302 -y(Checking)g(in)h(driver.c;)240 4406 y(/usr/local/cvsroot/yoyod)o(yne/) -o(tc/d)o(riv)o(er.c)o(,v)89 b(<--)95 b(driver.c)240 4510 +(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) +i("Fixed)e(initialization)e(bug")i(driver.c)240 1918 +y(Checking)g(in)h(driver.c;)240 2022 y(/usr/local/cvsroot/yoyod)o(yne/) +o(tc/d)o(riv)o(er.c)o(,v)89 b(<--)95 b(driver.c)240 2126 y(new)47 b(revision:)e(1.7.2.1;)h(previous)f(revision:)h(1.7)240 -4614 y(done)240 4717 y($)h(cvs)g(status)f(-v)i(driver.c)240 -4821 y(========================)o(====)o(====)o(===)o(====)o(====)o -(===)o(====)o(====)o(===)o(====)o(====)o(==)240 4925 +2230 y(done)240 2334 y($)h(cvs)g(status)f(-v)i(driver.c)240 +2437 y(========================)o(====)o(====)o(===)o(====)o(====)o +(===)o(====)o(====)o(===)o(====)o(====)o(==)240 2541 y(File:)e(driver.c)475 b(Status:)46 b(Up-to-date)431 -5132 y(Version:)570 b(1.7.2.1)46 b(Sat)h(Dec)95 b(5)47 -b(19:35:03)f(1992)431 5236 y(RCS)h(Version:)379 b(1.7.2.1)46 +2749 y(Version:)570 b(1.7.2.1)46 b(Sat)h(Dec)95 b(5)47 +b(19:35:03)f(1992)431 2852 y(RCS)h(Version:)379 b(1.7.2.1)46 b(/usr/local/cvsroot/yoyody)o(ne/t)o(c/dr)o(ive)o(r.c,)o(v)431 -5340 y(Sticky)g(Tag:)428 b(release-1-0-patches)43 b(\(branch:)j -(1.7.2\))p eop -%%Page: 52 54 -52 53 bop 0 -116 a Fs(52)2411 b(CVS|Concurren)m(t)29 -b(V)-8 b(ersions)30 b(System)431 366 y Fn(Sticky)46 b(Date:)380 -b(\(none\))431 470 y(Sticky)46 b(Options:)236 b(\(none\))431 -678 y(Existing)45 b(Tags:)622 782 y(release-1-0-patches)615 -b(\(branch:)46 b(1.7.2\))622 885 y(release-1-0)999 b(\(revision:)45 -b(1.7\))125 1263 y Fs(The)33 b(stic)m(ky)h(tags)h(will)d(remain)h(on)h +2956 y(Sticky)g(Tag:)428 b(release-1-0-patches)43 b(\(branch:)j +(1.7.2\))431 3060 y(Sticky)g(Date:)380 b(\(none\))431 +3164 y(Sticky)46 b(Options:)236 b(\(none\))431 3371 y(Existing)45 +b(Tags:)622 3475 y(release-1-0-patches)615 b(\(branch:)46 +b(1.7.2\))622 3579 y(release-1-0)999 b(\(revision:)45 +b(1.7\))125 4013 y Fs(The)33 b(stic)m(ky)h(tags)h(will)d(remain)h(on)h (y)m(our)g(w)m(orking)f(\014les)g(un)m(til)f(y)m(ou)j(delete)f(them)g -(with)f(`)p Fn(cvs)c(update)g(-A)p Fs('.)0 1388 y(The)i(`)p +(with)f(`)p Fn(cvs)c(update)g(-A)p Fs('.)0 4138 y(The)i(`)p Fn(-A)p Fs(')g(option)g(retriev)m(es)h(the)f(v)m(ersion)g(of)h(the)f (\014le)g(from)f(the)i(head)f(of)h(the)f(trunk,)g(and)g(forgets)h(an)m -(y)g(stic)m(ky)0 1512 y(tags,)g(dates,)f(or)f(options.)125 -1786 y(Stic)m(ky)21 b(tags)i(are)f(not)h(just)e(for)h(branc)m(hes.)37 +(y)g(stic)m(ky)0 4262 y(tags,)g(dates,)f(or)f(options.)125 +4593 y(Stic)m(ky)21 b(tags)i(are)f(not)h(just)e(for)h(branc)m(hes.)37 b(F)-8 b(or)23 b(example,)g(supp)s(ose)e(that)h(y)m(ou)g(w)m(an)m(t)h -(to)g(a)m(v)m(oid)f(up)s(dating)e(y)m(our)0 1911 y(w)m(orking)30 +(to)g(a)m(v)m(oid)f(up)s(dating)e(y)m(our)0 4717 y(w)m(orking)30 b(directory)-8 b(,)31 b(to)g(isolate)g(y)m(ourself)f(from)g(p)s (ossibly)e(destabilizing)g(c)m(hanges)k(other)f(p)s(eople)e(are)i -(making.)0 2035 y(Y)-8 b(ou)26 b(can,)h(of)f(course,)h(just)e(refrain)f +(making.)0 4842 y(Y)-8 b(ou)26 b(can,)h(of)f(course,)h(just)e(refrain)f (from)h(running)e Fn(cvs)30 b(update)p Fs(.)37 b(But)26 b(if)e(y)m(ou)i(w)m(an)m(t)h(to)f(a)m(v)m(oid)g(up)s(dating)e(only)h(a) -0 2160 y(p)s(ortion)j(of)i(a)g(larger)f(tree,)i(then)f(stic)m(ky)f +0 4966 y(p)s(ortion)j(of)i(a)g(larger)f(tree,)i(then)f(stic)m(ky)f (tags)i(can)f(help.)39 b(If)29 b(y)m(ou)h(c)m(hec)m(k)i(out)d(a)h -(certain)g(revision)e(\(suc)m(h)i(as)f(1.4\))0 2284 y(it)35 +(certain)g(revision)e(\(suc)m(h)i(as)f(1.4\))0 5091 y(it)35 b(will)d(b)s(ecome)k(stic)m(ky)-8 b(.)55 b(Subsequen)m(t)34 b Fn(cvs)c(update)j Fs(will)f(not)k(retriev)m(e)f(the)h(latest)f -(revision)f(un)m(til)f(y)m(ou)i(reset)0 2409 y(the)d(tag)h(with)e +(revision)f(un)m(til)f(y)m(ou)i(reset)0 5215 y(the)d(tag)h(with)e Fn(cvs)e(update)g(-A)p Fs(.)44 b(Lik)m(ewise,)32 b(use)f(of)h(the)g(`)p 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 2533 y(date)p Fs(,)e(whic)m(h,)f +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.)125 2807 y(Man)m(y)32 b(times)g(y)m(ou)h +(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 (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 2932 y(w)m(a)m(y)31 b(to)g(do)f(that)h(is)e(with)g(the)h(`)p +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 Fn(-p)p Fs(')g(option)g(to)g Fn(checkout)e Fs(or)i Fn(update)p Fs(,)f(whic)m(h)g(sends)g(the)h(con)m(ten)m(ts)i(of)f(the)f(\014le)0 -3056 y(to)g(standard)f(output.)40 b(F)-8 b(or)31 b(example,)e(supp)s +616 y(to)g(standard)f(output.)40 b(F)-8 b(or)31 b(example,)e(supp)s (ose)g(y)m(ou)h(ha)m(v)m(e)g(a)g(\014le)f(named)g(`)p Fn(file1)p Fs(')g(whic)m(h)f(existed)i(as)g(revision)0 -3181 y(1.1,)35 b(and)d(y)m(ou)h(then)g(remo)m(v)m(ed)g(it)g(\(th)m(us)f +740 y(1.1,)35 b(and)d(y)m(ou)h(then)g(remo)m(v)m(ed)g(it)g(\(th)m(us)f (adding)g(a)h(dead)g(revision)e(1.2\).)49 b(No)m(w)34 b(supp)s(ose)d(y)m(ou)i(w)m(an)m(t)h(to)f(add)f(it)0 -3305 y(again,)f(with)e(the)h(same)h(con)m(ten)m(ts)h(it)e(had)g +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 -3559 y Fn($)47 b(cvs)g(update)f(-p)i(-r)f(1.1)g(file1)f(>file1)240 -3662 y(========================)o(====)o(====)o(===)o(====)o(====)o -(===)o(====)o(====)o(===)o(====)o(====)o(==)240 3766 -y(Checking)g(out)g(file1)240 3870 y(RCS:)94 b +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 (/tmp/cvs-sanity/cvsroot/fi)o(rst)o(-dir)o(/Att)o(ic/)o(file)o(1,v)240 -3974 y(VERS:)46 b(1.1)240 4078 y(***************)240 -4181 y($)h(cvs)g(add)g(file1)240 4285 y(cvs)g(add:)g(re-adding)e(file)h +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 (file1)h(\(in)g(place)f(of)h(dead)g(revision)e(1.2\))240 -4389 y(cvs)i(add:)g(use)f('cvs)h(commit')f(to)h(add)g(this)g(file)f -(permanently)240 4493 y($)h(cvs)g(commit)f(-m)i(test)240 -4596 y(Checking)e(in)h(file1;)240 4700 y(/tmp/cvs-sanity/cvsroot/)o +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 (firs)o(t-di)o(r/f)o(ile1)o(,v)89 b(<--)95 b(file1)240 -4804 y(new)47 b(revision:)e(1.3;)i(previous)e(revision:)h(1.2)240 -4908 y(done)240 5012 y($)p eop -%%Page: 53 55 -53 54 bop 0 -116 a Fs(Chapter)30 b(8:)41 b(Merging)3018 -b(53)0 366 y Fp(8)80 b(Merging)125 788 y Fs(Y)-8 b(ou)22 +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 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 b(can)g(then)f(commit)g(that)h(revision,)e(and)g(th)m(us)h(e\013ectiv)m (ely)i(cop)m(y)f(the)f(c)m(hanges)i(on)m(to)f(another)g(branc)m(h.)0 -1446 y Fm(8.1)68 b(Merging)31 b(an)f(en)l(tire)i(branc)l(h)125 +1446 y Fm(7.1)68 b(Merging)31 b(an)f(en)l(tire)i(branc)l(h)125 1730 y Fs(Y)-8 b(ou)27 b(can)h(merge)g(c)m(hanges)h(made)e(on)h(a)f (branc)m(h)g(in)m(to)h(y)m(our)f(w)m(orking)g(cop)m(y)h(b)m(y)g(giving) e(the)h(`)p Fn(-j)j Fo(branc)m(h)p Fs(')e(\015ag)0 1854 @@ -4816,17 +4858,17 @@ Fs(of)31 b(the)g(\014le.)240 4932 y Fn($)47 b(cvs)g(commit)f(-m)i 5215 y(A)40 b(con\015ict)h(can)f(result)g(from)g(a)h(merge)g(op)s (eration.)71 b(If)40 b(that)h(happ)s(ens,)h(y)m(ou)f(should)d(resolv)m (e)j(it)f(b)s(efore)0 5340 y(committing)30 b(the)g(new)g(revision.)39 -b(See)31 b(Section)f(6.3)i([Con\015icts)d(example],)i(page)g(37.)p +b(See)31 b(Section)f(5.3)i([Con\015icts)d(example],)i(page)g(35.)p eop -%%Page: 54 56 -54 55 bop 0 -116 a Fs(54)2411 b(CVS|Concurren)m(t)29 +%%Page: 56 58 +56 57 bop 0 -116 a Fs(56)2411 b(CVS|Concurren)m(t)29 b(V)-8 b(ersions)30 b(System)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 (could)e(b)s(e)0 491 y(ac)m(hiev)m(ed)h(with)e(this:)240 744 y Fn($)47 b(cvs)g(checkout)f(-j)h(R1fix)f(mod)240 848 y($)h(cvs)g(commit)f(-m)i("Included)d(R1fix")0 1264 -y Fm(8.2)68 b(Merging)31 b(from)g(a)f(branc)l(h)g(sev)l(eral)i(times) +y Fm(7.2)68 b(Merging)31 b(from)g(a)f(branc)l(h)g(sev)l(eral)i(times) 125 1538 y Fs(Con)m(tin)m(uing)c(our)i(example,)g(the)h(revision)e (tree)i(no)m(w)f(lo)s(oks)g(lik)m(e)g(this:)240 1791 y Fn(+-----+)189 b(+-----+)g(+-----+)g(+-----+)g(+-----+)240 @@ -4865,9 +4907,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: 55 57 -55 56 bop 0 -116 a Fs(Chapter)30 b(8:)41 b(Merging)3018 -b(55)240 366 y Fn(cvs)47 b(update)f(-j)h(1.2.2.2)f(-j)h(R1fix)g(m.c)190 +%%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 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 @@ -4880,7 +4922,7 @@ b(migh)m(t)f(b)s(e)g(to)h(use)f(the)g(date)h(the)g(last)f(merge)h(w)m (then)h(use)g(that)h(tag)g(for)0 1520 y(subsequen)m(t)30 b(merges:)240 1774 y Fn(cvs)47 b(update)f(-j)h (merged_from_R1fix_to_trun)o(k)42 b(-j)47 b(R1fix)f(m.c)0 -2214 y Fm(8.3)68 b(Merging)31 b(di\013erences)g(b)t(et)l(w)l(een)h(an)l +2214 y Fm(7.3)68 b(Merging)31 b(di\013erences)g(b)t(et)l(w)l(een)h(an)l (y)e(t)l(w)l(o)i(revisions)125 2488 y Fs(With)j(t)m(w)m(o)j(`)p Fn(-j)30 b Fo(revision)p Fs(')35 b(\015ags,)j(the)f Fn(update)d Fs(\(and)i Fn(checkout)p Fs(\))f(command)h(can)g(merge)h(the)g @@ -4897,7 +4939,7 @@ b(y)m(ou)h(try)g(to)h(use)e(this)g(option)h(when)f(op)s(erating)g(on)h (e)g(up)e(a)i(mo)s(dule.)63 b(Y)-8 b(ou)0 3663 y(almost)30 b(alw)m(a)m(ys)h(use)f(sym)m(b)s(olic)f(tags)j(rather)e(than)g (revision)f(n)m(um)m(b)s(ers)f(when)i(op)s(erating)g(on)g(m)m(ultiple)e -(\014les.)0 4103 y Fm(8.4)68 b(Merging)31 b(can)f(add)g(or)h(remo)l(v)l +(\014les.)0 4103 y Fm(7.4)68 b(Merging)31 b(can)f(add)g(or)h(remo)l(v)l (e)g(\014les)125 4377 y Fs(If)39 b(the)g(c)m(hanges)i(whic)m(h)d(y)m (ou)i(are)g(merging)f(in)m(v)m(olv)m(e)h(remo)m(ving)f(or)h(adding)e (some)i(\014les,)h Fn(update)29 b(-j)39 b Fs(will)0 4501 @@ -4906,16 +4948,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: 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)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: 57 59 -57 58 bop 0 -116 a Fs(Chapter)30 b(9:)41 b(Recursiv)m(e)30 -b(b)s(eha)m(vior)2591 b(57)0 366 y Fp(9)80 b(Recursiv)l(e)30 +%%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 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 @@ -4951,25 +4993,25 @@ 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: 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)p eop -%%Page: 59 61 -59 60 bop 0 -116 a Fs(Chapter)30 b(10:)41 b(Adding)29 -b(\014les)g(to)i(a)g(directory)2252 b(59)0 366 y Fp(10)80 -b(Adding)30 b(\014les)g(to)g(a)g(directory)125 756 y +%%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 +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 -b Fs(Y)-8 b(ou)30 b(m)m(ust)g(ha)m(v)m(e)h(a)g(w)m(orking)e(cop)m(y)h -(of)g(the)g(directory)-8 b(.)41 b(See)30 b(Section)g(3.1)h([Getting)f -(the)h(source],)f(page)h(11.)75 1185 y Fq(\017)60 b Fs(Create)31 +b Fs(Y)-8 b(ou)31 b(m)m(ust)f(ha)m(v)m(e)i(a)e(w)m(orking)g(cop)m(y)h +(of)g(the)f(directory)-8 b(.)41 b(See)31 b(Section)f(2.1)h([Getting)h +(the)e(source],)h(page)g(9.)75 1185 y Fq(\017)60 b Fs(Create)31 b(the)g(new)f(\014le)f(inside)f(y)m(our)i(w)m(orking)g(cop)m(y)h(of)g (the)f(directory)-8 b(.)75 1338 y Fq(\017)60 b Fs(Use)28 b(`)p Fn(cvs)i(add)f Fo(\014lename)5 b Fs(')28 b(to)g(tell)f Fr(cvs)g Fs(that)h(y)m(ou)g(w)m(an)m(t)h(to)f(v)m(ersion)g(con)m(trol)g (the)g(\014le.)39 b(If)27 b(the)h(\014le)f(con)m(tains)180 1462 y(binary)i(data,)i(sp)s(ecify)e(`)p Fn(-kb)p Fs(')h(\(see)h -(Chapter)f(18)h([Binary)f(\014les],)g(page)h(81\).)75 +(Chapter)f(17)h([Binary)f(\014les],)g(page)h(83\).)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 @@ -4993,19 +5035,19 @@ 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(110.)240 3914 y(The)h(added)g(\014les)g(are)i +([imp)s(ort],)f(page)h(112.)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 Fs(on)g(a)h(\014le)e(that)i(w)m(as)g(remo)m(v)m(ed)g(with)e(the)i Fn(remove)240 4163 y Fs(command)c(will)e(undo)h(the)h(e\013ect)i(of)e (the)h Fn(remove)p Fs(,)f(unless)f(a)h Fn(commit)f Fs(command)h(in)m -(terv)m(ened.)240 4288 y(See)31 b(Chapter)e(11)j([Remo)m(ving)e -(\014les],)g(page)h(61,)h(for)e(an)g(example.)240 4565 +(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 y(The)36 b(`)p Fn(-k)p Fs(')h(option)g(sp)s(eci\014es)f(the)h(default)f (w)m(a)m(y)i(that)f(this)f(\014le)g(will)f(b)s(e)h(c)m(hec)m(k)m(ed)j -(out;)i(for)c(more)240 4689 y(information)29 b(see)i(Section)f(17.4)i -([Substitution)c(mo)s(des],)i(page)h(79.)240 4966 y(The)41 +(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 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 @@ -5015,10 +5057,10 @@ b(will)d(also)k(b)s(e)240 5215 y(sa)m(v)m(ed)31 b(in)f(the)g(v)m 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: 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)240 366 y(See)c(Section)h(A.5)g([admin],)f -(page)h(95.)40 b(If)26 b(y)m(ou)g(omit)g(the)h(`)p Fn(-m)j +(page)h(97.)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 @@ -5026,16 +5068,16 @@ b(example,)f(the)h(follo)m(wing)d(commands)i(add)g(the)h(\014le)e(`)p Fn(backend.c)p Fs(')g(to)i(the)f(rep)s(ository:)240 1068 y Fn($)47 b(cvs)g(add)g(backend.c)240 1172 y($)g(cvs)g(commit)f(-m)i ("Early)e(version.)f(Not)i(yet)g(compilable.")e(backend.c)125 -1446 y Fs(When)d(y)m(ou)i(add)e(a)i(\014le)e(it)g(is)g(added)h(only)f -(on)h(the)g(branc)m(h)g(whic)m(h)e(y)m(ou)j(are)f(w)m(orking)g(on)g -(\(see)h(Chap-)0 1570 y(ter)33 b(7)h([Branc)m(hes],)h(page)f(47\).)50 -b(Y)-8 b(ou)33 b(can)h(later)f(merge)h(the)f(additions)e(to)j(another)f -(branc)m(h)g(if)f(y)m(ou)h(w)m(an)m(t)h(\(see)0 1695 -y(Section)c(8.4)i([Merging)e(adds)g(and)g(remo)m(v)-5 -b(als],)31 b(page)g(55\).)p eop -%%Page: 61 63 -61 62 bop 0 -116 a Fs(Chapter)30 b(11:)41 b(Remo)m(ving)31 -b(\014les)2720 b(61)0 366 y Fp(11)80 b(Remo)l(ving)29 +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 +(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(\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 @@ -5044,8 +5086,8 @@ b(New)39 b(\014les)e(are)i(added,)h(and)e(old)g(\014les)f(disapp)s (\014le,)g(but)g(remain)f(able)h(to)h(retriev)m(e)g(old)e(revisions:)75 1404 y Fq(\017)60 b Fs(Mak)m(e)30 b(sure)d(that)i(y)m(ou)g(ha)m(v)m(e)g (not)f(made)h(an)m(y)f(uncommitted)g(mo)s(di\014cations)e(to)j(the)f -(\014le.)39 b(See)29 b(Section)f(3.4)180 1529 y([Viewing)f -(di\013erences],)i(page)g(13,)h(for)e(one)h(w)m(a)m(y)g(to)g(do)f +(\014le.)39 b(See)29 b(Section)f(2.4)180 1529 y([Viewing)f +(di\013erences],)i(page)g(11,)h(for)e(one)h(w)m(a)m(y)g(to)g(do)f (that.)41 b(Y)-8 b(ou)29 b(can)g(also)f(use)g(the)h Fn(status)d Fs(or)j Fn(update)180 1653 y Fs(command.)44 b(If)31 b(y)m(ou)h(remo)m (v)m(e)h(the)f(\014le)f(without)f(committing)i(y)m(our)f(c)m(hanges,)i @@ -5092,8 +5134,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: 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)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 @@ -5108,17 +5150,17 @@ m(e)g(b)s(efore)g(y)m(ou)h(run)d(the)j Fn(remove)d Fs(command)i(y)m(ou) h(can)f(use)g Fn(update)e Fs(to)j(resurrect)0 1973 y(the)31 b(\014le:)240 2226 y Fn($)47 b(rm)h(oj.c)240 2330 y($)f(cvs)g(update)f (oj.c)240 2434 y(cvs)h(update:)f(warning:)f(oj.c)i(was)g(lost)240 -2538 y(U)g(oj.c)125 2811 y Fs(When)30 b(y)m(ou)g(remo)m(v)m(e)i(a)f -(\014le)f(it)g(is)f(remo)m(v)m(ed)i(only)f(on)g(the)h(branc)m(h)f(whic) -m(h)f(y)m(ou)h(are)h(w)m(orking)f(on)g(\(see)i(Chap-)0 -2936 y(ter)i(7)h([Branc)m(hes],)h(page)f(47\).)53 b(Y)-8 -b(ou)35 b(can)f(later)g(merge)h(the)f(remo)m(v)-5 b(als)35 -b(to)g(another)f(branc)m(h)f(if)h(y)m(ou)g(w)m(an)m(t)h(\(see)0 -3061 y(Section)30 b(8.4)i([Merging)e(adds)g(and)g(remo)m(v)-5 -b(als],)31 b(page)g(55\).)p eop -%%Page: 63 65 -63 64 bop 0 -116 a Fs(Chapter)30 b(12:)41 b(Remo)m(ving)31 -b(directories)2462 b(63)0 366 y Fp(12)80 b(Remo)l(ving)29 +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 +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 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 @@ -5145,12 +5187,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: 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)p eop -%%Page: 65 67 -65 66 bop 0 -116 a Fs(Chapter)30 b(13:)41 b(T)-8 b(rac)m(king)31 -b(third-part)m(y)e(sources)2168 b(65)0 366 y Fp(13)80 +%%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 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 @@ -5176,7 +5218,7 @@ Fn(import)0 2322 y Fs(the)k(v)m(endor)g(branc)m(h)f(is)f(made)i(the)g (a)g(cop)m(y)g(of)g(the)g(\014le)f(gets)0 2447 y(that)f(revision.)50 b(When)33 b(a)i(lo)s(cal)e(mo)s(di\014cation)g(is)g(committed)h(it)g (is)f(placed)g(on)h(the)g(main)f(trunk,)h(and)g(made)0 -2571 y(the)d(`head')f(revision.)0 3034 y Fm(13.1)68 b(Imp)t(orting)31 +2571 y(the)d(`head')f(revision.)0 3034 y Fm(12.1)68 b(Imp)t(orting)31 b(a)g(mo)t(dule)f(for)h(the)g(\014rst)f(time)125 3309 y Fs(Use)h(the)h Fn(import)d Fs(command)i(to)h(c)m(hec)m(k)h(in)d(the)i (sources)f(for)g(the)h(\014rst)e(time.)43 b(When)32 b(y)m(ou)f(use)g @@ -5186,7 +5228,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(111.\).)50 +3683 y(Section)j(A.11.1)h([imp)s(ort)e(options],)h(page)g(113.\).)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 @@ -5196,8 +5238,8 @@ Fs(do)s(es)h Fo(not)j Fs(c)m(hange)f(the)f(directory)f(in)g(whic)m(h)f Fr(cvs)e Fs(w)m(orking)h(directory;)g(if)f(y)m(ou)i(w)m(an)m(t)g(to)g (w)m(ork)f(with)f(the)h(sources)h(imp)s(ort)0 4332 y(them)f(\014rst)f (and)g(then)g(c)m(hec)m(k)j(them)d(out)h(in)m(to)g(a)g(di\013eren)m(t)f -(directory)h(\(see)g(Section)g(3.1)h([Getting)f(the)g(source],)0 -4457 y(page)h(11\).)125 4732 y(Supp)s(ose)24 b(y)m(ou)i(ha)m(v)m(e)h +(directory)h(\(see)g(Section)g(2.1)h([Getting)f(the)g(source],)0 +4457 y(page)h(9\).)125 4732 y(Supp)s(ose)24 b(y)m(ou)i(ha)m(v)m(e)h (the)f(sources)g(to)g(a)h(program)e(called)g Fn(wdiff)g Fs(in)f(a)i(directory)g(called)f(`)p Fn(wdiff-0.04)p Fs(',)g(and)0 4857 y(are)35 b(going)g(to)h(mak)m(e)g(priv)-5 @@ -5208,12 +5250,12 @@ 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: 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)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 -491 y(`)p Fn(WDIFF_0_04)p Fs('.)0 925 y Fm(13.2)68 b(Up)t(dating)31 +491 y(`)p Fn(WDIFF_0_04)p Fs('.)0 925 y Fm(12.2)68 b(Up)t(dating)31 b(a)g(mo)t(dule)f(with)h(the)g(imp)t(ort)g(command)125 1199 y Fs(When)23 b(a)h(new)f(release)g(of)h(the)g(source)f(arriv)m (es,)i(y)m(ou)f(imp)s(ort)e(it)h(in)m(to)g(the)h(rep)s(ository)e(with)g @@ -5239,8 +5281,8 @@ Fn(wdiff)p Fs(',)f(merging)g(the)h(c)m(hanges)g(made)f(on)h(the)0 (esterda)m(y)i(in)m(to)f(the)h(w)m(orking)e(cop)m(y)-8 b(.)50 b(If)32 b(an)m(y)i(con\015icts)e(arise)h(during)e(the)0 3208 y(merge)37 b(they)f(should)e(b)s(e)i(resolv)m(ed)g(in)f(the)h -(normal)g(w)m(a)m(y)h(\(see)g(Section)f(6.3)h([Con\015icts)f(example],) -i(page)e(37\).)0 3333 y(Then,)30 b(the)g(mo)s(di\014ed)e(\014les)i(ma)m +(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 (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 @@ -5248,7 +5290,7 @@ b(p)s(er)h(da)m(y)-8 b(.)41 b(If)30 b(y)m(ou)h(do,)f(y)m(ou)h(can)g (alw)m(a)m(ys)f(use)h(something)e(lik)m(e)h(this)f(instead:)240 3984 y Fn($)47 b(cvs)g(checkout)f(-jWDIFF_0_04)e(-jWDIFF_0_05)h(wdiff)0 4258 y Fs(In)30 b(this)f(case,)j(the)e(t)m(w)m(o)i(ab)s(o)m(v)m(e)f -(commands)f(are)h(equiv)-5 b(alen)m(t.)0 4692 y Fm(13.3)68 +(commands)f(are)h(equiv)-5 b(alen)m(t.)0 4692 y Fm(12.3)68 b(Rev)l(erting)33 b(to)d(the)h(latest)h(v)l(endor)f(release)125 4966 y Fs(Y)-8 b(ou)26 b(can)g(also)f(rev)m(ert)h(lo)s(cal)f(c)m (hanges)i(completely)e(and)g(return)g(to)h(the)g(latest)g(v)m(endor)g @@ -5260,34 +5302,34 @@ 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: 67 69 -67 68 bop 0 -116 a Fs(Chapter)30 b(13:)41 b(T)-8 b(rac)m(king)31 -b(third-part)m(y)e(sources)2168 b(67)240 366 y Fn($)47 +%%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 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(95.)0 1317 y Fm(13.4)68 b(Ho)l(w)31 b(to)g(handle)g +869 y(page)31 b(97.)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: 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)p eop -%%Page: 69 71 -69 70 bop 0 -116 a Fs(Chapter)30 b(14:)41 b(Mo)m(ving)31 -b(and)f(renaming)f(\014les)2244 b(69)0 366 y Fp(14)80 +%%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 b(Mo)l(ving)30 b(and)g(renaming)g(\014les)125 743 y Fs(Mo)m(ving)39 b(\014les)e(to)j(a)f(di\013eren)m(t)f(directory)g(or)h(renaming)f(them) g(is)g(not)h(di\016cult,)g(but)f(some)h(of)g(the)g(w)m(a)m(ys)0 867 y(in)e(whic)m(h)g(this)g(w)m(orks)h(ma)m(y)h(b)s(e)e(non-ob)m (vious.)64 b(\(Mo)m(ving)39 b(or)f(renaming)f(a)i(directory)e(is)h(ev)m -(en)g(harder.)64 b(See)0 992 y(Chapter)30 b(15)h([Mo)m(ving)g -(directories],)f(page)h(73.\).)125 1266 y(The)e(examples)h(b)s(elo)m(w) +(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) g(assume)g(that)h(the)g(\014le)e Fo(old)k Fs(is)d(renamed)f(to)j -Fo(new)p Fs(.)0 1720 y Fm(14.1)68 b(The)30 b(Normal)i(w)l(a)l(y)f(to)g +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 @@ -5312,7 +5354,7 @@ Fn(cvs)29 b(log)g Fo(old)40 b Fs(will)33 b(giv)m(e)0 (um)m(b)s(ers)h(will)f(start)j(at)g(1.0)g(again,)g(so)f(if)g(that)h(b)s (others)e(y)m(ou,)i(use)0 3856 y(the)h(`)p Fn(-r)f(rev)p Fs(')f(option)h(to)h(commit)g(\(see)g(Section)f(A.7.1)i([commit)e -(options],)h(page)g(102\))0 4309 y Fm(14.2)68 b(Mo)l(ving)31 +(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 @@ -5320,8 +5362,8 @@ b(the)g(history)g(\014le)125 4583 y Fs(This)g(metho)s(d)j(is)e(more)i 4962 y Fn($)47 b(cd)h($CVSROOT/)p Fo(mo)s(dule)240 5065 y Fn($)f(mv)h Fo(old)p Fn(,v)e Fo(new)p Fn(,v)0 5340 y Fs(Adv)-5 b(an)m(tages:)p eop -%%Page: 70 72 -70 71 bop 0 -116 a Fs(70)2411 b(CVS|Concurren)m(t)29 +%%Page: 72 74 +72 73 bop 0 -116 a Fs(72)2411 b(CVS|Concurren)m(t)29 b(V)-8 b(ersions)30 b(System)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) @@ -5337,7 +5379,7 @@ b Fs(Nast)m(y)30 b(things)f(migh)m(t)g(happ)s(en)e(if)h(someone)i (accesses)h(the)f(history)e(\014le)g(while)f(y)m(ou)j(are)f(mo)m(ving)g (it.)40 b(Mak)m(e)180 1639 y(sure)30 b(no)g(one)h(else)f(runs)f(an)m(y) h(of)h(the)f Fr(cvs)g Fs(commands)g(while)e(y)m(ou)j(mo)m(v)m(e)h(it.)0 -2091 y Fm(14.3)68 b(Cop)l(ying)31 b(the)g(history)g(\014le)125 +2091 y Fm(13.3)68 b(Cop)l(ying)31 b(the)g(history)g(\014le)125 2365 y Fs(This)f(w)m(a)m(y)j(also)f(in)m(v)m(olv)m(es)g(direct)g(mo)s (di\014cations)e(to)j(the)g(rep)s(ository)-8 b(.)45 b(It)32 b(is)g(safe,)h(but)e(not)i(without)e(dra)m(w-)0 2490 @@ -5365,29 +5407,29 @@ Fo(date)5 b Fs(')41 b(to)180 5040 y(retriev)m(e)31 b(the)f(revisions.) (tained)f(in)m(tact.)75 5340 y Fq(\017)60 b Fs(The)30 b(revision)e(n)m(um)m(b)s(ers)h(are)i(not)g(a\013ected.)p eop -%%Page: 71 73 -71 72 bop 0 -116 a Fs(Chapter)30 b(14:)41 b(Mo)m(ving)31 -b(and)f(renaming)f(\014les)2244 b(71)0 366 y(Disadv)-5 +%%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 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(102\))i(\015ag)e(when)g Fo(new)41 b Fs(is)180 +(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: 72 74 -72 73 bop 0 -116 a Fs(72)2411 b(CVS|Concurren)m(t)29 +%%Page: 74 76 +74 75 bop 0 -116 a Fs(74)2411 b(CVS|Concurren)m(t)29 b(V)-8 b(ersions)30 b(System)p eop -%%Page: 73 75 -73 74 bop 0 -116 a Fs(Chapter)30 b(15:)41 b(Mo)m(ving)31 -b(and)f(renaming)f(directories)1986 b(73)0 366 y Fp(15)80 +%%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 b(Mo)l(ving)30 b(and)g(renaming)g(directories)125 740 y Fs(The)40 b(normal)f(w)m(a)m(y)j(to)f(rename)g(or)f(mo)m(v)m(e)j(a)e (directory)f(is)f(to)j(rename)e(or)h(mo)m(v)m(e)h(eac)m(h)g(\014le)d -(within)g(it)h(as)0 865 y(describ)s(ed)29 b(in)h(Section)h(14.1)i -([Outside],)e(page)h(69.)44 b(Then)30 b(c)m(hec)m(k)j(out)f(with)e(the) +(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) h(`)p Fn(-P)p Fs(')g(option,)h(as)f(describ)s(ed)e(in)0 -989 y(Chapter)h(12)h([Remo)m(ving)g(directories],)f(page)h(63.)125 +989 y(Chapter)h(11)h([Remo)m(ving)g(directories],)f(page)h(65.)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 @@ -5415,31 +5457,31 @@ 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: 74 76 -74 75 bop 0 -116 a Fs(74)2411 b(CVS|Concurren)m(t)29 +%%Page: 76 78 +76 77 bop 0 -116 a Fs(76)2411 b(CVS|Concurren)m(t)29 b(V)-8 b(ersions)30 b(System)p eop -%%Page: 75 77 -75 76 bop 0 -116 a Fs(Chapter)30 b(16:)41 b(History)30 -b(bro)m(wsing)2622 b(75)0 366 y Fp(16)80 b(History)31 +%%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 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 867 y(and)i(b)m(y)g(whom,)g(there)h(are)f(a)h(v)-5 b(ariet)m(y)31 b(of)f(mec)m(hanisms)g(for)g(lo)s(oking)f(through)h(the)g(history)-8 -b(.)0 1319 y Fm(16.1)68 b(Log)31 b(messages)125 1594 +b(.)0 1319 y Fm(15.1)68 b(Log)31 b(messages)125 1594 y Fs(Whenev)m(er)g(y)m(ou)f(commit)h(a)f(\014le)g(y)m(ou)g(sp)s(ecify)g (a)g(log)h(message.)125 1868 y(T)-8 b(o)33 b(lo)s(ok)g(through)f(the)h (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(113\).)0 2445 y Fm(16.2)68 +(Section)f(A.12)i([log],)f(page)g(114\).)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 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(108\).)0 3421 y Fm(16.3)68 +2969 y([history],)g(page)h(110\).)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 @@ -5461,8 +5503,8 @@ b(or)36 b(a)h(more)f(\015exible)f(w)m(a)m(y)i(of)0 4443 y(giving)d(noti\014cations)h(to)h(v)-5 b(arious)35 b(users,)h(whic)m(h) e(requires)g(less)h(in)f(the)i(w)m(a)m(y)h(of)e(k)m(eeping)h(cen)m (tralized)f(scripts)0 4567 y(up)f(to)i(date,)h(use)e(the)h -Fn(cvs)29 b(watch)g(add)34 b Fs(command)h(\(see)h(Section)g(6.6.2)g -([Getting)h(Noti\014ed],)f(page)g(42\);)j(this)0 4692 +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 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 @@ -5475,14 +5517,14 @@ Fs(')f(\014le)h(de\014nes)g(programs)h(to)h(execute)g(when)e(someone)i 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: 76 78 -76 77 bop 0 -116 a Fs(76)2411 b(CVS|Concurren)m(t)29 +%%Page: 78 80 +78 79 bop 0 -116 a Fs(78)2411 b(CVS|Concurren)m(t)29 b(V)-8 b(ersions)30 b(System)0 366 y Fn(-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 Fo(\014lename)j(revision)p Fs(.)43 b(A)31 b(non-zero)0 491 y(exit)f(of)h(the)f(\014lter)g(program)g(will)e(cause)j(the)f(tag)i -(to)f(b)s(e)f(ab)s(orted.)0 939 y Fm(16.4)68 b(Annotate)31 +(to)f(b)s(e)f(ab)s(orted.)0 939 y Fm(15.4)68 b(Annotate)31 b(command)3391 1263 y Fs(Command)-3801 b Fj(cvs)39 b(annotate)k Fi([)p Fn(-lf)p Fi(])30 b([)p Fn(-r)g(rev|-D)f(date)p Fi(])h Fo(\014les)f Fh(:)15 b(:)g(:)240 1388 y Fs(F)-8 @@ -5504,16 +5546,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(105\).)125 3276 y(The)i(options)h(to) +2953 y([di\013)7 b(],)30 b(page)h(106\).)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 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 -(92.)p eop -%%Page: 77 79 -77 78 bop 0 -116 a Fs(Chapter)30 b(17:)41 b(Keyw)m(ord)30 -b(substitution)2437 b(77)0 366 y Fp(17)80 b(Keyw)l(ord)29 +(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 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 @@ -5531,21 +5573,21 @@ Fo(k)m(eyw)m(ord)t Fn($)h Fs(and)f Fn($)p Fo(k)m(eyw)m(ord)t Fn(:)p Fh(:)15 b(:)g(:)q Fn($)32 b Fs(in)g(a)h(\014le)f(are)i(replaced) e(with)0 1515 y(strings)d(of)i(the)f(form)g Fn($)p Fo(k)m(eyw)m(ord)t Fn(:)p Fo(v)-5 b(alue)5 b Fn($)29 b Fs(whenev)m(er)i(y)m(ou)f(obtain)g -(a)h(new)f(revision)e(of)j(the)g(\014le.)0 1968 y Fm(17.1)68 +(a)h(new)f(revision)e(of)j(the)g(\014le.)0 1968 y Fm(16.1)68 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/18 02:05:33 $)192 b Fs(The)30 +(in)c(the)h(revision.)0 2743 y Fn($Date: 1997/03/29 04:45:27 $)192 b Fs(The)30 b(date)h(and)f(time)g(\(UTC\))g(the)h(revision)d(w)m(as)j(c)m(hec)m(k)m -(ed)h(in.)0 2918 y Fn($Header: /cvs/OpenBSD/src/gnu/usr.bin/cvs/doc/cvs.ps,v 1.1.1.7 1997/03/18 02:05:33 tholo Exp $)96 b Fs(A)33 b(standard)g(header)g(con)m +(ed)h(in.)0 2918 y Fn($Header: /cvs/OpenBSD/src/gnu/usr.bin/cvs/doc/cvs.ps,v 1.1.1.8 1997/03/29 04:45:27 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.7 1997/03/18 02:05:33 tholo Exp $)288 b -Fs(Same)30 b(as)h Fn($Header: /cvs/OpenBSD/src/gnu/usr.bin/cvs/doc/cvs.ps,v 1.1.1.7 1997/03/18 02:05:33 tholo Exp $)p Fs(,)d(except)k(that)f(the)f +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: /cvs/OpenBSD/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 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 @@ -5553,8 +5595,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.7 1997/03/18 02:05:33 tholo -(using)e Fr(cvs)p Fs(\).)0 3993 y Fn(Files missed from previous import +(using)e Fr(cvs)p Fs(\).)0 3993 y Fn(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()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 @@ -5567,29 +5609,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(95.)480 4616 y(This)28 b(k)m(eyw)m(ord)i(is)f +(options],)j(page)f(97.)480 4616 y(This)28 b(k)m(eyw)m(ord)i(is)f (useful)f(for)h(accum)m(ulating)h(a)g(complete)g(c)m(hange)h(log)f(in)e (a)i(source)g(\014le,)f(but)g(for)480 4740 y(sev)m(eral)i(reasons)f(it) -g(can)h(b)s(e)e(problematic.)40 b(See)31 b(Section)f(17.5)i([Log)f(k)m -(eyw)m(ord],)g(page)h(80.)0 4916 y Fn($RCSfile: cvs.ps,v $)480 5040 +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 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.7 $)480 5340 y Fs(The)f(revision)e(n)m(um)m(b)s(er)i +5215 y Fn($Revision: 1.1.1.8 $)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: 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($Source: /cvs/OpenBSD/src/gnu/usr.bin/cvs/doc/cvs.ps,v $)96 b Fs(The)30 b(full)e(pathname)i(of)h(the)f(R)m(CS)g(\014le.)0 543 y Fn($State: Exp $)144 b Fs(The)39 b(state)i(assigned)e(to)h(the)g (revision.)67 b(States)41 b(can)f(b)s(e)f(assigned)g(with)f Fn(cvs)29 b(admin)g(-s)p Fs(|See)480 667 y(Section)h(A.5.1)i([admin)d -(options],)h(page)h(95.)0 1124 y Fm(17.2)68 b(Using)31 +(options],)h(page)h(97.)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.7 1997/03/18 02:05:33 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.8 1997/03/29 04:45:27 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.7 1997/03/18 02:05:33 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.8 1997/03/29 04:45:27 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 @@ -5615,7 +5657,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.7 1997/03/18 02:05:33 tholo Exp $)240 +y($Id: cvs.ps,v 1.1.1.8 1997/03/29 04:45:27 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 @@ -5629,11 +5671,11 @@ 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: 79 81 -79 80 bop 0 -116 a Fs(Chapter)30 b(17:)41 b(Keyw)m(ord)30 -b(substitution)2437 b(79)240 366 y Fn(static)46 b(char)h(*id="@\(#\))e -($Id: cvs.ps,v 1.1.1.7 1997/03/18 02:05:33 tholo Exp $";)0 -786 y Fm(17.3)68 b(Av)l(oiding)31 b(substitution)125 +%%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 +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) f(literal)f(text)i(string)0 1185 y(`)p Fn($Author: tholo $)p @@ -5643,8 +5685,8 @@ Fr(r)n(cs)h Fs(in)m(terpreting)f(it)h(as)h(a)g(k)m(eyw)m(ord)g(and)f Fn($Author: tholo $)p Fs('.)125 1583 y(There)k(is)g(unfortunately)g (no)h(w)m(a)m(y)h(to)g(selectiv)m(ely)f(turn)f(o\013)i(k)m(eyw)m(ord)g (substitution.)49 b(Y)-8 b(ou)35 b(can)f(use)g(`)p Fn(-ko)p -Fs(')0 1708 y(\(see)d(Section)g(17.4)g([Substitution)d(mo)s(des],)j -(page)g(79\))g(to)g(turn)f(o\013)h(k)m(eyw)m(ord)f(substitution)e(en)m +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 (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 @@ -5654,7 +5696,7 @@ Fs(')d(whenev)m(er)j(the)0 2231 y(text)37 b(`)p Fn($Author: tholo $)p Fs(')c(should)h(app)s(ear.)55 b(In)35 b Fn(nroff)f Fs(and)h Fn(troff)f Fs(y)m(ou)i(can)g(em)m(b)s(ed)f(the)h(n)m(ull-c)m(haracter)f Fn(\\&)g Fs(inside)0 2355 y(the)c(k)m(eyw)m(ord)f(for)h(a)f(similar)e -(e\013ect.)0 2775 y Fm(17.4)68 b(Substitution)31 b(mo)t(des)125 +(e\013ect.)0 2775 y Fm(16.4)68 b(Substitution)31 b(mo)t(des)125 3049 y Fs(Eac)m(h)g(\014le)f(has)h(a)g(stored)g(default)f(substitution) e(mo)s(de,)j(and)g(eac)m(h)h(w)m(orking)e(directory)g(cop)m(y)i(of)f(a) g(\014le)f(also)0 3173 y(has)d(a)g(substitution)e(mo)s(de.)39 @@ -5664,7 +5706,7 @@ Fs(;)e(the)h(latter)0 3298 y(is)e(set)h(b)m(y)g(the)g(-k)g(or)g(-A)g (options)f(to)i Fn(cvs)h(checkout)c Fs(or)i Fn(cvs)i(update)p Fs(.)38 b Fn(cvs)29 b(diff)d Fs(also)h(has)f(a)h(`)p Fn(-k)p Fs(')g(option.)39 b(F)-8 b(or)0 3423 y(some)31 -b(examples,)f(See)h(Chapter)e(18)j([Binary)d(\014les],)h(page)h(81.)125 +b(examples,)f(See)h(Chapter)e(17)j([Binary)d(\014les],)h(page)h(83.)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 @@ -5678,8 +5720,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.7 $)f Fs(instead)h(of)i -Fn($Revision: 1.1.1.7 $)p Fs(.)480 4806 y(This)c(option)g(is)h(useful)e +(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 (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 @@ -5687,12 +5729,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.7 $)c Fs(instead)480 5340 y(of)31 -b Fn($Revision: 1.1.1.7 $)g Fs(if)f(that)i(is)e(ho)m(w)i(the)f(string)g +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 (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: 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(`)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 @@ -5703,12 +5745,12 @@ e(to)j(the)480 616 y(op)s(erating)33 b(system)g(in)f(use)h(on)g(the)g (use)h(linefeed)f(only)480 740 y(to)g(terminate)g(lines,)e(this)g(is)g (the)i(same)g(as)g(`)p Fn(-ko)p Fs('.)43 b(F)-8 b(or)32 b(more)g(information)e(on)h(binary)e(\014les,)i(see)480 -865 y(Chapter)f(18)h([Binary)f(\014les],)g(page)h(81.)0 +865 y(Chapter)f(17)h([Binary)f(\014les],)g(page)h(83.)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.7 $)p Fs(.)38 +Fs(instead)h(of)g Fn($Revision: 1.1.1.8 $)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 @@ -5718,23 +5760,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(107.)480 1811 +b(Section)i(A.9)h([exp)s(ort],)h(page)e(108.)480 1811 y(But)31 b(b)s(e)e(a)m(w)m(are)j(that)f(do)s(esn't)f(handle)f(an)h(exp) s(ort)h(con)m(taining)e(binary)g(\014les)g(correctly)-8 -b(.)0 2259 y Fm(17.5)68 b(Problems)31 b(with)g(the)g($Log: cvs.ps,v $ -b(.)0 2259 y Fm(17.5)68 b(Problems)31 b(with)g(the)g(Revision 1.1.1.7 1997/03/18 02:05:33 tholo -b(.)0 2259 y Fm(17.5)68 b(Problems)31 b(with)g(the)g(Files missed from previous import -b(.)0 2259 y Fm(17.5)68 b(Problems)31 b(with)g(the)g()g(k)l(eyw)l +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()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.7 1997/03/18 02:05:33 tholo -(ord.)125 2533 y Fs(The)25 b Fn(Files missed from previous import +(ord.)125 2533 y Fs(The)25 b Fn(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()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.7 1997/03/18 02:05:33 tholo -(en)h(if)e(y)m(ou)i(do)f(not)g(use)g(the)h Fn(Files missed from previous import +(en)h(if)e(y)m(ou)i(do)f(not)g(use)g(the)h Fn(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()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 @@ -5742,8 +5784,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.7 1997/03/18 02:05:33 tholo -b Fn(Files missed from previous import +b Fn(Revision 1.1.1.8 1997/03/29 04:45:27 tholo +b Fn(Latest release from Cyclic Software 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 @@ -5756,17 +5798,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.7 1997/03/18 02:05:33 tholo -i(that)f(the)g Fn(Files missed from previous import +i(that)f(the)g Fn(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()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: 81 83 -81 82 bop 0 -116 a Fs(Chapter)30 b(18:)41 b(Handling)29 -b(binary)f(\014les)2469 b(81)0 366 y Fp(18)80 b(Handling)31 +%%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 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) @@ -5778,7 +5820,7 @@ g(example,)g(carriage)h(return)0 1219 y(follo)m(w)m(ed)i(b)m(y)g(line)f (feed)h(for)h(Windo)m(ws)e(NT\).)125 1515 y(The)i(second)i(is)e(that)i (a)g(binary)d(\014le)i(migh)m(t)g(happ)s(en)e(to)j(con)m(tain)g(data)g (whic)m(h)e(lo)s(oks)h(lik)m(e)f(a)i(k)m(eyw)m(ord)g(\(see)0 -1639 y(Chapter)d(17)h([Keyw)m(ord)f(substitution],)f(page)i(77\),)h(so) +1639 y(Chapter)d(16)h([Keyw)m(ord)f(substitution],)f(page)i(79\),)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) @@ -5793,13 +5835,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.7 1997/03/18 02:05:33 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.8 1997/03/29 04:45:27 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.7 1997/03/18 02:05:33 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.8 1997/03/29 04:45:27 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 @@ -5822,8 +5864,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: 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)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 @@ -5842,10 +5884,10 @@ 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: 83 85 -83 84 bop 0 -116 a Fs(Chapter)30 b(19:)41 b(Ho)m(w)31 +%%Page: 85 87 +85 86 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(83)0 366 y Fp(19)80 b(Ho)l(w)29 b(y)l(our)h(build)h(system)d(in)l +b(85)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 @@ -5884,7 +5926,7 @@ m(y)e(is)h(sometimes)g(called)g Fo(bill)d(of)k(materials)j Fs(or)c(something)g(similar.)38 b(The)29 b(b)s(est)g(w)m(a)m(y)0 2907 y(to)35 b(do)g(this)f(with)f Fr(cvs)h Fs(is)g(to)h(use)f(the)h Fn(tag)f Fs(command)h(to)g(record)g(whic)m(h)e(v)m(ersions)h(w)m(en)m -(t)i(in)m(to)e(a)h(giv)m(en)g(build)0 3031 y(\(see)c(Section)g(7.1)g +(t)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 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 @@ -5912,17 +5954,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: 84 86 -84 85 bop 0 -116 a Fs(84)2411 b(CVS|Concurren)m(t)29 +%%Page: 86 88 +86 87 bop 0 -116 a Fs(86)2411 b(CVS|Concurren)m(t)29 b(V)-8 b(ersions)30 b(System)p eop -%%Page: 85 87 -85 86 bop 0 -116 a Fs(Chapter)30 b(20:)41 b(Compatibilit)m(y)28 -b(b)s(et)m(w)m(een)j(CVS)f(V)-8 b(ersions)1822 b(85)0 -366 y Fp(20)80 b(Compatibilit)l(y)31 b(b)t(et)l(w)l(een)d(CVS)h(V)-13 +%%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 +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(6.6.5)i([W)-8 b(atc)m(hes)0 -865 y(Compatibilit)m(y],)34 b(page)i(45,)i(if)c(y)m(ou)h(ha)m(v)m(e)i +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 (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) @@ -5943,12 +5985,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: 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(21:)41 b(Revision)29 -b(managemen)m(t)2430 b(87)0 366 y Fp(21)80 b(Revision)31 +%%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 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 @@ -5959,7 +6001,7 @@ b(managemen)l(t)125 740 y Fs(If)h(y)m(ou)h(ha)m(v)m(e)h(read)f(this)f (c)m(hapter.)40 b(The)0 1263 y(questions)30 b(this)g(c)m(hapter)h(tak)m (es)h(up)e(b)s(ecome)h(more)g(imp)s(ortan)m(t)f(when)g(more)h(than)g (one)g(p)s(erson)e(is)h(w)m(orking)g(in)0 1388 y(a)h(rep)s(ository)-8 -b(.)0 1836 y Fm(21.1)68 b(When)30 b(to)h(commit?)125 +b(.)0 1836 y Fm(20.1)68 b(When)30 b(to)h(commit?)125 2110 y Fs(Y)-8 b(our)30 b(group)h(should)d(decide)j(whic)m(h)e(p)s (olicy)g(to)j(use)e(regarding)g(commits.)42 b(Sev)m(eral)30 b(p)s(olicies)f(are)i(p)s(ossible,)0 2234 y(and)f(as)g(y)m(our)h(exp)s @@ -5986,12 +6028,12 @@ y(\(see)27 b(Section)f(C.4)h([commitinfo],)g(page)g(141\),)i(but)c(y)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: 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(App)s(endix)28 b(A:)i(Guide)g(to)h(CVS)e -(commands)2255 b(89)0 366 y Fp(App)t(endix)30 b(A)81 +%%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 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 @@ -6035,8 +6077,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: 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)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 @@ -6077,14 +6119,14 @@ s(ecify)e(use)h(of)h(the)f Fn(")p Fs(old)p Fn(")f Fs(format,)i(so)g(y)m (ou)0 4208 y(w)m(ould)e(need)h(`)p Fn(cvs)g(-f)g(diff)f(foobar)p Fs('.)125 4551 y(In)23 b(place)g(of)h(the)g(command)g(name)f(y)m(ou)h (can)g(use)g Fn(cvs)f Fs(to)h(sp)s(ecify)f(global)g(options)g(\(see)h -(Section)g(A.3)g([Global)0 4675 y(options],)30 b(page)h(91\).)42 +(Section)g(A.3)g([Global)0 4675 y(options],)30 b(page)h(93\).)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: 91 93 -91 92 bop 0 -116 a Fs(App)s(endix)28 b(A:)i(Guide)g(to)h(CVS)e -(commands)2255 b(91)0 366 y Fm(A.3)67 b(Global)31 b(options)125 +%%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 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 @@ -6106,7 +6148,7 @@ Fo(cvs)p 781 2066 28 4 v 33 w(ro)s(ot)p 978 2066 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 -b(ariable.)39 b(See)31 b(Chapter)f(4)g([Rep)s(ository],)h(page)g(15.)0 +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 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 @@ -6132,7 +6174,7 @@ Fr(cvs)p Fs(,)g(including)d(a)j(list)f(of)i(other)g(help)e(options.)0 3890 y Fn(-l)384 b Fs(Do)39 b(not)e(log)h(the)g(cvs)p 1248 3890 V 33 w(command)f(in)g(the)h(command)f(history)g(\(but)g (execute)i(it)e(an)m(yw)m(a)m(y\).)65 b(See)480 4014 -y(Section)30 b(A.10)i([history],)e(page)h(108,)h(for)e(information)f +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 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 @@ -6151,10 +6193,10 @@ 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 y(mak)m(e)27 b(w)m(orking)e(\014les)g(writable,)h(unless)e(w)m(atc)m -(hes)j(are)g(on)e(\(see)i(Section)f(6.6)h([W)-8 b(atc)m(hes],)30 -b(page)c(41\).)p eop -%%Page: 92 94 -92 93 bop 0 -116 a Fs(92)2411 b(CVS|Concurren)m(t)29 +(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(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 @@ -6176,8 +6218,8 @@ m(een)i(the)g(clien)m(t)f(and)f(the)i(serv)m(er.)55 b(Only)34 b(has)h(an)g(e\013ect)i(on)480 1844 y(the)i Fr(cvs)e Fs(clien)m(t.)65 b(As)39 b(of)g(this)e(writing,)i(this)f(is)f(only)h (implemen)m(ted)f(when)h(using)f(a)i(Kerb)s(eros)480 -1968 y(connection)45 b(\(see)h(Section)f(4.6.4)i([Kerb)s(eros)e(authen) -m(ticated],)50 b(page)c(27\).)86 b(Encryption)44 b(sup-)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 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 @@ -6216,16 +6258,16 @@ b(ate)27 b(cop)m(y)i(of)f(a)g(source)g(\014le;)g(that)480 (eci\014ed,)f(so)h(that)480 5215 y(further)28 b(up)s(dates)h(in)f(the)i (same)g(directory)f(will)e(use)j(the)f(same)h(date)h(\(for)e(more)h (information)e(on)480 5340 y(stic)m(ky)j(tags/dates,)h(see)f(Section)f -(7.4)i([Stic)m(ky)e(tags],)i(page)f(51\).)p eop -%%Page: 93 95 -93 94 bop 0 -116 a Fs(App)s(endix)28 b(A:)i(Guide)g(to)h(CVS)e -(commands)2255 b(93)480 366 y(`)p Fn(-D)p Fs(')30 b(is)f(a)m(v)-5 +(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 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(108\).)480 +616 y(Section)30 b(A.10.1)j([history)c(options],)h(page)h(110\).)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 @@ -6277,10 +6319,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 -(102.)0 4717 y Fn(-k)f Fo(k\015ag)165 b Fs(Alter)30 b(the)h(default)e +(104.)0 4717 y Fn(-k)f Fo(k\015ag)165 b Fs(Alter)30 b(the)h(default)e Fr(r)n(cs)h Fs(pro)s(cessing)f(of)h(k)m(eyw)m(ords.)42 -b(See)30 b(Chapter)g(17)h([Keyw)m(ord)g(substitution],)480 -4842 y(page)36 b(77,)i(for)d(the)h(meaning)f(of)h Fo(k\015ag)p +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 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 @@ -6291,8 +6333,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: 94 96 -94 95 bop 0 -116 a Fs(94)2411 b(CVS|Concurren)m(t)29 +%%Page: 96 98 +96 97 bop 0 -116 a Fs(96)2411 b(CVS|Concurren)m(t)29 b(V)-8 b(ersions)30 b(System)480 366 y(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 @@ -6324,8 +6366,8 @@ Fi(W)-8 b(arning:)41 b Fs(this)29 b(is)h(not)h(the)f(same)h(as)g(the)g 480 2604 y(Av)-5 b(ailable)29 b(with)g(the)i Fn(checkout)p Fs(,)d Fn(commit)p Fs(,)h Fn(export)p Fs(,)g(and)h Fn(rtag)f Fs(commands.)0 2773 y Fn(-P)384 b Fs(Prune)29 b(empt)m(y)i -(directories.)40 b(See)30 b(See)h(Chapter)f(12)h([Remo)m(ving)g -(directories],)f(page)h(63.)0 2942 y Fn(-p)384 b Fs(Pip)s(e)38 +(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 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 @@ -6356,9 +6398,9 @@ Fs(to)i(mak)m(e)480 4299 y(y)m(our)24 b(o)m(wn)f(cop)m(y)h(of)g(a)g (tin)m(ues)h(to)g(use)g(it)f(on)g(future)g(up)s(date)480 4424 y(commands,)29 b(un)m(til)e(y)m(ou)i(sp)s(ecify)f(otherwise)g (\(for)h(more)g(information)e(on)i(stic)m(ky)g(tags/dates,)i(see)480 -4548 y(Section)i(7.4)i([Stic)m(ky)f(tags],)i(page)e(51\).)51 +4548 y(Section)i(6.7)i([Stic)m(ky)f(tags],)i(page)e(52\).)51 b(The)33 b(tag)i(can)f(b)s(e)f(either)g(a)h(sym)m(b)s(olic)e(or)h(n)m -(umeric)f(tag.)480 4673 y(See)f(Section)f(7.1)h([T)-8 +(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 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 @@ -6368,9 +6410,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: 95 97 -95 96 bop 0 -116 a Fs(App)s(endix)28 b(A:)i(Guide)g(to)h(CVS)e -(commands)2255 b(95)480 366 y(`)p Fn(-r)p Fs(')27 b(is)g(a)m(v)-5 +%%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 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 @@ -6413,26 +6455,26 @@ Fs(to)e(the)f(access)i(list)d(of)i(the)f Fr(r)n(cs)g Fs(\014le.)0 4670 y Fn(-b[)p Fo(rev)8 b Fn(])156 b Fs(When)25 b(used)g(with)f(bare)i Fr(r)n(cs)p Fs(,)f(this)g(option)g(sets)h(the)f (default)g(branc)m(h)g(to)h Fo(rev)8 b Fs(;)27 b(in)e -Fr(cvs)f Fs(stic)m(ky)i(tags)480 4795 y(\(see)37 b(Section)f(7.4)h -([Stic)m(ky)f(tags],)k(page)c(51\))i(are)e(a)h(b)s(etter)f(w)m(a)m(y)h +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 (to)g(decide)e(whic)m(h)g(branc)m(h)h(y)m(ou)480 4919 y(w)m(an)m(t)g(to)f(w)m(ork)g(on.)54 b(There)34 b(is)g(one)h(use)f (with)g Fr(cvs)p Fs(:)48 b(to)36 b(rev)m(ert)f(to)h(the)f(v)m(endor's)g (v)m(ersion)f(when)480 5044 y(using)29 b(v)m(endor)h(branc)m(hes)g -(\(see)h(Section)g(13.3)h([Rev)m(erting)e(lo)s(cal)g(c)m(hanges],)i -(page)f(66\).)0 5215 y Fn(-c)p Fo(string)155 b Fs(Useful)34 +(\(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 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.7 1997/03/18 02:05:33 tholo -(b)m(y)f(the)g(k)m(eyw)m(ord)g Fn(Files missed from previous import -(b)m(y)f(the)g(k)m(eyw)m(ord)g Fn()f Fs(\(see)i(Chapter)e(17)i +(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()f Fs(\(see)i(Chapter)e(16)i ([Keyw)m(ord)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(substitution],)35 -b(page)i(77\).)58 b(This)33 b(is)i(useful)f(for)i(programming)e +b(page)i(79\).)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 @@ -6452,8 +6494,8 @@ b(using)f(bare)g Fr(r)n(cs)p Fs(,)h(this)f(is)g(used)g(to)i(create)g (without)f(dep)s(ositing)f(a)j(revision.)0 1766 y Fn(-k)p Fo(subst)175 b Fs(Useful)44 b(with)h Fr(cvs)p Fs(.)85 b(Set)46 b(the)g(default)e(k)m(eyw)m(ord)i(substitution)e(to)i -Fo(subst)p Fs(.)85 b(See)46 b(Chapter)f(17)480 1890 y([Keyw)m(ord)39 -b(substitution],)g(page)g(77.)67 b(Giving)38 b(an)g(explicit)f(`)p +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 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 @@ -6513,9 +6555,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: 97 99 -97 98 bop 0 -116 a Fs(App)s(endix)28 b(A:)i(Guide)g(to)h(CVS)e -(commands)2255 b(97)0 366 y Fn(-o)p Fo(range)167 b Fs(P)m(oten)m +%%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 (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 @@ -6546,7 +6588,7 @@ b(Strange)480 1664 y(things)30 b(will)e(happ)s(en)i(if)g(he)g(starts)i b(option)h(is)g(not)h(a)f(go)s(o)s(d)h(w)m(a)m(y)g(to)g(tak)m(e)h(bac)m (k)g(a)f(b)s(ogus)e(commit;)41 b(commit)d(a)g(new)f(revision)480 1913 y(undoing)28 b(the)j(b)s(ogus)f(c)m(hange)h(instead)f(\(see)h -(Section)f(8.3)i([Merging)e(t)m(w)m(o)i(revisions],)d(page)i(55\).)0 +(Section)f(7.3)i([Merging)e(t)m(w)m(o)i(revisions],)d(page)i(57\).)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 @@ -6565,12 +6607,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 -(113\),)j(and)c(in)f(the)i(`)p Fn($Log: cvs.ps,v $ -(113\),)j(and)c(in)f(the)i(`)p Fn(Revision 1.1.1.7 1997/03/18 02:05:33 tholo -(113\),)j(and)c(in)f(the)i(`)p Fn(Files missed from previous import -(113\),)j(and)c(in)f(the)i(`)p Fn()p Fs(')f(and)480 -3138 y(`)p Fn($State: Exp $)p Fs(')d(k)m(eyw)m(ords)i(\(see)g(Chapter)f(17)i -([Keyw)m(ord)e(substitution],)f(page)j(77\).)45 b(Note)33 +(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 +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 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 @@ -6589,7 +6631,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(113\).)0 4364 y Fn(-t-)p Fo(string)107 +4187 y(page)e(114\).)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) @@ -6609,8 +6651,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: 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(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.) @@ -6662,8 +6704,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.7 1997/03/18 02:05:33 tholo -Fn(Files missed from previous import +Fn(Revision 1.1.1.8 1997/03/29 04:45:27 tholo +Fn(Latest release from Cyclic Software 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) @@ -6671,9 +6713,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: 99 101 -99 100 bop 0 -116 a Fs(App)s(endix)28 b(A:)i(Guide)g(to)h(CVS)e -(commands)2255 b(99)240 366 y Fn($)47 b(cvs)g(update)125 +%%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 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 @@ -6723,14 +6765,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 -(91\))i(is)d(sp)s(eci\014ed,)f(the)i Fn(CVSREAD)e Fs(en)m(vironmen)m(t) +(93\))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 -(that)i(\014le)e(\(see)i(Section)f(6.6)0 5340 y([W)-8 -b(atc)m(hes],)33 b(page)e(41\).)p eop -%%Page: 100 102 -100 101 bop 0 -116 a Fs(100)2366 b(CVS|Concurren)m(t)29 +(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(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 @@ -6739,18 +6781,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(122.)125 1017 y(F)-8 b(or)52 +740 y([up)s(date],)30 b(page)h(123.)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(124.)0 1584 y Fk(A.6.1)62 b(c)m(hec)m(k)m(out)28 +1142 y(page)31 b(125.)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(92,)0 1986 y(for)30 b(a)h(complete)g(description)d +(options],)i(page)g(94,)0 1986 y(for)30 b(a)h(complete)g(description)d (of)j(them\):)0 2291 y Fn(-D)f Fo(date)183 b Fs(Use)28 b(the)f(most)g(recen)m(t)i(revision)c(no)i(later)g(than)g Fo(date)p Fs(.)40 b(This)26 b(option)g(is)g(stic)m(ky)-8 b(,)29 b(and)d(implies)f(`)p Fn(-P)p Fs('.)480 2415 y(See)31 -b(Section)f(7.4)h([Stic)m(ky)g(tags],)h(page)f(51,)g(for)f(more)h +b(Section)f(6.7)h([Stic)m(ky)g(tags],)h(page)f(52,)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 @@ -6764,33 +6806,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(119.)0 +b(See)29 b(Section)f(A.16)i([status],)g(page)f(121.)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 -(directories.)40 b(See)30 b(Chapter)g(15)h([Mo)m(ving)g(directories],)f -(page)h(73.)0 3996 y Fn(-p)384 b Fs(Pip)s(e)29 b(\014les)g(to)i(the)g +(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 (standard)e(output.)0 4176 y Fn(-r)h Fo(tag)229 b Fs(Use)32 b(revision)e Fo(tag)p Fs(.)45 b(This)30 b(option)g(is)h(stic)m(ky)-8 b(,)33 b(and)e(implies)d(`)p Fn(-P)p Fs('.)44 b(See)32 -b(Section)f(7.4)i([Stic)m(ky)e(tags],)480 4301 y(page)g(51,)h(for)e +b(Section)f(6.7)i([Stic)m(ky)e(tags],)480 4301 y(page)g(52,)h(for)e (more)g(information)f(on)h(stic)m(ky)h(tags/dates.)125 4606 y(In)e(addition)g(to)i(those,)g(y)m(ou)g(can)f(use)g(these)h(sp)s (ecial)e(command)h(options)g(with)f Fn(checkout)p Fs(:)0 4911 y Fn(-A)384 b Fs(Reset)30 b(an)m(y)f(stic)m(ky)g(tags,)h(dates,)g -(or)f(`)p Fn(-k)p Fs(')g(options.)39 b(See)29 b(Section)g(7.4)h([Stic)m -(ky)f(tags],)h(page)g(51,)g(for)480 5035 y(more)h(information)d(on)i +(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 (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: 101 103 -101 102 bop 0 -116 a Fs(App)s(endix)28 b(A:)i(Guide)g(to)h(CVS)e -(commands)2210 b(101)0 366 y Fn(-d)30 b Fo(dir)241 b +%%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 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 @@ -6817,7 +6859,7 @@ e(the)i(c)m(hosen)g(revision)e(to)j(one)f(within)d(a)k(sp)s(eci\014c)d m(y)h(adding)f(a)i(colon)f(\(:\))42 b(to)31 b(the)g(tag:)41 b(`)p Fn(-j)p Fo(Sym)m(b)s(olic)p 2962 1710 28 4 v 31 w(T)-8 b(ag)8 b Fn(:)p Fo(Date)p 3386 1710 V 35 w(Sp)s(eci\014er)f -Fs('.)480 1859 y(See)31 b(Chapter)e(8)i([Merging],)g(page)g(53.)0 +Fs('.)480 1859 y(See)31 b(Chapter)e(7)i([Merging],)g(page)g(55.)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 @@ -6848,8 +6890,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: 102 104 -102 103 bop 0 -116 a Fs(102)2366 b(CVS|Concurren)m(t)29 +%%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)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 @@ -6876,7 +6918,7 @@ 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(122\).)61 b Fn(commit)35 b Fs(do)s(es)h(not)h(call)f +(date],)g(page)g(123\).)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 @@ -6888,7 +6930,7 @@ g([mo)s(dules],)g(page)h(137,)h(and)e(see)h(Section)f(C.7)g([loginfo],) 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(113.)47 b(Y)-8 b(ou)32 b(can)h(sp)s(ecify)d(the)i(log) +([log],)f(page)g(114.)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 @@ -6896,1238 +6938,1208 @@ 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(92,)0 +Fs(\(see)i(Section)f(A.4)h([Common)f(options],)g(page)h(94,)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: 103 105 -103 104 bop 0 -116 a Fs(App)s(endix)28 b(A:)i(Guide)g(to)h(CVS)e -(commands)2210 b(103)0 366 y Fn(-r)30 b Fo(revision)480 +%%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 491 y Fs(Commit)e(to)i Fo(revision)p Fs(.)39 b Fo(revision)28 b Fs(m)m(ust)h(b)s(e)f(either)h(a)h(branc)m(h,)f(or)g(a)h(revision)d -(on)i(the)h(main)e(trunk)480 616 y(that)41 b(is)e(higher)f(than)i(an)m -(y)g(existing)f(revision)g(n)m(um)m(b)s(er.)68 b(Y)-8 -b(ou)40 b(cannot)h(commit)f(to)h(a)f(sp)s(eci\014c)480 -740 y(revision)29 b(on)h(a)h(branc)m(h.)125 1054 y Fn(commit)d -Fs(also)j(supp)s(orts)d(these)j(options:)0 1367 y Fn(-F)f -Fo(\014le)237 b Fs(Read)31 b(the)f(log)h(message)g(from)f -Fo(\014le)p Fs(,)g(instead)f(of)i(in)m(v)m(oking)f(an)g(editor.)0 -1556 y Fn(-f)384 b Fs(Note)37 b(that)g(this)e(is)g(not)i(the)f -(standard)f(b)s(eha)m(vior)h(of)g(the)g(`)p Fn(-f)p Fs(')g(option)g(as) -g(de\014ned)f(in)g(See)h(Sec-)480 1681 y(tion)30 b(A.4)h([Common)f -(options],)g(page)i(92.)480 1837 y(F)-8 b(orce)33 b Fr(cvs)d -Fs(to)i(commit)f(a)h(new)e(revision)g(ev)m(en)i(if)e(y)m(ou)i(ha)m(v)m -(en't)g(made)f(an)m(y)h(c)m(hanges)g(to)g(the)g(\014le.)480 -1962 y(If)e(the)g(curren)m(t)h(revision)d(of)j Fo(\014le)j -Fs(is)c(1.7,)h(then)g(the)f(follo)m(wing)f(t)m(w)m(o)j(commands)e(are)g -(equiv)-5 b(alen)m(t:)720 2098 y Fn($)47 b(cvs)g(commit)f(-f)i -Fo(\014le)720 2202 y Fn($)f(cvs)g(commit)f(-r)i(1.8)f -Fo(\014le)480 2358 y Fs(The)29 b(`)p Fn(-f)p Fs(')g(option)g(disables)e -(recursion)h(\(i.e.,)i(it)f(implies)d(`)p Fn(-l)p Fs('\).)41 -b(T)-8 b(o)29 b(force)h Fr(cvs)f Fs(to)h(commit)f(a)g(new)480 -2483 y(revision)g(for)h(all)f(\014les)g(in)g(all)h(sub)s(directories,)e -(y)m(ou)i(m)m(ust)h(use)f(`)p Fn(-f)g(-R)p Fs('.)0 2672 -y Fn(-m)g Fo(message)480 2796 y Fs(Use)h Fo(message)36 -b Fs(as)31 b(the)g(log)f(message,)i(instead)d(of)i(in)m(v)m(oking)f(an) -g(editor.)0 3289 y Fk(A.7.2)62 b(commit)29 b(examples)0 -3770 y(A.7.2.1)62 b(New)30 b(ma)7 b(jor)29 b(release)i(n)m(um)m(b)s(er) -125 4051 y Fs(By)k(default,)g Fr(cvs)f Fs(will)e(assign)i(n)m(umeric)g -(revisions)f(b)m(y)i(lea)m(ving)f(the)h(\014rst)f(n)m(um)m(b)s(er)g -(the)h(same)g(and)g(incre-)0 4176 y(men)m(ting)30 b(the)h(second)g(n)m -(um)m(b)s(er.)40 b(F)-8 b(or)31 b(example,)f Fn(1.1)p -Fs(,)g Fn(1.2)p Fs(,)g Fn(1.3)p Fs(,)g(etc.)43 b(Normally)29 -b(there)i(is)f(no)g(reason)h(to)g(care)0 4300 y(ab)s(out)38 -b(the)h(revision)d(n)m(um)m(b)s(ers|it)h(is)g(easier)i(to)g(treat)g -(them)g(as)f(in)m(ternal)f(n)m(um)m(b)s(ers)g(that)i -Fr(cvs)f Fs(main)m(tains,)0 4425 y(and)31 b(tags)i(pro)m(vide)d(a)i(b)s -(etter)g(w)m(a)m(y)h(to)f(distinguish)c(b)s(et)m(w)m(een)k(things)e -(lik)m(e)h(release)h(1)g(v)m(ersus)f(release)h(2)g(of)g(y)m(our)0 -4549 y(pro)s(duct)h(\(see)i(Section)f(7.1)h([T)-8 b(ags],)36 -b(page)f(47\).)53 b(Ho)m(w)m(ev)m(er,)37 b(if)c(y)m(ou)h(w)m(an)m(t)h -(to)g(set)f(the)h(n)m(umeric)d(revisions,)i(the)0 4674 -y(`)p Fn(-r)p Fs(')c(option)g(to)h Fn(cvs)f(commit)e -Fs(can)j(do)f(that.)125 4955 y(F)-8 b(or)40 b(example,)i(to)e(bring)e -(all)h(y)m(our)h(\014les)e(up)h(to)h(the)g Fr(r)n(cs)f -Fs(revision)f(3.0)j(\(including)36 b(those)k(that)h(ha)m(v)m(en't)0 -5079 y(c)m(hanged\),)32 b(y)m(ou)e(migh)m(t)g(in)m(v)m(ok)m(e:)240 -5340 y Fn($)47 b(cvs)g(commit)f(-r)i(3.0)p eop -%%Page: 104 106 -104 105 bop 0 -116 a Fs(104)2366 b(CVS|Concurren)m(t)29 -b(V)-8 b(ersions)30 b(System)125 366 y(Note)j(that)g(the)f(n)m(um)m(b)s -(er)f(y)m(ou)h(sp)s(ecify)f(with)f(`)p Fn(-r)p Fs(')i(m)m(ust)g(b)s(e)g -(larger)f(than)h(an)m(y)h(existing)e(revision)f(n)m(um)m(b)s(er.)0 -491 y(That)38 b(is,)h(if)d(revision)h(3.0)h(exists,)i(y)m(ou)e(cannot)h -(`)p Fn(cvs)29 b(commit)g(-r)h(1.3)p Fs('.)62 b(If)37 -b(y)m(ou)i(w)m(an)m(t)f(to)h(main)m(tain)e(sev)m(eral)0 -616 y(releases)31 b(in)e(parallel,)f(y)m(ou)j(need)f(to)h(use)f(a)h -(branc)m(h)f(\(see)h(Chapter)f(7)h([Branc)m(hes],)g(page)h(47\).)0 -1057 y Fk(A.7.2.2)62 b(Committing)29 b(to)i(a)f(branc)m(h)125 -1334 y Fs(Y)-8 b(ou)24 b(can)h(commit)f(to)h(a)g(branc)m(h)e(revision)g +(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 +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 +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 +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 +Fo(\014le)j Fs(is)c(1.7,)h(then)g(the)f(follo)m(wing)f(t)m(w)m(o)j +(commands)e(are)g(equiv)-5 b(alen)m(t:)720 2064 y Fn($)47 +b(cvs)g(commit)f(-f)i Fo(\014le)720 2168 y Fn($)f(cvs)g(commit)f(-r)i +(1.8)f Fo(\014le)480 2321 y Fs(The)29 b(`)p Fn(-f)p Fs(')g(option)g +(disables)e(recursion)h(\(i.e.,)i(it)f(implies)d(`)p +Fn(-l)p Fs('\).)41 b(T)-8 b(o)29 b(force)h Fr(cvs)f Fs(to)h(commit)f(a) +g(new)480 2445 y(revision)g(for)h(all)f(\014les)g(in)g(all)h(sub)s +(directories,)e(y)m(ou)i(m)m(ust)h(use)f(`)p Fn(-f)g(-R)p +Fs('.)0 2626 y Fn(-m)g Fo(message)480 2750 y Fs(Use)h +Fo(message)36 b Fs(as)31 b(the)g(log)f(message,)i(instead)d(of)i(in)m +(v)m(oking)f(an)g(editor.)0 3201 y Fk(A.7.2)62 b(commit)29 +b(examples)0 3644 y(A.7.2.1)62 b(Committing)29 b(to)i(a)f(branc)m(h)125 +3921 y Fs(Y)-8 b(ou)24 b(can)h(commit)f(to)h(a)g(branc)m(h)e(revision)g (\(one)i(that)g(has)f(an)g(ev)m(en)h(n)m(um)m(b)s(er)e(of)h(dots\))h -(with)e(the)h(`)p Fn(-r)p Fs(')g(option.)0 1459 y(T)-8 +(with)e(the)h(`)p Fn(-r)p Fs(')g(option.)0 4046 y(T)-8 b(o)36 b(create)h(a)f(branc)m(h)e(revision,)h(use)g(the)h(`)p Fn(-b)p Fs(')f(option)g(of)h(the)f Fn(rtag)f Fs(or)i -Fn(tag)e Fs(commands)h(\(see)h(Section)g(A.17)0 1583 -y([tag],)43 b(page)d(120)g(or)f(see)g(Section)g(A.15)h([rtag],)j(page)c -(118\).)68 b(Then,)40 b(either)f Fn(checkout)d Fs(or)j -Fn(update)e Fs(can)j(b)s(e)0 1708 y(used)34 b(to)i(base)f(y)m(our)g +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 +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 -Fs(c)m(hanges)0 1832 y(made)g(within)e(these)i(w)m(orking)f(sources)i +Fs(c)m(hanges)0 4419 y(made)g(within)e(these)i(w)m(orking)f(sources)i (will)c(b)s(e)i(automatically)h(added)g(to)g(a)h(branc)m(h)e(revision,) -g(thereb)m(y)i(not)0 1957 y(disturbing)26 b(main-line)h(dev)m(elopmen)m +g(thereb)m(y)i(not)0 4544 y(disturbing)26 b(main-line)h(dev)m(elopmen)m (t)j(in)e(an)m(y)h(w)m(a)m(y)-8 b(.)42 b(F)-8 b(or)30 b(example,)g(if)e(y)m(ou)i(had)f(to)h(create)h(a)e(patc)m(h)h(to)g(the) -g(1.2)0 2081 y(v)m(ersion)g(of)g(the)h(pro)s(duct,)e(ev)m(en)i(though)g +g(1.2)0 4669 y(v)m(ersion)g(of)g(the)h(pro)s(duct,)e(ev)m(en)i(though)g (the)f(2.0)i(v)m(ersion)d(is)h(already)g(under)f(dev)m(elopmen)m(t,)i -(y)m(ou)f(migh)m(t)g(do:)240 2338 y Fn($)47 b(cvs)g(rtag)g(-b)g(-r)g -(FCS1_2)f(FCS1_2_Patch)f(product_module)240 2441 y($)i(cvs)g(checkout)f -(-r)h(FCS1_2_Patch)e(product_module)240 2545 y($)i(cd)h(product_module) -240 2649 y([[)f(hack)g(away)f(]])240 2753 y($)h(cvs)g(commit)0 -3030 y Fs(This)29 b(w)m(orks)h(automatically)g(since)g(the)g(`)p -Fn(-r)p Fs(')h(option)f(is)f(stic)m(ky)-8 b(.)0 3471 -y Fk(A.7.2.3)62 b(Creating)30 b(the)h(branc)m(h)e(after)h(editing)125 -3748 y Fs(Sa)m(y)22 b(y)m(ou)g(ha)m(v)m(e)h(b)s(een)e(w)m(orking)g(on)h -(some)g(extremely)g(exp)s(erimen)m(tal)f(soft)m(w)m(are,)k(based)c(on)h -(whatev)m(er)h(revision)0 3873 y(y)m(ou)34 b(happ)s(ened)f(to)i(c)m -(hec)m(k)m(out)h(last)e(w)m(eek.)53 b(If)34 b(others)g(in)f(y)m(our)h -(group)f(w)m(ould)g(lik)m(e)g(to)i(w)m(ork)f(on)g(this)f(soft)m(w)m -(are)0 3997 y(with)d(y)m(ou,)i(but)e(without)g(disturbing)e(main-line)h -(dev)m(elopmen)m(t,)i(y)m(ou)h(could)e(commit)h(y)m(our)g(c)m(hange)h -(to)g(a)f(new)0 4122 y(branc)m(h.)38 b(Others)25 b(can)g(then)g(c)m -(hec)m(k)m(out)i(y)m(our)e(exp)s(erimen)m(tal)f(stu\013)h(and)f -(utilize)g(the)h(full)e(b)s(ene\014t)h(of)h Fr(cvs)f -Fs(con\015ict)0 4246 y(resolution.)39 b(The)30 b(scenario)g(migh)m(t)h -(lo)s(ok)e(lik)m(e:)240 4503 y Fn([[)47 b(hacked)f(sources)g(are)h -(present)f(]])240 4606 y($)h(cvs)g(tag)g(-b)g(EXPR1)240 -4710 y($)g(cvs)g(update)f(-r)i(EXPR1)240 4814 y($)f(cvs)g(commit)125 -5091 y Fs(The)23 b Fn(update)f Fs(command)h(will)e(mak)m(e)k(the)e(`)p +(y)m(ou)f(migh)m(t)g(do:)240 4925 y Fn($)47 b(cvs)g(rtag)g(-b)g(-r)g +(FCS1_2)f(FCS1_2_Patch)f(product_module)240 5029 y($)i(cvs)g(checkout)f +(-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 +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 +(editing)125 1115 y Fs(Sa)m(y)22 b(y)m(ou)g(ha)m(v)m(e)h(b)s(een)e(w)m +(orking)g(on)h(some)g(extremely)g(exp)s(erimen)m(tal)f(soft)m(w)m(are,) +k(based)c(on)h(whatev)m(er)h(revision)0 1240 y(y)m(ou)34 +b(happ)s(ened)f(to)i(c)m(hec)m(k)m(out)h(last)e(w)m(eek.)53 +b(If)34 b(others)g(in)f(y)m(our)h(group)f(w)m(ould)g(lik)m(e)g(to)i(w)m +(ork)f(on)g(this)f(soft)m(w)m(are)0 1364 y(with)d(y)m(ou,)i(but)e +(without)g(disturbing)e(main-line)h(dev)m(elopmen)m(t,)i(y)m(ou)h +(could)e(commit)h(y)m(our)g(c)m(hange)h(to)g(a)f(new)0 +1489 y(branc)m(h.)38 b(Others)25 b(can)g(then)g(c)m(hec)m(k)m(out)i(y)m +(our)e(exp)s(erimen)m(tal)f(stu\013)h(and)f(utilize)g(the)h(full)e(b)s +(ene\014t)h(of)h Fr(cvs)f Fs(con\015ict)0 1613 y(resolution.)39 +b(The)30 b(scenario)g(migh)m(t)h(lo)s(ok)e(lik)m(e:)240 +1872 y Fn([[)47 b(hacked)f(sources)g(are)h(present)f(]])240 +1976 y($)h(cvs)g(tag)g(-b)g(EXPR1)240 2080 y($)g(cvs)g(update)f(-r)i +(EXPR1)240 2184 y($)f(cvs)g(commit)125 2464 y Fs(The)23 +b Fn(update)f Fs(command)h(will)e(mak)m(e)k(the)e(`)p Fn(-r)30 b(EXPR1)p Fs(')23 b(option)g(stic)m(ky)h(on)f(all)g(\014les.) -37 b(Note)25 b(that)f(y)m(our)g(c)m(hanges)0 5215 y(to)k(the)f(\014les) +37 b(Note)25 b(that)f(y)m(our)g(c)m(hanges)0 2588 y(to)k(the)f(\014les) g(will)d(nev)m(er)k(b)s(e)e(remo)m(v)m(ed)j(b)m(y)e(the)g Fn(update)f Fs(command.)39 b(The)27 b Fn(commit)e Fs(will)g -(automatically)i(commit)0 5340 y(to)k(the)g(correct)g(branc)m(h,)f(b)s +(automatically)i(commit)0 2713 y(to)k(the)g(correct)g(branc)m(h,)f(b)s (ecause)h(the)f(`)p Fn(-r)p Fs(')g(is)g(stic)m(ky)-8 -b(.)41 b(Y)-8 b(ou)31 b(could)f(also)g(do)g(lik)m(e)g(this:)p -eop -%%Page: 105 107 -105 106 bop 0 -116 a Fs(App)s(endix)28 b(A:)i(Guide)g(to)h(CVS)e -(commands)2210 b(105)240 366 y Fn([[)47 b(hacked)f(sources)g(are)h -(present)f(]])240 470 y($)h(cvs)g(tag)g(-b)g(EXPR1)240 -574 y($)g(cvs)g(commit)f(-r)i(EXPR1)0 852 y Fs(but)26 -b(then,)h(only)e(those)i(\014les)e(that)i(w)m(ere)g(c)m(hanged)g(b)m(y) -f(y)m(ou)h(will)c(ha)m(v)m(e)28 b(the)e(`)p Fn(-r)k(EXPR1)p -Fs(')25 b(stic)m(ky)i(\015ag.)40 b(If)26 b(y)m(ou)g(hac)m(k)0 -976 y(a)m(w)m(a)m(y)-8 b(,)40 b(and)c(commit)g(without)f(sp)s(ecifying) -f(the)j(`)p Fn(-r)30 b(EXPR1)p Fs(')35 b(\015ag,)j(some)f(\014les)e(ma) -m(y)i(acciden)m(tally)e(end)h(up)f(on)0 1101 y(the)c(main)e(trunk.)125 -1378 y(T)-8 b(o)30 b(w)m(ork)h(with)e(y)m(ou)i(on)f(the)g(exp)s(erimen) +b(.)41 b(Y)-8 b(ou)31 b(could)f(also)g(do)g(lik)m(e)g(this:)240 +2972 y Fn([[)47 b(hacked)f(sources)g(are)h(present)f(]])240 +3076 y($)h(cvs)g(tag)g(-b)g(EXPR1)240 3179 y($)g(cvs)g(commit)f(-r)i +(EXPR1)0 3459 y Fs(but)26 b(then,)h(only)e(those)i(\014les)e(that)i(w)m +(ere)g(c)m(hanged)g(b)m(y)f(y)m(ou)h(will)c(ha)m(v)m(e)28 +b(the)e(`)p Fn(-r)k(EXPR1)p Fs(')25 b(stic)m(ky)i(\015ag.)40 +b(If)26 b(y)m(ou)g(hac)m(k)0 3584 y(a)m(w)m(a)m(y)-8 +b(,)40 b(and)c(commit)g(without)f(sp)s(ecifying)f(the)j(`)p +Fn(-r)30 b(EXPR1)p Fs(')35 b(\015ag,)j(some)f(\014les)e(ma)m(y)i +(acciden)m(tally)e(end)h(up)f(on)0 3708 y(the)c(main)e(trunk.)125 +3988 y(T)-8 b(o)30 b(w)m(ork)h(with)e(y)m(ou)i(on)f(the)g(exp)s(erimen) m(tal)g(c)m(hange,)h(others)g(w)m(ould)e(simply)f(do)240 -1635 y Fn($)47 b(cvs)g(checkout)f(-r)h(EXPR1)f(whatever_module)0 -2116 y Fm(A.8)67 b(di\013|Run)32 b(di\013s)e(b)t(et)l(w)l(een)i -(revisions)75 2394 y Fq(\017)60 b Fs(Synopsis:)39 b(di\013)29 -b([-l])h([rcsdi\013)p 1155 2394 28 4 v 32 w(options])g([[-r)g(rev1)h +4247 y Fn($)47 b(cvs)g(checkout)f(-r)h(EXPR1)f(whatever_module)0 +4749 y Fm(A.8)67 b(di\013|Run)32 b(di\013s)e(b)t(et)l(w)l(een)i +(revisions)75 5029 y Fq(\017)60 b Fs(Synopsis:)39 b(di\013)29 +b([-l])h([rcsdi\013)p 1155 5029 28 4 v 32 w(options])g([[-r)g(rev1)h Fn(|)f Fs(-D)h(date1])h([-r)e(rev2)h Fn(|)f Fs(-D)h(date2]])h([\014les) -p Fh(:)15 b(:)g(:)p Fs(])75 2547 y Fq(\017)60 b Fs(Requires:)40 +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 2700 y Fq(\017)60 b Fs(Changes:)40 b(nothing.)125 -3006 y(The)h Fn(diff)f Fs(command)h(is)g(used)f(to)j(compare)f -(di\013eren)m(t)f(revisions)e(of)j(\014les.)73 b(The)41 -b(default)g(action)h(is)e(to)0 3131 y(compare)32 b(y)m(our)f(w)m -(orking)g(\014les)f(with)g(the)h(revisions)f(they)h(w)m(ere)h(based)f -(on,)h(and)e(rep)s(ort)h(an)m(y)h(di\013erences)e(that)0 -3255 y(are)h(found.)125 3533 y(If)h(an)m(y)i(\014le)e(names)i(are)f -(giv)m(en,)h(only)f(those)h(\014les)e(are)i(compared.)49 -b(If)33 b(an)m(y)h(directories)e(are)i(giv)m(en,)g(all)e(\014les)0 -3657 y(under)d(them)h(will)e(b)s(e)i(compared.)125 3935 +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 +(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 +(ere)h(based)f(on,)h(and)e(rep)s(ort)h(an)m(y)h(di\013erences)e(that)0 +616 y(are)h(found.)125 890 y(If)h(an)m(y)i(\014le)e(names)i(are)f(giv)m +(en,)h(only)f(those)h(\014les)e(are)i(compared.)49 b(If)33 +b(an)m(y)h(directories)e(are)i(giv)m(en,)g(all)e(\014les)0 +1014 y(under)d(them)h(will)e(b)s(e)i(compared.)125 1288 y(The)f(exit)i(status)g(will)c(b)s(e)j(0)h(if)f(no)g(di\013erences)g(w) m(ere)h(found,)e(1)i(if)e(some)i(di\013erences)f(w)m(ere)h(found,)e -(and)h(2)h(if)0 4059 y(an)m(y)g(error)f(o)s(ccurred.)0 -4507 y Fk(A.8.1)62 b(di\013)30 b(options)125 4785 y Fs(These)d +(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(92,)g(for)0 -4909 y(a)i(complete)g(description)d(of)j(them\):)0 5215 +Fs(\(see)i(Section)e(A.4)i([Common)f(options],)g(page)h(94,)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 Fn(-r)p Fs(')g(for)g(ho)m(w)h(this)e(a\013ects)j(the)480 -5340 y(comparison.)p eop -%%Page: 106 108 -106 107 bop 0 -116 a Fs(106)2366 b(CVS|Concurren)m(t)29 -b(V)-8 b(ersions)30 b(System)0 366 y Fn(-k)g Fo(k\015ag)165 +2642 y(comparison.)0 2814 y Fn(-k)30 b Fo(k\015ag)165 b Fs(Pro)s(cess)30 b Fr(r)n(cs)g Fs(k)m(eyw)m(ords)g(according)h(to)g -Fo(k\015ag)p Fs(.)41 b(See)30 b(co\(1\).)0 537 y Fn(-l)384 +Fo(k\015ag)p Fs(.)41 b(See)30 b(co\(1\).)0 2985 y Fn(-l)384 b Fs(Lo)s(cal;)30 b(run)f(only)h(in)f(curren)m(t)h(w)m(orking)g -(directory)-8 b(.)0 707 y Fn(-R)384 b Fs(Examine)30 b(directories)f -(recursiv)m(ely)-8 b(.)40 b(This)28 b(option)i(is)g(on)g(b)m(y)g -(default.)0 877 y Fn(-r)g Fo(tag)229 b Fs(Compare)28 +(directory)-8 b(.)0 3157 y Fn(-R)384 b Fs(Examine)30 +b(directories)f(recursiv)m(ely)-8 b(.)40 b(This)28 b(option)i(is)g(on)g +(b)m(y)g(default.)0 3328 y Fn(-r)g Fo(tag)229 b Fs(Compare)28 b(with)f(revision)f Fo(tag)p Fs(.)41 b(Zero,)29 b(one)f(or)g(t)m(w)m(o) i(`)p Fn(-r)p Fs(')d(options)h(can)g(b)s(e)g(presen)m(t.)40 -b(With)27 b(no)h(`)p Fn(-r)p Fs(')480 1002 y(option,)i(the)h(w)m +b(With)27 b(no)h(`)p Fn(-r)p Fs(')480 3453 y(option,)i(the)h(w)m (orking)f(\014le)g(will)e(b)s(e)i(compared)g(with)f(the)i(revision)e -(it)h(w)m(as)h(based)f(on.)42 b(With)30 b(one)480 1126 +(it)h(w)m(as)h(based)f(on.)42 b(With)30 b(one)480 3577 y(`)p Fn(-r)p Fs(',)d(that)g(revision)d(will)g(b)s(e)h(compared)h(to)h (y)m(our)f(curren)m(t)g(w)m(orking)f(\014le.)39 b(With)25 -b(t)m(w)m(o)j(`)p Fn(-r)p Fs(')e(options)480 1251 y(those)h(t)m(w)m(o)h +b(t)m(w)m(o)j(`)p Fn(-r)p Fs(')e(options)480 3702 y(those)h(t)m(w)m(o)h (revisions)d(will)g(b)s(e)h(compared)h(\(and)f(y)m(our)h(w)m(orking)f -(\014le)g(will)e(not)j(a\013ect)i(the)e(outcome)480 1375 -y(in)i(an)m(y)i(w)m(a)m(y\).)480 1523 y(One)f(or)g(b)s(oth)g(`)p +(\014le)g(will)e(not)j(a\013ect)i(the)e(outcome)480 3826 +y(in)i(an)m(y)i(w)m(a)m(y\).)480 3974 y(One)f(or)g(b)s(oth)g(`)p Fn(-r)p Fs(')g(options)g(can)h(b)s(e)e(replaced)h(b)m(y)g(a)h(`)p Fn(-D)f Fo(date)5 b Fs(')32 b(option,)e(describ)s(ed)e(ab)s(o)m(v)m(e.) -0 1693 y Fn(--ifdef=)p Fo(arg)480 1818 y Fs(Output)36 +0 4146 y Fn(--ifdef=)p Fo(arg)480 4270 y Fs(Output)36 b(in)f(ifdef)h(format.)61 b(Consult)35 b(the)i(do)s(cumen)m(tation)g -(of)g(y)m(our)g(underlying)d(di\013)h(program)480 1942 +(of)g(y)m(our)g(underlying)d(di\013)h(program)480 4395 y(concerning)30 b(the)g(`)p Fn(-D)p Fs(')h(option)e(to)j(di\013,)d(for) -h(more)h(information)d(on)j(this)e(format.)125 2239 y(The)h(follo)m +h(more)h(information)d(on)j(this)e(format.)125 4692 y(The)h(follo)m (wing)e(options)i(are)h(passed)f(through)g(to)h Fn(rcsdiff)p Fs(,)e(whic)m(h)g(in)g(turn)h(passes)g(them)g(to)i Fn(diff)p -Fs(.)39 b(The)0 2364 y(exact)g(meaning)d(of)h(the)g(options)g(dep)s +Fs(.)39 b(The)0 4817 y(exact)g(meaning)d(of)h(the)g(options)g(dep)s (ends)e(on)i(whic)m(h)f Fn(diff)g Fs(y)m(ou)h(are)g(using.)60 -b(See)37 b(the)g(do)s(cumen)m(tation)g(for)0 2488 y(y)m(our)30 -b Fn(diff)g Fs(for)g(details.)125 2762 y Fn(-a)21 b(-b)h(-B)g(-c)f(-C) +b(See)37 b(the)g(do)s(cumen)m(tation)g(for)0 4941 y(y)m(our)30 +b Fn(diff)g Fs(for)g(details.)125 5215 y Fn(-a)21 b(-b)h(-B)g(-c)f(-C) 30 b Fo(nlines)24 b Fn(-d)e(-e)f(-f)h(-h)g(-H)g(-i)f(-n)h(-N)g(-p)f(-s) h(-t)g(-u)g(-U)f Fo(nlines)j Fn(-F)30 b Fo(regexp)25 b Fn(-I)30 b Fo(regexp)25 b Fn(-L)30 b Fo(lab)s(el)0 -2887 y Fn(-T)d(-V)j Fo(arg)35 b Fn(-W)30 b Fo(columns)g +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-)0 3011 y(format=)p -Fo(arg)56 b Fn(--context[=)p Fo(lines)t Fn(])45 b(--ed)k(--expand-tabs) -e(--forward-ed)g(--horizon-lines=)p Fo(arg)54 b Fn(--)0 -3136 y(ignore-all-space)47 b(--ignore-blank-lines)e(--ignore-case)i -(--ignore-matching-lines=)p Fo(r)o(egexp)0 3260 y Fn +(--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 +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 +491 y(ignore-all-space)47 b(--ignore-blank-lines)e(--ignore-case)i +(--ignore-matching-lines=)p Fo(r)o(egexp)0 616 y Fn (--ignore-space-change)29 b(--initial-tab)j(--label=)p Fo(lab)s(el)j Fn(--left-column)c(--minimal)i(--new-file)0 -3385 y(--new-line-format=)p Fo(arg)76 b Fn(--old-line-format=)p +740 y(--new-line-format=)p Fo(arg)76 b Fn(--old-line-format=)p Fo(arg)g Fn(--paginate)70 b(--rcs)h(--report-identical-)0 -3509 y(files)61 b(--code-c-function)c(--side-by-side)h +865 y(files)61 b(--code-c-function)c(--side-by-side)h (--show-function-line=)p Fo(regexp)i Fn(--speed-large-)0 -3634 y(files)48 b(--suppress-common-lines)42 b(--text)48 +989 y(files)48 b(--suppress-common-lines)42 b(--text)48 b(--unchanged-group-forma)o(t=)p Fo(arg)j Fn(--unified[=)p -Fo(lines)t Fn(])0 3758 y(--width=)p Fo(columns)0 4165 -y Fk(A.8.2)62 b(di\013)30 b(examples)125 4439 y Fs(The)f(follo)m(wing)g +Fo(lines)t Fn(])0 1114 y(--width=)p Fo(columns)0 1547 +y Fk(A.8.2)62 b(di\013)30 b(examples)125 1823 y Fs(The)f(follo)m(wing)g (line)f(pro)s(duces)h(a)i(Unidi\013)c(\(`)p Fn(-u)p Fs(')k(\015ag\))f (b)s(et)m(w)m(een)h(revision)e(1.14)i(and)f(1.19)h(of)g(`)p -Fn(backend.c)p Fs('.)0 4564 y(Due)41 b(to)g(the)f(`)p +Fn(backend.c)p Fs('.)0 1948 y(Due)41 b(to)g(the)f(`)p Fn(-kk)p Fs(')g(\015ag)h(no)f(k)m(eyw)m(ords)g(are)h(substituted,)g(so) g(di\013erences)e(that)i(only)f(dep)s(end)e(on)i(k)m(eyw)m(ord)0 -4688 y(substitution)28 b(are)j(ignored.)240 4941 y Fn($)47 +2072 y(substitution)28 b(are)j(ignored.)240 2327 y Fn($)47 b(cvs)g(diff)g(-kk)g(-u)g(-r)g(1.14)g(-r)g(1.19)g(backend.c)125 -5215 y Fs(Supp)s(ose)27 b(the)i(exp)s(erimen)m(tal)e(branc)m(h)i(EXPR1) +2603 y Fs(Supp)s(ose)27 b(the)i(exp)s(erimen)m(tal)e(branc)m(h)i(EXPR1) g(w)m(as)g(based)f(on)h(a)g(set)h(of)f(\014les)f(tagged)i(RELEASE)p -3581 5215 28 4 v 32 w(1)p 3658 5215 V 33 w(0.)40 b(T)-8 -b(o)0 5340 y(see)31 b(what)f(has)g(happ)s(ened)f(on)h(that)h(branc)m -(h,)f(the)h(follo)m(wing)e(can)h(b)s(e)g(used:)p eop -%%Page: 107 109 -107 108 bop 0 -116 a Fs(App)s(endix)28 b(A:)i(Guide)g(to)h(CVS)e -(commands)2210 b(107)240 366 y Fn($)47 b(cvs)g(diff)g(-r)g(RELEASE_1_0) -e(-r)i(EXPR1)125 640 y Fs(A)30 b(command)g(lik)m(e)g(this)f(can)i(b)s -(e)f(used)f(to)i(pro)s(duce)e(a)i(con)m(text)h(di\013)d(b)s(et)m(w)m -(een)i(t)m(w)m(o)h(releases:)240 894 y Fn($)47 b(cvs)g(diff)g(-c)g(-r)g -(RELEASE_1_0)e(-r)i(RELEASE_1_1)e(>)i(diffs)125 1168 -y Fs(If)29 b(y)m(ou)h(are)h(main)m(taining)d(ChangeLogs,)j(a)f(command) -g(lik)m(e)f(the)h(follo)m(wing)f(just)g(b)s(efore)h(y)m(ou)g(commit)g -(y)m(our)0 1292 y(c)m(hanges)k(ma)m(y)f(help)f(y)m(ou)h(write)f(the)h -(ChangeLog)g(en)m(try)-8 b(.)49 b(All)31 b(lo)s(cal)h(mo)s -(di\014cations)f(that)j(ha)m(v)m(e)g(not)f(y)m(et)h(b)s(een)0 -1417 y(committed)d(will)c(b)s(e)j(prin)m(ted.)240 1670 -y Fn($)47 b(cvs)g(diff)g(-u)g(|)h(less)0 2107 y Fm(A.9)67 -b(exp)t(ort|Exp)t(ort)32 b(sources)e(from)h(CVS,)f(similar)i(to)f(c)l -(hec)l(k)l(out)75 2381 y Fq(\017)60 b Fs(Synopsis:)39 -b(exp)s(ort)30 b([-\015Nn])g([-r)g(rev)p Fn(|)p Fs(-D)h(date])h([-k)e -(subst])g([-d)g(dir])f(mo)s(dule)p Fh(:)15 b(:)g(:)75 -2528 y Fq(\017)60 b Fs(Requires:)40 b(rep)s(ository)-8 -b(.)75 2675 y Fq(\017)60 b Fs(Changes:)40 b(curren)m(t)31 -b(directory)-8 b(.)125 2971 y(This)28 b(command)i(is)g(a)h(v)-5 +3581 2603 28 4 v 32 w(1)p 3658 2603 V 33 w(0.)40 b(T)-8 +b(o)0 2728 y(see)31 b(what)f(has)g(happ)s(ened)f(on)h(that)h(branc)m +(h,)f(the)h(follo)m(wing)e(can)h(b)s(e)g(used:)240 2983 +y Fn($)47 b(cvs)g(diff)g(-r)g(RELEASE_1_0)e(-r)i(EXPR1)125 +3259 y Fs(A)30 b(command)g(lik)m(e)g(this)f(can)i(b)s(e)f(used)f(to)i +(pro)s(duce)e(a)i(con)m(text)h(di\013)d(b)s(et)m(w)m(een)i(t)m(w)m(o)h +(releases:)240 3514 y Fn($)47 b(cvs)g(diff)g(-c)g(-r)g(RELEASE_1_0)e +(-r)i(RELEASE_1_1)e(>)i(diffs)125 3790 y Fs(If)29 b(y)m(ou)h(are)h +(main)m(taining)d(ChangeLogs,)j(a)f(command)g(lik)m(e)f(the)h(follo)m +(wing)f(just)g(b)s(efore)h(y)m(ou)g(commit)g(y)m(our)0 +3915 y(c)m(hanges)k(ma)m(y)f(help)f(y)m(ou)h(write)f(the)h(ChangeLog)g +(en)m(try)-8 b(.)49 b(All)31 b(lo)s(cal)h(mo)s(di\014cations)f(that)j +(ha)m(v)m(e)g(not)f(y)m(et)h(b)s(een)0 4039 y(committed)d(will)c(b)s(e) +j(prin)m(ted.)240 4295 y Fn($)47 b(cvs)g(diff)g(-u)g(|)h(less)0 +4761 y Fm(A.9)67 b(exp)t(ort|Exp)t(ort)32 b(sources)e(from)h(CVS,)f +(similar)i(to)f(c)l(hec)l(k)l(out)75 5037 y Fq(\017)60 +b Fs(Synopsis:)39 b(exp)s(ort)30 b([-\015Nn])g([-r)g(rev)p +Fn(|)p Fs(-D)h(date])h([-k)e(subst])g([-d)g(dir])f(mo)s(dule)p +Fh(:)15 b(:)g(:)75 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 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 -3095 y(without)f(the)h Fr(cvs)f Fs(administrativ)m(e)f(directories.)42 +491 y(without)f(the)h Fr(cvs)f Fs(administrativ)m(e)f(directories.)42 b(F)-8 b(or)31 b(example,)g(y)m(ou)g(migh)m(t)g(use)g -Fn(export)e Fs(to)i(prepare)g(source)0 3220 y(for)g(shipmen)m(t)e +Fn(export)e Fs(to)i(prepare)g(source)0 616 y(for)g(shipmen)m(t)e (o\013-site.)43 b(This)29 b(command)i(requires)e(that)j(y)m(ou)f(sp)s (ecify)f(a)h(date)g(or)g(tag)h(\(with)e(`)p Fn(-D)p Fs(')h(or)g(`)p -Fn(-r)p Fs('\),)h(so)0 3344 y(that)f(y)m(ou)g(can)f(coun)m(t)h(on)g +Fn(-r)p Fs('\),)h(so)0 740 y(that)f(y)m(ou)g(can)f(coun)m(t)h(on)g (repro)s(ducing)d(the)i(source)h(y)m(ou)f(ship)f(to)i(others.)125 -3618 y(One)20 b(often)h(w)m(ould)f(lik)m(e)g(to)i(use)e(`)p +1022 y(One)20 b(often)h(w)m(ould)f(lik)m(e)g(to)i(use)e(`)p Fn(-kv)p Fs(')h(with)f Fn(cvs)29 b(export)p Fs(.)36 b(This)19 b(causes)i(an)m(y)h Fr(r)n(cs)e Fs(k)m(eyw)m(ords)h(to)g(b)s(e)g -(expanded)0 3743 y(suc)m(h)34 b(that)h(an)f(imp)s(ort)e(done)i(at)h +(expanded)0 1147 y(suc)m(h)34 b(that)h(an)f(imp)s(ort)e(done)i(at)h (some)g(other)f(site)g(will)e(not)j(lose)f(the)g(k)m(eyw)m(ord)h -(revision)d(information.)51 b(But)0 3868 y(b)s(e)31 b(a)m(w)m(are)h +(revision)d(information.)51 b(But)0 1271 y(b)s(e)31 b(a)m(w)m(are)h (that)g(do)s(esn't)f(handle)f(an)h(exp)s(ort)g(con)m(taining)g(binary)f (\014les)g(correctly)-8 b(.)44 b(Also)31 b(b)s(e)g(a)m(w)m(are)i(that)e -(after)0 3992 y(ha)m(ving)f(used)g(`)p Fn(-kv)p Fs(',)g(one)h(can)g(no) +(after)0 1396 y(ha)m(ving)f(used)g(`)p Fn(-kv)p Fs(',)g(one)h(can)g(no) g(longer)f(use)g(the)h Fn(ident)e Fs(command)h(\(whic)m(h)g(is)g(part)g -(of)h(the)f Fr(r)n(cs)g Fs(suite|see)0 4117 y(iden)m(t\(1\)\))j(whic)m +(of)h(the)f Fr(r)n(cs)g Fs(suite|see)0 1520 y(iden)m(t\(1\)\))j(whic)m (h)f(lo)s(oks)g(for)g Fr(r)n(cs)f Fs(k)m(eyw)m(ord)i(strings.)46 b(If)32 b(y)m(ou)h(w)m(an)m(t)h(to)f(b)s(e)f(able)g(to)h(use)f -Fn(ident)f Fs(y)m(ou)i(m)m(ust)g(not)0 4241 y(use)d(`)p -Fn(-kv)p Fs('.)0 4645 y Fk(A.9.1)62 b(exp)s(ort)31 b(options)125 -4919 y Fs(These)f(standard)h(options)f(are)i(supp)s(orted)d(b)m(y)i +Fn(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 -(92,)0 5044 y(for)e(a)h(complete)g(description)d(of)j(them\):)0 -5340 y Fn(-D)f Fo(date)183 b Fs(Use)31 b(the)f(most)h(recen)m(t)g -(revision)e(no)h(later)h(than)f Fo(date)p Fs(.)p eop -%%Page: 108 110 -108 109 bop 0 -116 a Fs(108)2366 b(CVS|Concurren)m(t)29 -b(V)-8 b(ersions)30 b(System)0 366 y Fn(-f)384 b Fs(If)30 -b(no)h(matc)m(hing)g(revision)e(is)h(found,)g(retriev)m(e)i(the)f(most) -g(recen)m(t)h(revision)d(\(instead)h(of)i(ignoring)480 -491 y(the)f(\014le\).)0 667 y Fn(-l)384 b Fs(Lo)s(cal;)30 -b(run)f(only)h(in)f(curren)m(t)h(w)m(orking)g(directory)-8 -b(.)0 842 y Fn(-n)384 b Fs(Do)31 b(not)g(run)e(an)m(y)h(c)m(hec)m(k)m -(out)j(program.)0 1018 y Fn(-R)384 b Fs(Exp)s(ort)30 +(94,)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 +(retriev)m(e)i(the)f(most)g(recen)m(t)h(revision)d(\(instead)h(of)i +(ignoring)480 3170 y(the)f(\014le\).)0 3360 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 3551 y Fn(-n)384 b Fs(Do)31 b(not)g(run)e(an)m(y)h +(c)m(hec)m(k)m(out)j(program.)0 3742 y Fn(-R)384 b Fs(Exp)s(ort)30 b(directories)f(recursiv)m(ely)-8 b(.)40 b(This)28 b(is)i(on)g(b)m(y)g -(default.)0 1193 y Fn(-r)g Fo(tag)229 b Fs(Use)31 b(revision)d -Fo(tag)p Fs(.)125 1493 y(In)h(addition,)g(these)i(options)f(\(that)h +(default.)0 3932 y Fn(-r)g Fo(tag)229 b Fs(Use)31 b(revision)d +Fo(tag)p Fs(.)125 4247 y(In)h(addition,)g(these)i(options)f(\(that)h (are)g(common)f(to)h Fn(checkout)d Fs(and)i Fn(export)p -Fs(\))f(are)i(also)f(supp)s(orted:)0 1793 y Fn(-d)g Fo(dir)241 +Fs(\))f(are)i(also)f(supp)s(orted:)0 4562 y Fn(-d)g Fo(dir)241 b Fs(Create)34 b(a)g(directory)f(called)f Fo(dir)38 b Fs(for)33 b(the)h(w)m(orking)e(\014les,)i(instead)e(of)i(using)d(the)j -(mo)s(dule)e(name.)480 1918 y(Unless)d(y)m(ou)i(also)f(use)g(`)p +(mo)s(dule)e(name.)480 4687 y(Unless)d(y)m(ou)i(also)f(use)g(`)p Fn(-N)p Fs(',)h(the)g(paths)f(created)h(under)e Fo(dir)35 b Fs(will)28 b(b)s(e)h(as)i(short)f(as)h(p)s(ossible.)0 -2094 y Fn(-k)f Fo(subst)145 b Fs(Set)31 b(k)m(eyw)m(ord)f(expansion)g -(mo)s(de)g(\(see)h(Section)f(17.4)i([Substitution)c(mo)s(des],)i(page)h -(79\).)0 2269 y Fn(-N)384 b Fs(Only)21 b(useful)h(together)i(with)e(`)p +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 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 -2394 y(in)36 b(y)m(our)g(w)m(orking)g(directory)-8 b(.)61 +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 2518 y(y)m(ou)d(sp)s(ecify)e(an)h -(explicit)f(target)j(directory)-8 b(.\))0 2972 y Fm(A.10)68 -b(history|Sho)l(w)31 b(status)g(of)g(\014les)g(and)f(users)75 -3246 y Fq(\017)60 b Fs(Synopsis:)39 b(history)29 b([-rep)s(ort])h -([-\015ags])i([-options)e(args])h([\014les)p Fh(:)15 -b(:)g(:)p Fs(])75 3397 y Fq(\017)60 b Fs(Requires:)40 -b(the)30 b(\014le)g(`)p Fn($CVSROOT/CVSROOT/history)o -Fs(')75 3547 y Fq(\017)60 b Fs(Changes:)40 b(nothing.)125 -3847 y Fr(cvs)34 b Fs(can)i(k)m(eep)h(a)f(history)e(\014le)h(that)h -(trac)m(ks)h(eac)m(h)g(use)e(of)h(the)g Fn(checkout)p -Fs(,)f Fn(commit)p Fs(,)h Fn(rtag)p Fs(,)g Fn(update)p -Fs(,)g(and)0 3971 y Fn(release)28 b Fs(commands.)41 b(Y)-8 -b(ou)31 b(can)f(use)g Fn(history)f Fs(to)i(displa)m(y)d(this)i -(information)e(in)h(v)-5 b(arious)30 b(formats.)125 4246 +(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 +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) +e(args])h([\014les)p Fh(:)15 b(:)g(:)p Fs(])75 792 y +Fq(\017)60 b Fs(Requires:)40 b(the)30 b(\014le)g(`)p +Fn($CVSROOT/CVSROOT/history)o Fs(')75 943 y Fq(\017)60 +b Fs(Changes:)40 b(nothing.)125 1245 y Fr(cvs)34 b Fs(can)i(k)m(eep)h +(a)f(history)e(\014le)h(that)h(trac)m(ks)h(eac)m(h)g(use)e(of)h(the)g +Fn(checkout)p Fs(,)f Fn(commit)p Fs(,)h Fn(rtag)p Fs(,)g +Fn(update)p Fs(,)g(and)0 1369 y Fn(release)28 b Fs(commands.)41 +b(Y)-8 b(ou)31 b(can)f(use)g Fn(history)f Fs(to)i(displa)m(y)d(this)i +(information)e(in)h(v)-5 b(arious)30 b(formats.)125 1644 y(Logging)g(m)m(ust)g(b)s(e)g(enabled)g(b)m(y)g(creating)h(the)f (\014le)g(`)p Fn($CVSROOT/CVSROOT/history)o Fs('.)125 -4520 y Fi(W)-8 b(arning:)39 b Fn(history)25 b Fs(uses)i(`)p +1919 y Fi(W)-8 b(arning:)39 b Fn(history)25 b Fs(uses)i(`)p Fn(-f)p Fs(',)h(`)p Fn(-l)p Fs(',)g(`)p Fn(-n)p Fs(',)h(and)d(`)p Fn(-p)p Fs(')i(in)e(w)m(a)m(ys)i(that)g(con\015ict)f(with)f(the)i -(normal)e(use)h(inside)0 4645 y Fr(cvs)i Fs(\(see)j(Section)e(A.4)h -([Common)f(options],)g(page)i(92\).)0 5065 y Fk(A.10.1)62 -b(history)31 b(options)125 5340 y Fs(Sev)m(eral)f(options)g(\(sho)m(wn) +(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 +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:)p eop -%%Page: 109 111 -109 110 bop 0 -116 a Fs(App)s(endix)28 b(A:)i(Guide)g(to)h(CVS)e -(commands)2210 b(109)0 366 y Fn(-c)384 b Fs(Rep)s(ort)30 -b(on)g(eac)m(h)i(time)e(commit)g(w)m(as)h(used)f(\(i.e.,)h(eac)m(h)g -(time)f(the)h(rep)s(ository)e(w)m(as)i(mo)s(di\014ed\).)0 -535 y Fn(-e)384 b Fs(Ev)m(erything)30 b(\(all)f(record)i(t)m(yp)s -(es\);)g(equiv)-5 b(alen)m(t)29 b(to)j(sp)s(ecifying)c(`)p -Fn(-xMACFROGWUT)p Fs('.)0 703 y Fn(-m)i Fo(mo)s(dule)480 -827 y Fs(Rep)s(ort)e(on)g(a)h(particular)e(mo)s(dule.)38 -b(\(Y)-8 b(ou)29 b(can)g(meaningfully)c(use)k(`)p Fn(-m)p -Fs(')f(more)g(than)g(once)h(on)g(the)480 952 y(command)h(line.\))0 -1120 y Fn(-o)384 b Fs(Rep)s(ort)30 b(on)g(c)m(hec)m(k)m(ed-out)j(mo)s -(dules.)0 1288 y Fn(-T)384 b Fs(Rep)s(ort)30 b(on)g(all)g(tags.)0 -1457 y Fn(-x)g Fo(t)m(yp)s(e)180 b Fs(Extract)43 b(a)f(particular)e -(set)i(of)g(record)g(t)m(yp)s(es)g Fo(t)m(yp)s(e)47 b -Fs(from)41 b(the)h Fr(cvs)f Fs(history)-8 b(.)74 b(The)42 -b(t)m(yp)s(es)g(are)480 1581 y(indicated)29 b(b)m(y)h(single)f -(letters,)i(whic)m(h)e(y)m(ou)i(ma)m(y)g(sp)s(ecify)e(in)g(com)m -(bination.)480 1727 y(Certain)h(commands)g(ha)m(v)m(e)h(a)g(single)e -(record)h(t)m(yp)s(e:)480 1896 y Fn(F)432 b Fs(release)480 -2064 y Fn(O)g Fs(c)m(hec)m(k)m(out)480 2232 y Fn(E)g -Fs(exp)s(ort)480 2400 y Fn(T)g Fs(rtag)480 2568 y(One)30 -b(of)g(four)g(record)g(t)m(yp)s(es)h(ma)m(y)g(result)e(from)h(an)g(up)s -(date:)480 2737 y Fn(C)432 b Fs(A)21 b(merge)g(w)m(as)f(necessary)h -(but)f(collisions)e(w)m(ere)j(detected)g(\(requiring)e(man)m(ual)g -(merg-)960 2861 y(ing\).)480 3029 y Fn(G)432 b Fs(A)30 +(kind)f(of)h(rep)s(ort)g(is)f(generated:)0 3047 y Fn(-c)384 +b Fs(Rep)s(ort)30 b(on)g(eac)m(h)i(time)e(commit)g(w)m(as)h(used)f +(\(i.e.,)h(eac)m(h)g(time)f(the)h(rep)s(ository)e(w)m(as)i(mo)s +(di\014ed\).)0 3224 y Fn(-e)384 b Fs(Ev)m(erything)30 +b(\(all)f(record)i(t)m(yp)s(es\);)g(equiv)-5 b(alen)m(t)29 +b(to)j(sp)s(ecifying)c(`)p Fn(-xMACFROGWUT)p Fs('.)0 +3401 y Fn(-m)i Fo(mo)s(dule)480 3525 y Fs(Rep)s(ort)e(on)g(a)h +(particular)e(mo)s(dule.)38 b(\(Y)-8 b(ou)29 b(can)g(meaningfully)c +(use)k(`)p Fn(-m)p Fs(')f(more)g(than)g(once)h(on)g(the)480 +3650 y(command)h(line.\))0 3827 y Fn(-o)384 b Fs(Rep)s(ort)30 +b(on)g(c)m(hec)m(k)m(ed-out)j(mo)s(dules.)0 4004 y Fn(-T)384 +b Fs(Rep)s(ort)30 b(on)g(all)g(tags.)0 4180 y Fn(-x)g +Fo(t)m(yp)s(e)180 b Fs(Extract)43 b(a)f(particular)e(set)i(of)g(record) +g(t)m(yp)s(es)g Fo(t)m(yp)s(e)47 b Fs(from)41 b(the)h +Fr(cvs)f Fs(history)-8 b(.)74 b(The)42 b(t)m(yp)s(es)g(are)480 +4305 y(indicated)29 b(b)m(y)h(single)f(letters,)i(whic)m(h)e(y)m(ou)i +(ma)m(y)g(sp)s(ecify)e(in)g(com)m(bination.)480 4456 +y(Certain)h(commands)g(ha)m(v)m(e)h(a)g(single)e(record)h(t)m(yp)s(e:) +480 4633 y Fn(F)432 b Fs(release)480 4809 y Fn(O)g Fs(c)m(hec)m(k)m +(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 +(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 -3197 y Fn(U)432 b Fs(A)30 b(w)m(orking)g(\014le)g(w)m(as)g(copied)g -(from)g(the)h(rep)s(ository)-8 b(.)480 3366 y Fn(W)432 +836 y Fn(U)432 b Fs(A)30 b(w)m(orking)g(\014le)g(w)m(as)g(copied)g +(from)g(the)h(rep)s(ository)-8 b(.)480 1008 y Fn(W)432 b Fs(The)28 b(w)m(orking)f(cop)m(y)i(of)f(a)h(\014le)e(w)m(as)h (deleted)g(during)e(up)s(date)i(\(b)s(ecause)g(it)g(w)m(as)g(gone)960 -3490 y(from)i(the)g(rep)s(ository\).)480 3658 y(One)g(of)g(three)h +1132 y(from)i(the)g(rep)s(ository\).)480 1305 y(One)g(of)g(three)h (record)f(t)m(yp)s(es)h(results)e(from)h(commit:)480 -3827 y Fn(A)432 b Fs(A)30 b(\014le)g(w)m(as)h(added)e(for)i(the)f -(\014rst)g(time.)480 3995 y Fn(M)432 b Fs(A)30 b(\014le)g(w)m(as)h(mo)s -(di\014ed.)480 4163 y Fn(R)432 b Fs(A)30 b(\014le)g(w)m(as)h(remo)m(v)m -(ed.)125 4459 y(The)i(options)g(sho)m(wn)g(as)i(`)p Fn(-flags)p +1477 y Fn(A)432 b Fs(A)30 b(\014le)g(w)m(as)h(added)e(for)i(the)f +(\014rst)g(time.)480 1649 y Fn(M)432 b Fs(A)30 b(\014le)g(w)m(as)h(mo)s +(di\014ed.)480 1822 y Fn(R)432 b Fs(A)30 b(\014le)g(w)m(as)h(remo)m(v)m +(ed.)125 2120 y(The)i(options)g(sho)m(wn)g(as)i(`)p Fn(-flags)p Fs(')d(constrain)i(or)f(expand)h(the)g(rep)s(ort)f(without)g(requiring) -e(option)j(argu-)0 4583 y(men)m(ts:)0 4879 y Fn(-a)384 +e(option)j(argu-)0 2244 y(men)m(ts:)0 2542 y Fn(-a)384 b Fs(Sho)m(w)21 b(data)h(for)f(all)g(users)f(\(the)i(default)f(is)g(to) h(sho)m(w)f(data)h(only)f(for)g(the)h(user)f(executing)g -Fn(history)p Fs(\).)0 5047 y Fn(-l)384 b Fs(Sho)m(w)30 -b(last)g(mo)s(di\014cation)f(only)-8 b(.)0 5215 y Fn(-w)384 +Fn(history)p Fs(\).)0 2714 y Fn(-l)384 b Fs(Sho)m(w)30 +b(last)g(mo)s(di\014cation)f(only)-8 b(.)0 2887 y Fn(-w)384 b Fs(Sho)m(w)33 b(only)f(the)h(records)g(for)g(mo)s(di\014cations)e (done)i(from)g(the)g(same)g(w)m(orking)g(directory)f(where)480 -5340 y Fn(history)c Fs(is)i(executing.)p eop -%%Page: 110 112 -110 111 bop 0 -116 a Fs(110)2366 b(CVS|Concurren)m(t)29 -b(V)-8 b(ersions)30 b(System)125 366 y(The)f(options)h(sho)m(wn)g(as)g -(`)p Fn(-options)f Fo(args)t Fs(')i(constrain)e(the)i(rep)s(ort)f -(based)g(on)g(an)g(argumen)m(t:)0 688 y Fn(-b)g Fo(str)247 -b Fs(Sho)m(w)34 b(data)h(bac)m(k)g(to)g(a)g(record)f(con)m(taining)g -(the)g(string)g Fo(str)40 b Fs(in)33 b(either)h(the)g(mo)s(dule)f -(name,)j(the)480 812 y(\014le)29 b(name,)i(or)g(the)f(rep)s(ository)f -(path.)0 1009 y Fn(-D)h Fo(date)183 b Fs(Sho)m(w)27 b(data)h(since)e -Fo(date)p Fs(.)40 b(This)26 b(is)g(sligh)m(tly)f(di\013eren)m(t)i(from) -g(the)g(normal)f(use)h(of)g(`)p Fn(-D)j Fo(date)5 b Fs(',)29 -b(whic)m(h)480 1134 y(selects)i(the)f(new)m(est)h(revision)e(older)h -(than)g Fo(date)p Fs(.)0 1331 y Fn(-p)g Fo(rep)s(ository)480 -1455 y Fs(Sho)m(w)35 b(data)h(for)f(a)h(particular)e(source)h(rep)s -(ository)g(\(y)m(ou)h(can)f(sp)s(ecify)f(sev)m(eral)i(`)p -Fn(-p)p Fs(')f(options)g(on)480 1580 y(the)c(same)f(command)g(line\).)0 -1777 y Fn(-r)g Fo(rev)230 b Fs(Sho)m(w)43 b(records)f(referring)g(to)i -(revisions)d(since)h(the)h(revision)f(or)h(tag)h(named)e -Fo(rev)51 b Fs(app)s(ears)42 b(in)480 1901 y(individual)26 -b Fr(r)n(cs)j Fs(\014les.)40 b(Eac)m(h)31 b Fr(r)n(cs)e -Fs(\014le)h(is)f(searc)m(hed)i(for)f(the)h(revision)d(or)j(tag.)0 -2098 y Fn(-t)f Fo(tag)229 b Fs(Sho)m(w)38 b(records)g(since)f(tag)i -Fo(tag)48 b Fs(w)m(as)38 b(last)g(added)g(to)g(the)h(the)f(history)f -(\014le.)63 b(This)37 b(di\013ers)f(from)480 2223 y(the)31 -b(`)p Fn(-r)p Fs(')g(\015ag)g(ab)s(o)m(v)m(e)h(in)d(that)j(it)e(reads)g -(only)g(the)h(history)f(\014le,)g(not)h(the)g Fr(r)n(cs)f -Fs(\014les,)g(and)g(is)g(m)m(uc)m(h)480 2347 y(faster.)0 -2544 y Fn(-u)g Fo(name)142 b Fs(Sho)m(w)30 b(records)g(for)g(user)g -Fo(name)p Fs(.)0 3094 y Fm(A.11)68 b(imp)t(ort|Imp)t(ort)31 -b(sources)f(in)l(to)i(CVS,)e(using)g(v)l(endor)h(branc)l(hes)75 -3379 y Fq(\017)60 b Fs(Synopsis:)39 b(imp)s(ort)28 b([-options])j(rep)s +3011 y Fn(history)c Fs(is)i(executing.)125 3309 y(The)f(options)h(sho)m +(wn)g(as)g(`)p Fn(-options)f Fo(args)t Fs(')i(constrain)e(the)i(rep)s +(ort)f(based)g(on)g(an)g(argumen)m(t:)0 3607 y Fn(-b)g +Fo(str)247 b Fs(Sho)m(w)34 b(data)h(bac)m(k)g(to)g(a)g(record)f(con)m +(taining)g(the)g(string)g Fo(str)40 b Fs(in)33 b(either)h(the)g(mo)s +(dule)f(name,)j(the)480 3731 y(\014le)29 b(name,)i(or)g(the)f(rep)s +(ository)f(path.)0 3904 y Fn(-D)h Fo(date)183 b Fs(Sho)m(w)27 +b(data)h(since)e Fo(date)p Fs(.)40 b(This)26 b(is)g(sligh)m(tly)f +(di\013eren)m(t)i(from)g(the)g(normal)f(use)h(of)g(`)p +Fn(-D)j Fo(date)5 b Fs(',)29 b(whic)m(h)480 4028 y(selects)i(the)f(new) +m(est)h(revision)e(older)h(than)g Fo(date)p Fs(.)0 4200 +y Fn(-p)g Fo(rep)s(ository)480 4325 y Fs(Sho)m(w)35 b(data)h(for)f(a)h +(particular)e(source)h(rep)s(ository)g(\(y)m(ou)h(can)f(sp)s(ecify)f +(sev)m(eral)i(`)p Fn(-p)p Fs(')f(options)g(on)480 4449 +y(the)c(same)f(command)g(line\).)0 4622 y Fn(-r)g Fo(rev)230 +b Fs(Sho)m(w)43 b(records)f(referring)g(to)i(revisions)d(since)h(the)h +(revision)f(or)h(tag)h(named)e Fo(rev)51 b Fs(app)s(ears)42 +b(in)480 4746 y(individual)26 b Fr(r)n(cs)j Fs(\014les.)40 +b(Eac)m(h)31 b Fr(r)n(cs)e Fs(\014le)h(is)f(searc)m(hed)i(for)f(the)h +(revision)d(or)j(tag.)0 4919 y Fn(-t)f Fo(tag)229 b Fs(Sho)m(w)38 +b(records)g(since)f(tag)i Fo(tag)48 b Fs(w)m(as)38 b(last)g(added)g(to) +g(the)h(the)f(history)f(\014le.)63 b(This)37 b(di\013ers)f(from)480 +5043 y(the)31 b(`)p Fn(-r)p Fs(')g(\015ag)g(ab)s(o)m(v)m(e)h(in)d(that) +j(it)e(reads)g(only)g(the)h(history)f(\014le,)g(not)h(the)g +Fr(r)n(cs)f Fs(\014les,)g(and)g(is)g(m)m(uc)m(h)480 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 +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 (ository)e(v)m(endortag)j(releasetag)p Fh(:)15 b(:)g(:)75 -3540 y Fq(\017)60 b Fs(Requires:)40 b(Rep)s(ository)-8 +801 y Fq(\017)60 b Fs(Requires:)40 b(Rep)s(ository)-8 b(,)30 b(source)g(distribution)d(directory)-8 b(.)75 -3701 y Fq(\017)60 b Fs(Changes:)40 b(rep)s(ository)-8 -b(.)125 4022 y(Use)34 b Fn(import)e Fs(to)j(incorp)s(orate)e(an)h(en)m +956 y Fq(\017)60 b Fs(Changes:)40 b(rep)s(ository)-8 +b(.)125 1266 y(Use)34 b Fn(import)e Fs(to)j(incorp)s(orate)e(an)h(en)m (tire)f(source)h(distribution)d(from)i(an)h(outside)f(source)h(\(e.g.,) -j(a)d(source)0 4147 y(v)m(endor\))d(in)m(to)h(y)m(our)f(source)g(rep)s +j(a)d(source)0 1391 y(v)m(endor\))d(in)m(to)h(y)m(our)f(source)g(rep)s (ository)g(directory)-8 b(.)43 b(Y)-8 b(ou)32 b(can)f(use)g(this)f -(command)h(b)s(oth)g(for)g(initial)e(creation)0 4271 +(command)h(b)s(oth)g(for)g(initial)e(creation)0 1515 y(of)i(a)h(rep)s(ository)-8 b(,)31 b(and)g(for)g(wholesale)g(up)s (dates)f(to)i(the)g(mo)s(dule)d(from)i(the)h(outside)e(source.)44 -b(See)31 b(Chapter)g(13)0 4396 y([T)-8 b(rac)m(king)31 -b(sources],)g(page)g(65,)g(for)f(a)h(discussion)d(on)i(this)f(sub)5 -b(ject.)125 4681 y(The)30 b Fo(rep)s(ository)38 b Fs(argumen)m(t)32 +b(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(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 4806 +(directory\))f(under)e(the)i Fr(cvs)g Fs(ro)s(ot)0 2044 y(directory)f(for)g(rep)s(ositories;)f(if)g(the)i(directory)f(did)e -(not)j(exist,)f(imp)s(ort)f(creates)j(it.)125 5091 y(When)j(y)m(ou)g +(not)j(exist,)f(imp)s(ort)f(creates)j(it.)125 2323 y(When)j(y)m(ou)g (use)g(imp)s(ort)f(for)h(up)s(dates)f(to)i(source)g(that)g(has)f(b)s (een)f(mo)s(di\014ed)f(in)h(y)m(our)i(source)f(rep)s(ository)0 -5215 y(\(since)23 b(a)h(prior)d(imp)s(ort\),)j(it)f(will)e(notify)h(y)m +2448 y(\(since)23 b(a)h(prior)d(imp)s(ort\),)j(it)f(will)e(notify)h(y)m (ou)i(of)g(an)m(y)f(\014les)f(that)i(con\015ict)g(in)e(the)h(t)m(w)m(o) -i(branc)m(hes)e(of)g(dev)m(elopmen)m(t;)0 5340 y(use)30 +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.)p eop -%%Page: 111 113 -111 112 bop 0 -116 a Fs(App)s(endix)28 b(A:)i(Guide)g(to)h(CVS)e -(commands)2210 b(111)125 366 y(If)25 b Fr(cvs)g Fs(decides)g(a)h -(\014le)f(should)f(b)s(e)h(ignored)g(\(see)h(Section)g(C.9)g -([cvsignore],)i(page)e(148\),)j(it)c(do)s(es)h(not)g(imp)s(ort)0 -491 y(it)40 b(and)g(prin)m(ts)g(`)p Fn(I)30 b Fs(')41 -b(follo)m(w)m(ed)f(b)m(y)h(the)g(\014lename)f(\(see)i(Section)e(A.11.2) -j([imp)s(ort)c(output],)44 b(page)d(112,)k(for)c(a)0 -616 y(complete)31 b(description)d(of)j(the)f(output\).)125 -904 y(If)i(the)h(\014le)f(`)p Fn($CVSROOT/CVSROOT/cvswrapper)o(s)p +(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 +(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 +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 -(the)f(sp)s(eci\014ca-)0 1029 y(tions)c(in)f(that)j(\014le)d(will)f(b)s +(the)f(sp)s(eci\014ca-)0 3505 y(tions)c(in)f(that)j(\014le)d(will)f(b)s (e)i(treated)i(as)f(pac)m(k)-5 b(ages)32 b(and)d(the)g(appropriate)g (\014ltering)f(will)f(b)s(e)i(p)s(erformed)f(on)i(the)0 -1154 y(\014le/directory)f(b)s(efore)h(b)s(eing)f(imp)s(orted,)g(See)i +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 -1443 y(The)h(outside)g(source)i(is)e(sa)m(v)m(ed)i(in)e(a)h +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 -1567 y(this)d(branc)m(h;)i(for)f(example,)g(\014les)f(from)h(the)g +4034 y(this)d(branc)m(h;)i(for)f(example,)g(\014les)f(from)h(the)g (\014rst)g(imp)s(orted)e(collection)i(of)g(source)g(will)d(b)s(e)j -(revision)e(1.1.1.1,)0 1692 y(then)f(\014les)f(from)h(the)h(\014rst)e +(revision)e(1.1.1.1,)0 4158 y(then)f(\014les)f(from)h(the)h(\014rst)e (imp)s(orted)g(up)s(date)h(will)d(b)s(e)j(revision)f(1.1.1.2,)k(and)d -(so)g(on.)125 1981 y(A)m(t)h(least)g(three)f(argumen)m(ts)h(are)g +(so)g(on.)125 4438 y(A)m(t)h(least)g(three)f(argumen)m(ts)h(are)g (required.)39 b Fo(rep)s(ository)e Fs(is)29 b(needed)h(to)h(iden)m -(tify)e(the)i(collection)f(of)h(source.)0 2105 y Fo(v)m(endortag)g +(tify)e(the)i(collection)f(of)h(source.)0 4562 y Fo(v)m(endortag)g Fs(is)22 b(a)g(tag)i(for)e(the)h(en)m(tire)f(branc)m(h)g(\(e.g.,)j(for) e(1.1.1\).)40 b(Y)-8 b(ou)23 b(m)m(ust)f(also)g(sp)s(ecify)f(at)i -(least)g(one)f Fo(releasetag)0 2230 y Fs(to)31 b(iden)m(tify)e(the)h +(least)g(one)f Fo(releasetag)0 4687 y Fs(to)31 b(iden)m(tify)e(the)h (\014les)g(at)h(the)f(lea)m(v)m(es)i(created)g(eac)m(h)f(time)f(y)m(ou) -h(execute)h Fn(import)p Fs(.)125 2519 y(Note)j(that)f +h(execute)h Fn(import)p Fs(.)125 4966 y(Note)j(that)f Fn(import)e Fs(do)s(es)h Fo(not)j Fs(c)m(hange)f(the)f(directory)f(in)g (whic)m(h)f(y)m(ou)i(in)m(v)m(ok)m(e)h(it.)50 b(In)33 -b(particular,)g(it)g(do)s(es)0 2643 y(not)d(set)h(up)e(that)i +b(particular,)g(it)g(do)s(es)0 5091 y(not)d(set)h(up)e(that)i (directory)f(as)g(a)h Fr(cvs)e Fs(w)m(orking)h(directory;)g(if)f(y)m (ou)i(w)m(an)m(t)g(to)g(w)m(ork)f(with)f(the)h(sources)h(imp)s(ort)0 -2768 y(them)f(\014rst)f(and)g(then)g(c)m(hec)m(k)j(them)d(out)h(in)m -(to)g(a)g(di\013eren)m(t)f(directory)h(\(see)g(Section)g(3.1)h -([Getting)f(the)g(source],)0 2892 y(page)h(11\).)0 3442 -y Fk(A.11.1)62 b(imp)s(ort)31 b(options)125 3731 y Fs(This)f(standard)h -(option)g(is)g(supp)s(orted)f(b)m(y)i Fn(import)f Fs(\(see)h(Section)g -(A.4)h([Common)f(options],)g(page)h(92,)g(for)0 3855 -y(a)e(complete)g(description\):)0 4184 y Fn(-m)f Fo(message)480 -4309 y Fs(Use)h Fo(message)36 b Fs(as)31 b(log)f(information,)f -(instead)h(of)h(in)m(v)m(oking)e(an)h(editor.)125 4638 -y(There)f(are)i(three)g(additional)d(sp)s(ecial)h(options.)0 -4966 y Fn(-b)h Fo(branc)m(h)83 b Fs(Sp)s(ecify)34 b(a)i(\014rst-lev)m -(el)f(branc)m(h)g(other)g(than)h(1.1.1.)58 b(Unless)34 -b(the)i(`)p Fn(-b)30 b Fo(branc)m(h)p Fs(')35 b(\015ag)h(is)f(giv)m -(en,)i(re-)480 5091 y(visions)h(will)g Fo(alw)m(a)m(ys)44 -b Fs(b)s(e)c(made)g(to)h(the)g(branc)m(h)e(1.1.1|ev)m(en)k(if)c(a)i -Fo(v)m(endortag)49 b Fs(that)41 b(matc)m(hes)480 5215 -y(another)36 b(branc)m(h)f(is)f(giv)m(en!)56 b(What)36 +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 +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 +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 +(options.)0 1804 y Fn(-b)h Fo(branc)m(h)83 b Fs(Sp)s(ecify)34 +b(a)i(\014rst-lev)m(el)f(branc)m(h)g(other)g(than)h(1.1.1.)58 +b(Unless)34 b(the)i(`)p Fn(-b)30 b Fo(branc)m(h)p Fs(')35 +b(\015ag)h(is)f(giv)m(en,)i(re-)480 1929 y(visions)h(will)g +Fo(alw)m(a)m(ys)44 b Fs(b)s(e)c(made)g(to)h(the)g(branc)m(h)e(1.1.1|ev) +m(en)k(if)c(a)i Fo(v)m(endortag)49 b Fs(that)41 b(matc)m(hes)480 +2053 y(another)36 b(branc)m(h)f(is)f(giv)m(en!)56 b(What)36 b(happ)s(ens)e(in)g(that)i(case,)i(is)d(that)h(the)g(tag)g(will)d(b)s -(e)i(reset)h(to)480 5340 y(1.1.1.)43 b(W)-8 b(arning:)40 +(e)i(reset)h(to)480 2178 y(1.1.1.)43 b(W)-8 b(arning:)40 b(This)28 b(b)s(eha)m(vior)i(migh)m(t)g(c)m(hange)h(in)f(the)g(future.) -p eop -%%Page: 112 114 -112 113 bop 0 -116 a Fs(112)2366 b(CVS|Concurren)m(t)29 -b(V)-8 b(ersions)30 b(System)0 366 y Fn(-k)g Fo(subst)145 -b Fs(Indicate)31 b(the)g(R)m(CS)g(k)m(eyw)m(ord)h(expansion)e(mo)s(de)h -(desired.)42 b(This)30 b(setting)h(will)e(apply)h(to)i(all)e(\014les) -480 491 y(created)c(during)c(the)j(imp)s(ort,)f(but)g(not)g(to)i(an)m -(y)e(\014les)g(that)h(previously)d(existed)i(in)g(the)g(rep)s(ository) --8 b(.)480 616 y(See)31 b(Section)f(17.4)i([Substitution)c(mo)s(des],)i -(page)h(79,)h(for)e(a)g(list)f(of)i(v)-5 b(alid)29 b(`)p -Fn(-k)p Fs(')h(settings.)0 801 y Fn(-I)g Fo(name)142 +0 2357 y Fn(-k)g Fo(subst)145 b Fs(Indicate)31 b(the)g(R)m(CS)g(k)m +(eyw)m(ord)h(expansion)e(mo)s(de)h(desired.)42 b(This)30 +b(setting)h(will)e(apply)h(to)i(all)e(\014les)480 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 +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 -926 y(rep)s(eatedly)-8 b(.)53 b(T)-8 b(o)34 b(a)m(v)m(oid)h(ignoring)e +2911 y(rep)s(eatedly)-8 b(.)53 b(T)-8 b(o)34 b(a)m(v)m(oid)h(ignoring)e (an)m(y)i(\014les)e(at)j(all)d(\(ev)m(en)i(those)g(ignored)f(b)m(y)g -(default\),)h(sp)s(ecify)480 1051 y(`-I)c(!'.)480 1206 +(default\),)h(sp)s(ecify)480 3035 y(`-I)c(!'.)480 3187 y Fo(name)56 b Fs(can)c(b)s(e)e(a)i(\014le)e(name)h(pattern)h(of)f(the) g(same)h(t)m(yp)s(e)f(that)h(y)m(ou)g(can)f(sp)s(ecify)f(in)g(the)480 -1330 y(`)p Fn(.cvsignore)p Fs(')28 b(\014le.)40 b(See)31 -b(Section)f(C.9)g([cvsignore],)h(page)g(148.)0 1516 y +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 Fn(-W)f Fo(sp)s(ec)184 b Fs(Sp)s(ecify)42 b(\014le)g(names)i(that)g (should)e(b)s(e)h(\014ltered)f(during)f(imp)s(ort.)79 -b(Y)-8 b(ou)44 b(can)g(use)f(this)f(option)480 1641 y(rep)s(eatedly)-8 -b(.)480 1796 y Fo(sp)s(ec)59 b Fs(can)54 b(b)s(e)f(a)h(\014le)f(name)h +b(Y)-8 b(ou)44 b(can)g(use)f(this)f(option)480 3616 y(rep)s(eatedly)-8 +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 1920 y(`)p Fn(.cvswrappers)p Fs(')28 +(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 2388 y Fk(A.11.2)62 b(imp)s(ort)31 b(output)125 -2667 y Fn(import)41 b Fs(k)m(eeps)i(y)m(ou)g(informed)e(of)i(its)f +b(page)h(139.)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 2792 y(c)m(haracter)32 b(indicating)c(the)j -(status)f(of)h(the)g(\014le:)0 3102 y Fn(U)f Fo(\014le)285 +(preceded)d(b)m(y)h(one)0 4732 y(c)m(haracter)32 b(indicating)c(the)j +(status)f(of)h(the)g(\014le:)0 5036 y Fn(U)f Fo(\014le)285 b Fs(The)43 b(\014le)g(already)g(exists)g(in)f(the)i(rep)s(ository)e (and)h(has)g(not)h(b)s(een)e(lo)s(cally)g(mo)s(di\014ed;)49 -b(a)43 b(new)480 3227 y(revision)29 b(has)h(b)s(een)f(created)j(\(if)e -(necessary\).)0 3413 y Fn(N)g Fo(\014le)285 b Fs(The)30 +b(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(.)0 3599 y Fn(C)30 b Fo(\014le)285 +(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 +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 3723 y(merge)i(the)f(c)m(hanges.)0 -3909 y Fn(I)g Fo(\014le)285 b Fs(The)30 b(\014le)f(is)h(b)s(eing)f +(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 -4095 y Fn(L)f Fo(\014le)285 b Fs(The)42 b(\014le)f(is)g(a)h(sym)m(b)s +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 4220 +g(links.)73 b(P)m(eople)43 b(p)s(erio)s(dically)480 961 y(suggest)37 b(that)g(this)e(b)s(eha)m(vior)g(should)f(b)s(e)h(c)m (hanged,)k(but)c(if)g(there)h(is)g(a)g(consensus)f(on)h(what)g(it)480 -4344 y(should)21 b(b)s(e)i(c)m(hanged)h(to,)i(it)d(do)s(esn't)g(seem)h +1086 y(should)21 b(b)s(e)i(c)m(hanged)h(to,)i(it)d(do)s(esn't)g(seem)h (to)g(b)s(e)f(apparen)m(t.)39 b(\(V)-8 b(arious)23 b(options)g(in)f -(the)h(`)p Fn(modules)p Fs(')480 4469 y(\014le)34 b(can)i(b)s(e)f(used) +(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 4593 y([mo)s(dules],)29 -b(page)i(137.\))0 5060 y Fk(A.11.3)62 b(imp)s(ort)31 -b(examples)125 5340 y Fs(See)f(Chapter)g(13)h([T)-8 b(rac)m(king)31 -b(sources],)g(page)g(65,)g(and)f(See)h(Section)f(5.1.1)i([F)-8 -b(rom)31 b(\014les],)f(page)h(31.)p eop -%%Page: 113 115 -113 114 bop 0 -116 a Fs(App)s(endix)28 b(A:)i(Guide)g(to)h(CVS)e -(commands)2210 b(113)0 366 y Fm(A.12)68 b(log|Prin)l(t)32 -b(out)e(log)i(information)f(for)g(\014les)75 641 y Fq(\017)60 -b Fs(Synopsis:)39 b(log)30 b([options])g([\014les)p Fh(:)15 -b(:)g(:)q Fs(])75 792 y Fq(\017)60 b Fs(Requires:)40 +(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(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(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 b(rep)s(ository)-8 b(,)30 b(w)m(orking)f(directory)-8 -b(.)75 942 y Fq(\017)60 b Fs(Changes:)40 b(nothing.)125 -1242 y(Displa)m(y)22 b(log)h(information)f(for)h(\014les.)38 +b(.)75 3037 y Fq(\017)60 b Fs(Changes:)40 b(nothing.)125 +3335 y(Displa)m(y)22 b(log)h(information)f(for)h(\014les.)38 b Fn(log)22 b Fs(used)h(to)h(call)e(the)i Fr(r)n(cs)e Fs(utilit)m(y)g Fn(rlog)p Fs(.)37 b(Although)22 b(this)h(is)f(no)h -(longer)0 1367 y(true)j(in)e(the)i(curren)m(t)g(sources,)g(this)f +(longer)0 3459 y(true)j(in)e(the)i(curren)m(t)g(sources,)g(this)f (history)g(determines)g(the)h(format)g(of)g(the)f(output)h(and)f(the)h -(options,)g(whic)m(h)0 1491 y(are)31 b(not)f(quite)g(in)f(the)i(st)m -(yle)f(of)h(the)g(other)f Fr(cvs)g Fs(commands.)125 1766 +(options,)g(whic)m(h)0 3584 y(are)31 b(not)f(quite)g(in)f(the)i(st)m +(yle)f(of)h(the)g(other)f Fr(cvs)g Fs(commands.)125 3858 y(The)35 b(output)g(includes)e(the)j(lo)s(cation)f(of)h(the)g Fr(r)n(cs)f Fs(\014le,)h(the)g Fo(head)j Fs(revision)34 -b(\(the)i(latest)g(revision)e(on)i(the)0 1891 y(trunk\),)23 +b(\(the)i(latest)g(revision)e(on)i(the)0 3982 y(trunk\),)23 b(all)f(sym)m(b)s(olic)e(names)i(\(tags\))i(and)e(some)h(other)f (things.)37 b(F)-8 b(or)23 b(eac)m(h)h(revision,)e(the)g(revision)f(n)m -(um)m(b)s(er,)i(the)0 2015 y(author,)k(the)g(n)m(um)m(b)s(er)e(of)i +(um)m(b)s(er,)i(the)0 4107 y(author,)k(the)g(n)m(um)m(b)s(er)e(of)i (lines)d(added/deleted)i(and)g(the)h(log)f(message)i(are)f(prin)m(ted.) -37 b(All)26 b(times)g(are)g(displa)m(y)m(ed)0 2140 y(in)j(Co)s +37 b(All)26 b(times)g(are)g(displa)m(y)m(ed)0 4232 y(in)j(Co)s (ordinated)g(Univ)m(ersal)g(Time)h(\(UTC\).)g(\(Other)h(parts)f(of)g Fr(cvs)g Fs(prin)m(t)f(times)h(in)f(the)h(lo)s(cal)g(timezone\).)0 -2562 y Fk(A.12.1)62 b(log)31 b(options)125 2837 y Fs(By)f(default,)g +4643 y Fk(A.12.1)62 b(log)31 b(options)125 4917 y Fs(By)f(default,)g Fn(log)g Fs(prin)m(ts)e(all)i(information)e(that)j(is)f(a)m(v)-5 b(ailable.)40 b(All)29 b(other)h(options)g(restrict)g(the)h(output.)0 -3138 y Fn(-b)384 b Fs(Prin)m(t)44 b(information)g(ab)s(out)g(the)i +5215 y Fn(-b)384 b Fs(Prin)m(t)44 b(information)g(ab)s(out)g(the)i (revisions)d(on)i(the)g(default)g(branc)m(h,)j(normally)43 -b(the)j(highest)480 3262 y(branc)m(h)30 b(on)g(the)h(trunk.)0 -3438 y Fn(-d)f Fo(dates)147 b Fs(Prin)m(t)32 b(information)f(ab)s(out)h -(revisions)f(with)g(a)i(c)m(hec)m(kin)g(date/time)h(in)d(the)i(range)g -(giv)m(en)g(b)m(y)g(the)480 3563 y(semicolon-separated)27 -b(list)e(of)i(dates.)40 b(The)26 b(date)h(formats)f(accepted)i(are)f -(those)g(accepted)h(b)m(y)f(the)480 3687 y(`)p Fn(-D)p -Fs(')d(option)f(to)i(man)m(y)f(other)g Fr(cvs)f Fs(commands)g(\(see)i -(Section)f(A.4)g([Common)g(options],)h(page)f(92\).)480 -3812 y(Dates)32 b(can)e(b)s(e)g(com)m(bined)g(in)m(to)g(ranges)h(as)f -(follo)m(ws:)480 3988 y Fo(d1)7 b Fn(<)p Fo(d2)480 4112 -y(d2)g Fn(>)p Fo(d1)233 b Fs(Select)31 b(the)f(revisions)f(that)i(w)m -(ere)f(dep)s(osited)g(b)s(et)m(w)m(een)h Fo(d1)37 b Fs(and)30 -b Fo(d2)p Fs(.)480 4288 y Fn(<)p Fo(d)480 4413 y(d)t -Fn(>)377 b Fs(Select)31 b(all)e(revisions)f(dated)j Fo(d)i -Fs(or)e(earlier.)480 4589 y Fo(d)t Fn(<)480 4713 y(>)p -Fo(d)381 b Fs(Select)31 b(all)e(revisions)f(dated)j Fo(d)i -Fs(or)e(later.)480 4889 y Fo(d)429 b Fs(Select)31 b(the)f(single,)f -(latest)i(revision)e(dated)i Fo(d)i Fs(or)d(earlier.)480 -5065 y(The)k(`)p Fn(>)p Fs(')h(or)g(`)p Fn(<)p Fs(')g(c)m(haracters)h -(ma)m(y)f(b)s(e)f(follo)m(w)m(ed)g(b)m(y)h(`)p Fn(=)p -Fs(')g(to)g(indicate)f(an)h(inclusiv)m(e)d(range)j(rather)480 -5190 y(than)30 b(an)g(exclusiv)m(e)g(one.)480 5340 y(Note)i(that)f(the) -f(separator)h(is)f(a)g(semicolon)g(\(;\).)p eop -%%Page: 114 116 -114 115 bop 0 -116 a Fs(114)2366 b(CVS|Concurren)m(t)29 -b(V)-8 b(ersions)30 b(System)0 366 y Fn(-h)384 b Fs(Prin)m(t)39 -b(only)g(the)i Fr(r)n(cs)e Fs(pathname,)j(w)m(orking)e(pathname,)j -(head,)f(default)d(branc)m(h,)k(access)e(list,)480 491 -y(lo)s(c)m(ks,)31 b(sym)m(b)s(olic)d(names,)j(and)f(su\016x.)0 -674 y Fn(-l)384 b Fs(Lo)s(cal;)30 b(run)f(only)h(in)f(curren)m(t)h(w)m -(orking)g(directory)-8 b(.)40 b(\(Default)31 b(is)f(to)h(run)e -(recursiv)m(ely\).)0 857 y Fn(-N)384 b Fs(Do)29 b(not)g(prin)m(t)d(the) -j(list)e(of)h(tags)h(for)f(this)f(\014le.)39 b(This)27 -b(option)h(can)g(b)s(e)g(v)m(ery)g(useful)f(when)g(y)m(our)h(site)480 -982 y(uses)33 b(a)i(lot)f(of)g(tags,)i(so)e(rather)g(than)f -Fn(")p Fs(more)p Fn(")p Fs('ing)g(o)m(v)m(er)i(3)g(pages)f(of)g(tag)h -(information,)f(the)g(log)480 1106 y(information)29 b(is)g(presen)m -(ted)h(without)g(tags)h(at)g(all.)0 1289 y Fn(-R)384 -b Fs(Prin)m(t)29 b(only)h(the)g(name)h(of)f(the)h Fr(r)n(cs)e -Fs(history)h(\014le.)0 1472 y Fn(-r)p Fo(revisions)480 -1597 y Fs(Prin)m(t)i(information)e(ab)s(out)j(revisions)d(giv)m(en)j -(in)e(the)i(comma-separated)h(list)d Fo(revisions)k Fs(of)d(revi-)480 -1722 y(sions)d(and)h(ranges.)41 b(The)30 b(follo)m(wing)f(table)h -(explains)e(the)j(a)m(v)-5 b(ailable)30 b(range)g(formats:)480 -1905 y Fo(rev1)7 b Fn(:)p Fo(rev2)87 b Fs(Revisions)29 -b Fo(rev1)38 b Fs(to)31 b Fo(rev2)38 b Fs(\(whic)m(h)29 -b(m)m(ust)i(b)s(e)e(on)i(the)f(same)h(branc)m(h\).)480 -2088 y Fn(:)p Fo(rev)308 b Fs(Revisions)29 b(from)h(the)g(b)s(eginning) -e(of)i(the)h(branc)m(h)f(up)f(to)i(and)f(including)d -Fo(rev)p Fs(.)480 2271 y Fo(rev)8 b Fn(:)300 b Fs(Revisions)29 -b(starting)h(with)f Fo(rev)38 b Fs(to)31 b(the)g(end)e(of)i(the)g -(branc)m(h)e(con)m(taining)h Fo(rev)p Fs(.)480 2454 y -Fo(branc)m(h)209 b Fs(An)30 b(argumen)m(t)h(that)g(is)e(a)i(branc)m(h)f -(means)g(all)f(revisions)g(on)h(that)h(branc)m(h.)480 -2637 y Fo(branc)m(h1)7 b Fn(:)p Fo(branc)m(h2)960 2761 -y Fs(A)30 b(range)h(of)g(branc)m(hes)f(means)g(all)f(revisions)g(on)h -(the)h(branc)m(hes)f(in)f(that)i(range.)480 2945 y Fo(branc)m(h)p -Fn(.)161 b Fs(The)30 b(latest)h(revision)d(in)i Fo(branc)m(h)p -Fs(.)480 3128 y(A)d(bare)g(`)p Fn(-r)p Fs(')g(with)e(no)i(revisions)e -(means)i(the)g(latest)g(revision)f(on)g(the)h(default)g(branc)m(h,)g -(normally)480 3252 y(the)k(trunk.)39 b(There)30 b(can)h(b)s(e)e(no)i -(space)g(b)s(et)m(w)m(een)g(the)f(`)p Fn(-r)p Fs(')g(option)g(and)g -(its)g(argumen)m(t.)0 3435 y Fn(-s)g Fo(states)127 b -Fs(Prin)m(t)28 b(information)f(ab)s(out)h(revisions)f(whose)h(state)i +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 +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) +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 +Fo(d1)37 b Fs(and)30 b Fo(d2)p Fs(.)480 1227 y Fn(<)p +Fo(d)480 1351 y(d)t Fn(>)377 b Fs(Select)31 b(all)e(revisions)f(dated)j +Fo(d)i Fs(or)e(earlier.)480 1532 y Fo(d)t Fn(<)480 1657 +y(>)p Fo(d)381 b Fs(Select)31 b(all)e(revisions)f(dated)j +Fo(d)i Fs(or)e(later.)480 1838 y Fo(d)429 b Fs(Select)31 +b(the)f(single,)f(latest)i(revision)e(dated)i Fo(d)i +Fs(or)d(earlier.)480 2019 y(The)k(`)p Fn(>)p Fs(')h(or)g(`)p +Fn(<)p Fs(')g(c)m(haracters)h(ma)m(y)f(b)s(e)f(follo)m(w)m(ed)g(b)m(y)h +(`)p Fn(=)p Fs(')g(to)g(indicate)f(an)h(inclusiv)m(e)d(range)j(rather) +480 2143 y(than)30 b(an)g(exclusiv)m(e)g(one.)480 2296 +y(Note)i(that)f(the)f(separator)h(is)f(a)g(semicolon)g(\(;\).)0 +2477 y Fn(-h)384 b Fs(Prin)m(t)39 b(only)g(the)i Fr(r)n(cs)e +Fs(pathname,)j(w)m(orking)e(pathname,)j(head,)f(default)d(branc)m(h,)k +(access)e(list,)480 2602 y(lo)s(c)m(ks,)31 b(sym)m(b)s(olic)d(names,)j +(and)f(su\016x.)0 2783 y Fn(-l)384 b Fs(Lo)s(cal;)30 +b(run)f(only)h(in)f(curren)m(t)h(w)m(orking)g(directory)-8 +b(.)40 b(\(Default)31 b(is)f(to)h(run)e(recursiv)m(ely\).)0 +2964 y Fn(-N)384 b Fs(Do)29 b(not)g(prin)m(t)d(the)j(list)e(of)h(tags)h +(for)f(this)f(\014le.)39 b(This)27 b(option)h(can)g(b)s(e)g(v)m(ery)g +(useful)f(when)g(y)m(our)h(site)480 3088 y(uses)33 b(a)i(lot)f(of)g +(tags,)i(so)e(rather)g(than)f Fn(")p Fs(more)p Fn(")p +Fs('ing)g(o)m(v)m(er)i(3)g(pages)f(of)g(tag)h(information,)f(the)g(log) +480 3213 y(information)29 b(is)g(presen)m(ted)h(without)g(tags)h(at)g +(all.)0 3394 y Fn(-R)384 b Fs(Prin)m(t)29 b(only)h(the)g(name)h(of)f +(the)h Fr(r)n(cs)e Fs(history)h(\014le.)0 3575 y Fn(-r)p +Fo(revisions)480 3699 y Fs(Prin)m(t)i(information)e(ab)s(out)j +(revisions)d(giv)m(en)j(in)e(the)i(comma-separated)h(list)d +Fo(revisions)k Fs(of)d(revi-)480 3824 y(sions)d(and)h(ranges.)41 +b(The)30 b(follo)m(wing)f(table)h(explains)e(the)j(a)m(v)-5 +b(ailable)30 b(range)g(formats:)480 4005 y Fo(rev1)7 +b Fn(:)p Fo(rev2)87 b Fs(Revisions)29 b Fo(rev1)38 b +Fs(to)31 b Fo(rev2)38 b Fs(\(whic)m(h)29 b(m)m(ust)i(b)s(e)e(on)i(the)f +(same)h(branc)m(h\).)480 4186 y Fn(:)p Fo(rev)308 b Fs(Revisions)29 +b(from)h(the)g(b)s(eginning)e(of)i(the)h(branc)m(h)f(up)f(to)i(and)f +(including)d Fo(rev)p Fs(.)480 4367 y Fo(rev)8 b Fn(:)300 +b Fs(Revisions)29 b(starting)h(with)f Fo(rev)38 b Fs(to)31 +b(the)g(end)e(of)i(the)g(branc)m(h)e(con)m(taining)h +Fo(rev)p Fs(.)480 4548 y Fo(branc)m(h)209 b Fs(An)30 +b(argumen)m(t)h(that)g(is)e(a)i(branc)m(h)f(means)g(all)f(revisions)g +(on)h(that)h(branc)m(h.)480 4729 y Fo(branc)m(h1)7 b +Fn(:)p Fo(branc)m(h2)960 4853 y Fs(A)30 b(range)h(of)g(branc)m(hes)f +(means)g(all)f(revisions)g(on)h(the)h(branc)m(hes)f(in)f(that)i(range.) +480 5034 y Fo(branc)m(h)p Fn(.)161 b Fs(The)30 b(latest)h(revision)d +(in)i Fo(branc)m(h)p Fs(.)480 5215 y(A)d(bare)g(`)p Fn(-r)p +Fs(')g(with)e(no)i(revisions)e(means)i(the)g(latest)g(revision)f(on)g +(the)h(default)g(branc)m(h,)g(normally)480 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 +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 -3560 y(in)f(the)i(comma-separated)h(list)d Fo(states)p -Fs(.)0 3743 y Fn(-t)384 b Fs(Prin)m(t)29 b(the)i(same)g(as)f(`)p +491 y(in)f(the)i(comma-separated)h(list)d Fo(states)p +Fs(.)0 680 y Fn(-t)384 b Fs(Prin)m(t)29 b(the)i(same)g(as)f(`)p Fn(-h)p Fs(',)h(plus)d(the)j(descriptiv)m(e)e(text.)0 -3926 y Fn(-w)p Fo(logins)155 b Fs(Prin)m(t)34 b(information)g(ab)s(out) -h(revisions)e(c)m(hec)m(k)m(ed)k(in)d(b)m(y)i(users)e(with)g(login)g -(names)h(app)s(earing)f(in)480 4051 y(the)25 b(comma-separated)g(list)e +870 y Fn(-w)p Fo(logins)155 b Fs(Prin)m(t)34 b(information)g(ab)s(out)h +(revisions)e(c)m(hec)m(k)m(ed)k(in)d(b)m(y)i(users)e(with)g(login)g +(names)h(app)s(earing)f(in)480 994 y(the)25 b(comma-separated)g(list)e Fo(logins)p Fs(.)38 b(If)24 b Fo(logins)i Fs(is)e(omitted,)i(the)e -(user's)g(login)f(is)g(assumed.)38 b(There)480 4175 y(can)31 +(user's)g(login)f(is)g(assumed.)38 b(There)480 1119 y(can)31 b(b)s(e)e(no)i(space)g(b)s(et)m(w)m(een)g(the)f(`)p Fn(-w)p -Fs(')g(option)g(and)g(its)g(argumen)m(t.)125 4483 y Fn(log)i +Fs(')g(option)g(and)g(its)g(argumen)m(t.)125 1433 y Fn(log)i Fs(prin)m(ts)g(the)h(in)m(tersection)g(of)h(the)f(revisions)f(selected) i(with)e(the)h(options)g(`)p Fn(-d)p Fs(',)h(`)p Fn(-s)p -Fs(',)g(and)f(`)p Fn(-w)p Fs(',)h(in)m(ter-)0 4607 y(sected)d(with)e +Fs(',)g(and)f(`)p Fn(-w)p Fs(',)h(in)m(ter-)0 1558 y(sected)d(with)e (the)i(union)d(of)j(the)f(revisions)f(selected)i(b)m(y)f(`)p -Fn(-b)p Fs(')g(and)g(`)p Fn(-r)p Fs('.)0 5062 y Fk(A.12.2)62 -b(log)31 b(examples)125 5340 y Fs(Con)m(tributed)d(examples)i(are)h -(gratefully)e(accepted.)p eop -%%Page: 115 117 -115 116 bop 0 -116 a Fs(App)s(endix)28 b(A:)i(Guide)g(to)h(CVS)e -(commands)2210 b(115)0 366 y Fm(A.13)68 b(rdi\013|'patc)l(h')32 -b(format)f(di\013s)g(b)t(et)l(w)l(een)h(releases)75 646 +Fn(-b)p Fs(')g(and)g(`)p Fn(-r)p Fs('.)0 2041 y Fk(A.12.2)62 +b(log)31 b(examples)125 2322 y Fs(Con)m(tributed)d(examples)i(are)h +(gratefully)e(accepted.)0 2839 y Fm(A.13)68 b(rdi\013|'patc)l(h')32 +b(format)f(di\013s)g(b)t(et)l(w)l(een)h(releases)75 3120 y Fq(\017)60 b Fs(rdi\013)29 b([-\015ags])i([-V)g(vn])f([-r)h(t)p Fn(|)p Fs(-D)g(d)f([-r)g(t2)p Fn(|)p Fs(-D)i(d2]])e(mo)s(dules)p -Fh(:)15 b(:)g(:)75 802 y Fq(\017)60 b Fs(Requires:)40 -b(rep)s(ository)-8 b(.)75 957 y Fq(\017)60 b Fs(Changes:)40 -b(nothing.)75 1112 y Fq(\017)60 b Fs(Synon)m(ym:)40 b(patc)m(h)125 -1423 y(Builds)27 b(a)j(Larry)f(W)-8 b(all)30 b(format)g(patc)m(h\(1\))h +Fh(:)15 b(:)g(:)75 3277 y Fq(\017)60 b Fs(Requires:)40 +b(rep)s(ository)-8 b(.)75 3434 y Fq(\017)60 b Fs(Changes:)40 +b(nothing.)75 3591 y Fq(\017)60 b Fs(Synon)m(ym:)40 b(patc)m(h)125 +3905 y(Builds)27 b(a)j(Larry)f(W)-8 b(all)30 b(format)g(patc)m(h\(1\))h (\014le)e(b)s(et)m(w)m(een)h(t)m(w)m(o)i(releases,)e(that)g(can)g(b)s -(e)f(fed)h(directly)e(in)m(to)i(the)0 1547 y(patc)m(h)f(program)f(to)h +(e)f(fed)h(directly)e(in)m(to)i(the)0 4030 y(patc)m(h)f(program)f(to)h (bring)e(an)h(old)g(release)g(up-to-date)i(with)d(the)h(new)g(release.) 41 b(\(This)27 b(is)g(one)i(of)f(the)h(few)f Fr(cvs)0 -1672 y Fs(commands)33 b(that)h(op)s(erates)f(directly)f(from)h(the)g +4154 y Fs(commands)33 b(that)h(op)s(erates)f(directly)f(from)h(the)g (rep)s(ository)-8 b(,)33 b(and)g(do)s(esn't)g(require)f(a)h(prior)f(c)m -(hec)m(k)m(out.\))51 b(The)0 1796 y(di\013)29 b(output)h(is)f(sen)m(t)i -(to)g(the)g(standard)f(output)g(device.)125 2076 y(Y)-8 +(hec)m(k)m(out.\))51 b(The)0 4279 y(di\013)29 b(output)h(is)f(sen)m(t)i +(to)g(the)g(standard)f(output)g(device.)125 4560 y(Y)-8 b(ou)45 b(can)g(sp)s(ecify)e(\(using)h(the)h(standard)f(`)p Fn(-r)p Fs(')g(and)h(`)p Fn(-D)p Fs(')f(options\))h(an)m(y)g(com)m -(bination)f(of)h(one)g(or)g(t)m(w)m(o)0 2201 y(revisions)24 +(bination)f(of)h(one)g(or)g(t)m(w)m(o)0 4685 y(revisions)24 b(or)h(dates.)40 b(If)25 b(only)g(one)h(revision)d(or)j(date)g(is)f(sp) s(eci\014ed,)g(the)h(patc)m(h)g(\014le)e(re\015ects)i(di\013erences)f -(b)s(et)m(w)m(een)0 2325 y(that)31 b(revision)e(or)h(date)h(and)f(the)g +(b)s(et)m(w)m(een)0 4809 y(that)31 b(revision)e(or)h(date)h(and)f(the)g (curren)m(t)g(head)h(revisions)d(in)h(the)i Fr(r)n(cs)e -Fs(\014le.)125 2605 y(Note)34 b(that)g(if)e(the)i(soft)m(w)m(are)h +Fs(\014le.)125 5091 y(Note)34 b(that)g(if)e(the)i(soft)m(w)m(are)h (release)e(a\013ected)i(is)d(con)m(tained)i(in)e(more)i(than)f(one)g -(directory)-8 b(,)34 b(then)f(it)g(ma)m(y)0 2729 y(b)s(e)h(necessary)i +(directory)-8 b(,)34 b(then)f(it)g(ma)m(y)0 5215 y(b)s(e)h(necessary)i (to)g(sp)s(ecify)d(the)j(`)p Fn(-p)p Fs(')f(option)f(to)i(the)f(patc)m (h)h(command)f(when)f(patc)m(hing)h(the)g(old)f(sources,)j(so)0 -2854 y(that)31 b(patc)m(h)g(is)e(able)h(to)h(\014nd)e(the)i(\014les)e -(that)i(are)g(lo)s(cated)g(in)e(other)h(directories.)0 -3322 y Fk(A.13.1)62 b(rdi\013)31 b(options)125 3601 y -Fs(These)j(standard)g(options)g(are)h(supp)s(orted)e(b)m(y)i -Fn(rdiff)e Fs(\(see)j(Section)e(A.4)i([Common)f(options],)g(page)h(92,) -0 3726 y(for)30 b(a)h(complete)g(description)d(of)j(them\):)0 -4036 y Fn(-D)f Fo(date)183 b Fs(Use)31 b(the)f(most)h(recen)m(t)g -(revision)e(no)h(later)h(than)f Fo(date)p Fs(.)0 4222 +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 +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\):) +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 (retriev)m(e)i(the)f(most)g(recen)m(t)h(revision)d(\(instead)h(of)i -(ignoring)480 4347 y(the)f(\014le\).)0 4533 y Fn(-l)384 +(ignoring)480 1369 y(the)f(\014le\).)0 1546 y Fn(-l)384 b Fs(Lo)s(cal;)30 b(don't)h(descend)f(sub)s(directories.)0 -4719 y Fn(-r)g Fo(tag)229 b Fs(Use)31 b(revision)d Fo(tag)p -Fs(.)125 5029 y(In)h(addition)g(to)i(the)f(ab)s(o)m(v)m(e,)i(these)f -(options)f(are)h(a)m(v)-5 b(ailable:)0 5340 y Fn(-c)384 +1723 y Fn(-r)g Fo(tag)229 b Fs(Use)31 b(revision)d Fo(tag)p +Fs(.)125 2025 y(In)h(addition)g(to)i(the)f(ab)s(o)m(v)m(e,)i(these)f +(options)f(are)h(a)m(v)-5 b(ailable:)0 2326 y Fn(-c)384 b Fs(Use)31 b(the)f(con)m(text)j(di\013)c(format.)41 -b(This)28 b(is)i(the)g(default)g(format.)p eop -%%Page: 116 118 -116 117 bop 0 -116 a Fs(116)2366 b(CVS|Concurren)m(t)29 -b(V)-8 b(ersions)30 b(System)0 366 y Fn(-s)384 b Fs(Create)23 -b(a)f(summary)f(c)m(hange)i(rep)s(ort)e(instead)g(of)h(a)g(patc)m(h.)39 -b(The)21 b(summary)g(includes)f(information)480 491 y(ab)s(out)28 -b(\014les)f(that)i(w)m(ere)g(c)m(hanged)g(or)g(added)e(b)s(et)m(w)m -(een)i(the)g(releases.)40 b(It)29 b(is)e(sen)m(t)i(to)g(the)g(standard) -480 616 y(output)38 b(device.)66 b(This)37 b(is)h(useful)f(for)h -(\014nding)f(out,)k(for)d(example,)j(whic)m(h)d(\014les)f(ha)m(v)m(e)j -(c)m(hanged)480 740 y(b)s(et)m(w)m(een)31 b(t)m(w)m(o)h(dates)f(or)f -(revisions.)0 908 y Fn(-t)384 b Fs(A)25 b(di\013)e(of)i(the)g(top)g(t)m -(w)m(o)h(revisions)d(is)h(sen)m(t)h(to)g(the)g(standard)f(output)g -(device.)39 b(This)23 b(is)h(most)h(useful)480 1032 y(for)30 -b(seeing)g(what)h(the)f(last)g(c)m(hange)i(to)f(a)g(\014le)e(w)m(as.)0 -1200 y Fn(-u)384 b Fs(Use)38 b(the)g(unidi\013)c(format)k(for)f(the)h -(con)m(text)h(di\013s.)61 b(This)36 b(option)h(is)g(not)g(a)m(v)-5 -b(ailable)37 b(if)g(y)m(our)g(di\013)480 1324 y(do)s(es)25 +b(This)28 b(is)i(the)g(default)g(format.)0 2503 y Fn(-s)384 +b Fs(Create)23 b(a)f(summary)f(c)m(hange)i(rep)s(ort)e(instead)g(of)h +(a)g(patc)m(h.)39 b(The)21 b(summary)g(includes)f(information)480 +2628 y(ab)s(out)28 b(\014les)f(that)i(w)m(ere)g(c)m(hanged)g(or)g +(added)e(b)s(et)m(w)m(een)i(the)g(releases.)40 b(It)29 +b(is)e(sen)m(t)i(to)g(the)g(standard)480 2752 y(output)38 +b(device.)66 b(This)37 b(is)h(useful)f(for)h(\014nding)f(out,)k(for)d +(example,)j(whic)m(h)d(\014les)f(ha)m(v)m(e)j(c)m(hanged)480 +2877 y(b)s(et)m(w)m(een)31 b(t)m(w)m(o)h(dates)f(or)f(revisions.)0 +3054 y Fn(-t)384 b Fs(A)25 b(di\013)e(of)i(the)g(top)g(t)m(w)m(o)h +(revisions)d(is)h(sen)m(t)h(to)g(the)g(standard)f(output)g(device.)39 +b(This)23 b(is)h(most)h(useful)480 3178 y(for)30 b(seeing)g(what)h(the) +f(last)g(c)m(hange)i(to)f(a)g(\014le)e(w)m(as.)0 3355 +y Fn(-u)384 b Fs(Use)38 b(the)g(unidi\013)c(format)k(for)f(the)h(con)m +(text)h(di\013s.)61 b(This)36 b(option)h(is)g(not)g(a)m(v)-5 +b(ailable)37 b(if)g(y)m(our)g(di\013)480 3480 y(do)s(es)25 b(not)g(supp)s(ort)e(the)i(unidi\013)c(format.)40 b(Remem)m(b)s(er)24 b(that)i(old)e(v)m(ersions)g(of)h(the)g Fn(patch)e Fs(program)480 -1449 y(can't)30 b(handle)d(the)i(unidi\013)d(format,)k(so)f(if)f(y)m +3604 y(can't)30 b(handle)d(the)i(unidi\013)d(format,)k(so)f(if)f(y)m (ou)i(plan)d(to)j(p)s(ost)e(this)g(patc)m(h)i(to)f(the)h(net)f(y)m(ou)g -(should)480 1574 y(probably)g(not)h(use)g(`)p Fn(-u)p -Fs('.)0 1741 y Fn(-V)g Fo(vn)255 b Fs(Expand)29 b Fr(r)n(cs)f +(should)480 3729 y(probably)g(not)h(use)g(`)p Fn(-u)p +Fs('.)0 3906 y Fn(-V)g Fo(vn)255 b Fs(Expand)29 b Fr(r)n(cs)f Fs(k)m(eyw)m(ords)j(according)e(to)i(the)f(rules)e(curren)m(t)i(in)e Fr(r)n(cs)h Fs(v)m(ersion)g Fo(vn)h Fs(\(the)g(expansion)480 -1866 y(format)h(c)m(hanged)g(with)e Fr(r)n(cs)g Fs(v)m(ersion)h(5\).)0 -2267 y Fk(A.13.2)62 b(rdi\013)31 b(examples)125 2541 +4030 y(format)h(c)m(hanged)g(with)e Fr(r)n(cs)g Fs(v)m(ersion)h(5\).)0 +4457 y Fk(A.13.2)62 b(rdi\013)31 b(examples)125 4733 y Fs(Supp)s(ose)37 b(y)m(ou)j(receiv)m(e)h(mail)d(from)h Fn(foo@bar.com)e Fs(asking)i(for)g(an)h(up)s(date)f(from)g(release)h -(1.2)h(to)f(1.4)h(of)0 2666 y(the)32 b(tc)h(compiler.)44 +(1.2)h(to)f(1.4)h(of)0 4857 y(the)32 b(tc)h(compiler.)44 b(Y)-8 b(ou)33 b(ha)m(v)m(e)g(no)f(suc)m(h)g(patc)m(hes)g(on)g(hand,)g (but)f(with)g Fr(cvs)g Fs(that)i(can)f(easily)f(b)s(e)g(\014xed)h(with) -f(a)0 2791 y(command)f(suc)m(h)g(as)h(this:)240 3044 +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 3148 y($$)g(Mail)g(-s)g('The)g(patches)e(you)i(asked)g(for')f -(foo@bar.com)125 3421 y Fs(Supp)s(ose)18 b(y)m(ou)j(ha)m(v)m(e)h(made)e -(release)h(1.3,)j(and)c(fork)m(ed)g(a)h(branc)m(h)f(called)g(`)p -Fn(R_1_3fix)p Fs(')f(for)h(bug\014xes.)36 b(`)p Fn(R_1_3_1)p -Fs(')0 3546 y(corresp)s(onds)h(to)j(release)f(1.3.1,)k(whic)m(h)37 -b(w)m(as)i(made)g(some)g(time)f(ago.)67 b(No)m(w,)42 -b(y)m(ou)d(w)m(an)m(t)g(to)h(see)f(ho)m(w)g(m)m(uc)m(h)0 -3671 y(dev)m(elopmen)m(t)31 b(has)f(b)s(een)g(done)g(on)g(the)h(branc)m +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 +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 +b(`)p Fn(R_1_3_1)p Fs(')0 491 y(corresp)s(onds)h(to)j(release)f(1.3.1,) +k(whic)m(h)37 b(w)m(as)i(made)g(some)g(time)f(ago.)67 +b(No)m(w,)42 b(y)m(ou)d(w)m(an)m(t)g(to)h(see)f(ho)m(w)g(m)m(uc)m(h)0 +616 y(dev)m(elopmen)m(t)31 b(has)f(b)s(een)g(done)g(on)g(the)h(branc)m (h.)40 b(This)28 b(command)i(can)h(b)s(e)f(used:)240 -3924 y Fn($)47 b(cvs)g(patch)g(-s)g(-r)g(R_1_3_1)f(-r)h(R_1_3fix)f -(module-name)240 4028 y(cvs)h(rdiff:)f(Diffing)g(module-name)240 -4131 y(File)h(ChangeLog,v)d(changed)i(from)h(revision)e(1.52.2.5)h(to)h -(1.52.2.6)240 4235 y(File)g(foo.c,v)e(changed)h(from)h(revision)e -(1.52.2.3)h(to)h(1.52.2.4)240 4339 y(File)g(bar.h,v)e(changed)h(from)h -(revision)e(1.29.2.1)h(to)h(1.2)0 4774 y Fm(A.14)68 b(release|Indicate) +871 y Fn($)47 b(cvs)g(patch)g(-s)g(-r)g(R_1_3_1)f(-r)h(R_1_3fix)f +(module-name)240 974 y(cvs)h(rdiff:)f(Diffing)g(module-name)240 +1078 y(File)h(ChangeLog,v)d(changed)i(from)h(revision)e(1.52.2.5)h(to)h +(1.52.2.6)240 1182 y(File)g(foo.c,v)e(changed)h(from)h(revision)e +(1.52.2.3)h(to)h(1.52.2.4)240 1286 y(File)g(bar.h,v)e(changed)h(from)h +(revision)e(1.29.2.1)h(to)h(1.2)0 1750 y Fm(A.14)68 b(release|Indicate) 33 b(that)e(a)g(Mo)t(dule)f(is)g(no)h(longer)g(in)f(use)75 -5048 y Fq(\017)60 b Fs(release)31 b([-d])f(directories)p -Fh(:)15 b(:)g(:)75 5194 y Fq(\017)60 b Fs(Requires:)40 -b(W)-8 b(orking)30 b(directory)-8 b(.)75 5340 y Fq(\017)60 +2026 y Fq(\017)60 b Fs(release)31 b([-d])f(directories)p +Fh(:)15 b(:)g(:)75 2177 y Fq(\017)60 b Fs(Requires:)40 +b(W)-8 b(orking)30 b(directory)-8 b(.)75 2329 y Fq(\017)60 b Fs(Changes:)40 b(W)-8 b(orking)31 b(directory)-8 b(,)30 -b(history)g(log.)p eop -%%Page: 117 119 -117 118 bop 0 -116 a Fs(App)s(endix)28 b(A:)i(Guide)g(to)h(CVS)e -(commands)2210 b(117)125 366 y(This)33 b(command)j(is)f(mean)m(t)h(to)h +b(history)g(log.)125 2631 y(This)j(command)j(is)f(mean)m(t)h(to)h (safely)e(cancel)h(the)g(e\013ect)h(of)f(`)p Fn(cvs)29 b(checkout)p Fs('.)55 b(Since)35 b Fr(cvs)f Fs(do)s(esn't)i(lo)s(c)m(k) -0 491 y(\014les,)f(it)f(isn't)f(strictly)h(necessary)h(to)g(use)f(this) -g(command.)53 b(Y)-8 b(ou)35 b(can)f(alw)m(a)m(ys)h(simply)d(delete)j -(y)m(our)g(w)m(orking)0 616 y(directory)-8 b(,)28 b(if)e(y)m(ou)h(lik)m -(e;)h(but)e(y)m(ou)i(risk)d(losing)h(c)m(hanges)i(y)m(ou)g(ma)m(y)f(ha) -m(v)m(e)i(forgotten,)g(and)d(y)m(ou)i(lea)m(v)m(e)g(no)f(trace)h(in)0 -740 y(the)e Fr(cvs)g Fs(history)f(\014le)g(\(see)i(Section)f(C.10)h -([history)f(\014le],)g(page)h(149\))h(that)f(y)m(ou'v)m(e)h(abandoned)d -(y)m(our)h(c)m(hec)m(k)m(out.)125 1020 y(Use)d(`)p Fn(cvs)30 -b(release)p Fs(')21 b(to)j(a)m(v)m(oid)f(these)g(problems.)37 -b(This)21 b(command)i(c)m(hec)m(ks)h(that)g(no)f(uncommitted)f(c)m -(hanges)0 1144 y(are)33 b(presen)m(t;)i(that)f(y)m(ou)f(are)g -(executing)h(it)e(from)h(immediately)e(ab)s(o)m(v)m(e)j(a)g -Fr(cvs)e Fs(w)m(orking)g(directory;)i(and)e(that)0 1269 -y(the)d(rep)s(ository)e(recorded)h(for)h(y)m(our)f(\014les)g(is)f(the)i -(same)g(as)g(the)f(rep)s(ository)g(de\014ned)f(in)g(the)i(mo)s(dule)e -(database.)125 1548 y(If)h(all)g(these)h(conditions)f(are)h(true,)g(`)p -Fn(cvs)h(release)p Fs(')d(lea)m(v)m(es)j(a)g(record)f(of)g(its)f -(execution)h(\(attesting)h(to)g(y)m(our)0 1673 y(in)m(ten)m(tionally)f -(abandoning)g(y)m(our)h(c)m(hec)m(k)m(out\))j(in)c(the)i -Fr(cvs)e Fs(history)g(log.)0 2139 y Fk(A.14.1)62 b(release)31 -b(options)125 2419 y Fs(The)e Fn(release)g Fs(command)h(supp)s(orts)e -(one)j(command)f(option:)0 2729 y Fn(-d)384 b Fs(Delete)27 -b(y)m(our)f(w)m(orking)f(cop)m(y)i(of)f(the)g(\014le)f(if)g(the)h -(release)h(succeeds.)39 b(If)26 b(this)f(\015ag)h(is)f(not)h(giv)m(en)g -(y)m(our)480 2853 y(\014les)j(will)f(remain)h(in)g(y)m(our)i(w)m -(orking)e(directory)-8 b(.)480 3008 y Fi(W)g(arning:)66 -b Fs(The)43 b Fn(release)e Fs(command)i(deletes)g(all)f(directories)g -(and)h(\014les)f(recursiv)m(ely)-8 b(.)78 b(This)480 -3133 y(has)37 b(the)h(v)m(ery)g(serious)e(side-e\013ect)j(that)f(an)m -(y)g(directory)f(that)h(y)m(ou)f(ha)m(v)m(e)i(created)g(inside)c(y)m -(our)480 3257 y(c)m(hec)m(k)m(ed-out)43 b(sources,)f(and)d(not)i(added) -e(to)i(the)f(rep)s(ository)f(\(using)f(the)j Fn(add)e -Fs(command;)44 b(see)480 3382 y(Chapter)30 b(10)h([Adding)e(\014les],)h -(page)h(59\))g(will)d(b)s(e)i(silen)m(tly)f(deleted|ev)m(en)h(if)g(it)g -(is)f(non-empt)m(y!)0 3848 y Fk(A.14.2)62 b(release)31 -b(output)125 4128 y Fs(Before)40 b Fn(release)e Fs(releases)h(y)m(our)h -(sources)g(it)f(will)e(prin)m(t)h(a)i(one-line)e(message)j(for)e(an)m -(y)h(\014le)f(that)h(is)f(not)0 4252 y(up-to-date.)125 -4532 y Fi(W)-8 b(arning:)70 b Fs(An)m(y)45 b(new)f(directories)g(that)i -(y)m(ou)f(ha)m(v)m(e)i(created,)j(but)44 b(not)h(added)f(to)i(the)f -Fr(cvs)f Fs(directory)0 4656 y(hierarc)m(h)m(y)33 b(with)f(the)h -Fn(add)g Fs(command)g(\(see)h(Chapter)f(10)h([Adding)e(\014les],)h -(page)h(59\))h(will)c(b)s(e)h(silen)m(tly)g(ignored)0 -4781 y(\(and)e(deleted,)h(if)e(`)p Fn(-d)p Fs(')h(is)g(sp)s -(eci\014ed\),)f(ev)m(en)i(if)e(they)i(con)m(tain)f(\014les.)0 -5091 y Fn(U)g Fo(\014le)0 5215 y Fn(P)g Fo(\014le)285 -b Fs(There)32 b(exists)g(a)i(new)m(er)e(revision)f(of)i(this)e(\014le)h -(in)g(the)g(rep)s(ository)-8 b(,)33 b(and)f(y)m(ou)h(ha)m(v)m(e)h(not)f -(mo)s(di\014ed)480 5340 y(y)m(our)d(lo)s(cal)g(cop)m(y)h(of)g(the)f -(\014le)g(\(`)p Fn(U)p Fs(')h(and)e(`)p Fn(P)p Fs(')i(mean)f(the)h -(same)g(thing\).)p eop -%%Page: 118 120 -118 119 bop 0 -116 a Fs(118)2366 b(CVS|Concurren)m(t)29 -b(V)-8 b(ersions)30 b(System)0 366 y Fn(A)g Fo(\014le)285 -b Fs(The)41 b(\014le)f(has)i(b)s(een)e(added)h(to)h(y)m(our)g(priv)-5 -b(ate)41 b(cop)m(y)h(of)f(the)h(sources,)i(but)d(has)g(not)h(y)m(et)h -(b)s(een)480 491 y(committed)26 b(to)h(the)f(rep)s(ository)-8 -b(.)39 b(If)26 b(y)m(ou)g(delete)g(y)m(our)g(cop)m(y)h(of)f(the)h -(sources)f(this)f(\014le)g(will)e(b)s(e)j(lost.)0 652 -y Fn(R)k Fo(\014le)285 b Fs(The)43 b(\014le)f(has)h(b)s(een)g(remo)m(v) -m(ed)h(from)f(y)m(our)g(priv)-5 b(ate)43 b(cop)m(y)h(of)f(the)h -(sources,)j(but)42 b(has)h(not)h(y)m(et)480 776 y(b)s(een)29 -b(remo)m(v)m(ed)i(from)e(the)g(rep)s(ository)-8 b(,)30 -b(since)f(y)m(ou)h(ha)m(v)m(e)h(not)f(y)m(et)g(committed)g(the)g(remo)m -(v)-5 b(al.)41 b(See)480 901 y(Section)30 b(A.7)h([commit],)g(page)h -(101.)0 1061 y Fn(M)e Fo(\014le)285 b Fs(The)35 b(\014le)f(is)h(mo)s -(di\014ed)e(in)h(y)m(our)i(w)m(orking)e(directory)-8 -b(.)56 b(There)35 b(migh)m(t)g(also)h(b)s(e)e(a)i(new)m(er)g(revision) -480 1186 y(inside)28 b(the)j(rep)s(ository)-8 b(.)0 1346 +0 2756 y(\014les,)f(it)f(isn't)f(strictly)h(necessary)h(to)g(use)f +(this)g(command.)53 b(Y)-8 b(ou)35 b(can)f(alw)m(a)m(ys)h(simply)d +(delete)j(y)m(our)g(w)m(orking)0 2880 y(directory)-8 +b(,)28 b(if)e(y)m(ou)h(lik)m(e;)h(but)e(y)m(ou)i(risk)d(losing)h(c)m +(hanges)i(y)m(ou)g(ma)m(y)f(ha)m(v)m(e)i(forgotten,)g(and)d(y)m(ou)i +(lea)m(v)m(e)g(no)f(trace)h(in)0 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 +(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 +3405 y(are)33 b(presen)m(t;)i(that)f(y)m(ou)f(are)g(executing)h(it)e +(from)h(immediately)e(ab)s(o)m(v)m(e)j(a)g Fr(cvs)e Fs(w)m(orking)g +(directory;)i(and)e(that)0 3530 y(the)d(rep)s(ository)e(recorded)h(for) +h(y)m(our)f(\014les)g(is)f(the)i(same)g(as)g(the)f(rep)s(ository)g +(de\014ned)f(in)g(the)i(mo)s(dule)e(database.)125 3805 +y(If)h(all)g(these)h(conditions)f(are)h(true,)g(`)p Fn(cvs)h(release)p +Fs(')d(lea)m(v)m(es)j(a)g(record)f(of)g(its)f(execution)h(\(attesting)h +(to)g(y)m(our)0 3930 y(in)m(ten)m(tionally)f(abandoning)g(y)m(our)h(c)m +(hec)m(k)m(out\))j(in)c(the)i Fr(cvs)e Fs(history)g(log.)0 +4361 y Fk(A.14.1)62 b(release)31 b(options)125 4637 y +Fs(The)e Fn(release)g Fs(command)h(supp)s(orts)e(one)j(command)f +(option:)0 4940 y Fn(-d)384 b Fs(Delete)27 b(y)m(our)f(w)m(orking)f +(cop)m(y)i(of)f(the)g(\014le)f(if)g(the)h(release)h(succeeds.)39 +b(If)26 b(this)f(\015ag)h(is)f(not)h(giv)m(en)g(y)m(our)480 +5064 y(\014les)j(will)f(remain)h(in)g(y)m(our)i(w)m(orking)e(directory) +-8 b(.)480 5215 y Fi(W)g(arning:)66 b Fs(The)43 b Fn(release)e +Fs(command)i(deletes)g(all)f(directories)g(and)h(\014les)f(recursiv)m +(ely)-8 b(.)78 b(This)480 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 +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 +(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 +(a)i(one-line)e(message)j(for)e(an)m(y)h(\014le)f(that)h(is)f(not)0 +1289 y(up-to-date.)125 1563 y Fi(W)-8 b(arning:)70 b +Fs(An)m(y)45 b(new)f(directories)g(that)i(y)m(ou)f(ha)m(v)m(e)i +(created,)j(but)44 b(not)h(added)f(to)i(the)f Fr(cvs)f +Fs(directory)0 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 +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 +b(exists)g(a)i(new)m(er)e(revision)f(of)i(this)e(\014le)h(in)g(the)g +(rep)s(ository)-8 b(,)33 b(and)f(y)m(ou)h(ha)m(v)m(e)h(not)f(mo)s +(di\014ed)480 2356 y(y)m(our)d(lo)s(cal)g(cop)m(y)h(of)g(the)f(\014le)g +(\(`)p Fn(U)p Fs(')h(and)e(`)p Fn(P)p Fs(')i(mean)f(the)h(same)g +(thing\).)0 2523 y Fn(A)f Fo(\014le)285 b Fs(The)41 b(\014le)f(has)i(b) +s(een)e(added)h(to)h(y)m(our)g(priv)-5 b(ate)41 b(cop)m(y)h(of)f(the)h +(sources,)i(but)d(has)g(not)h(y)m(et)h(b)s(een)480 2647 +y(committed)26 b(to)h(the)f(rep)s(ository)-8 b(.)39 b(If)26 +b(y)m(ou)g(delete)g(y)m(our)g(cop)m(y)h(of)f(the)h(sources)f(this)f +(\014le)g(will)e(b)s(e)j(lost.)0 2814 y Fn(R)k Fo(\014le)285 +b Fs(The)43 b(\014le)f(has)h(b)s(een)g(remo)m(v)m(ed)h(from)f(y)m(our)g +(priv)-5 b(ate)43 b(cop)m(y)h(of)f(the)h(sources,)j(but)42 +b(has)h(not)h(y)m(et)480 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 +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 +3354 y(inside)28 b(the)j(rep)s(ository)-8 b(.)0 3521 y Fn(?)30 b Fo(\014le)285 b(\014le)43 b Fs(is)38 b(in)f(y)m(our)i(w)m (orking)f(directory)-8 b(,)40 b(but)e(do)s(es)h(not)g(corresp)s(ond)e -(to)i(an)m(ything)g(in)e(the)i(source)480 1471 y(rep)s(ository)-8 +(to)i(an)m(ything)g(in)e(the)i(source)480 3645 y(rep)s(ository)-8 b(,)27 b(and)e(is)h(not)g(in)f(the)i(list)d(of)j(\014les)e(for)h Fr(cvs)f Fs(to)i(ignore)f(\(see)h(the)g(description)d(of)j(the)f(`)p -Fn(-I)p Fs(')480 1595 y(option,)h(and)e(see)h(Section)g(C.9)g +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 -(our)d(w)m(orking)h(sources,)480 1720 y(this)j(\014le)h(will)d(b)s(e)j -(lost.)0 2107 y Fk(A.14.3)62 b(release)31 b(examples)125 -2381 y Fs(Release)g(the)f(mo)s(dule,)f(and)h(delete)g(y)m(our)h(lo)s +(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 (cal)e(w)m(orking)h(cop)m(y)h(of)g(the)f(\014les.)240 -2635 y Fn($)47 b(cd)h(..)429 b(#)47 b Fs(Y)-8 b(ou)31 +4821 y Fn($)47 b(cd)h(..)429 b(#)47 b Fs(Y)-8 b(ou)31 b(m)m(ust)f(stand)g(immediately)f(ab)s(o)m(v)m(e)i(the)1004 -2738 y Fn(#)47 b Fs(sources)30 b(when)g(y)m(ou)h(issue)e(`)p -Fn(cvs)47 b(release)p Fs('.)240 2842 y Fn($)g(cvs)g(release)f(-d)h(tc) -240 2946 y(You)g(have)g([0])f(altered)g(files)h(in)g(this)f -(repository.)240 3050 y(Are)h(you)g(sure)f(you)h(want)g(to)g(release)f -(\(and)h(delete\))e(module)i(`tc':)f(y)240 3154 y($)0 -3574 y Fm(A.15)68 b(rtag|Add)30 b(a)h(sym)l(b)t(olic)g(tag)g(to)g(a)g -(mo)t(dule)75 3848 y Fq(\017)60 b Fs(rtag)31 b([-falnR])f([-b])h([-d])f -([-r)h(tag)g Fn(|)f Fs(-Ddate])j(sym)m(b)s(olic)p 2059 -3848 28 4 v 31 w(tag)e(mo)s(dules)p Fh(:)15 b(:)g(:)75 -3991 y Fq(\017)60 b Fs(Requires:)40 b(rep)s(ository)-8 -b(.)75 4133 y Fq(\017)60 b Fs(Changes:)40 b(rep)s(ository)-8 -b(.)75 4276 y Fq(\017)60 b Fs(Synon)m(ym:)40 b(rfreeze)125 -4568 y(Y)-8 b(ou)42 b(can)h(use)f(this)g(command)g(to)h(assign)f(sym)m -(b)s(olic)e(tags)k(to)f(particular,)h(explicitly)c(sp)s(eci\014ed)h -(source)0 4692 y(revisions)32 b(in)g(the)i(rep)s(ository)-8 -b(.)49 b Fn(rtag)33 b Fs(w)m(orks)g(directly)g(on)g(the)h(rep)s -(ository)e(con)m(ten)m(ts)k(\(and)d(requires)f(no)i(prior)0 -4817 y(c)m(hec)m(k)m(out\).)43 b(Use)31 b Fn(tag)e Fs(instead)g(\(see)i -(Section)f(A.17)i([tag],)g(page)e(120\),)i(to)f(base)f(the)h(selection) -f(of)g(revisions)e(on)0 4941 y(the)j(con)m(ten)m(ts)h(of)e(y)m(our)h(w) -m(orking)e(directory)-8 b(.)125 5215 y(If)28 b(y)m(ou)i(attempt)h(to)f -(use)f(a)h(tag)g(name)g(that)g(already)e(exists,)i Fr(cvs)e -Fs(will)f(complain)h(and)h(not)g(o)m(v)m(erwrite)h(that)0 -5340 y(tag.)42 b(Use)31 b(the)f(`)p Fn(-F)p Fs(')g(option)g(to)h(force) -g(the)g(new)f(tag)h(v)-5 b(alue.)p eop -%%Page: 119 121 -119 120 bop 0 -116 a Fs(App)s(endix)28 b(A:)i(Guide)g(to)h(CVS)e -(commands)2210 b(119)0 366 y Fk(A.15.1)62 b(rtag)30 b(options)125 -642 y Fs(These)d(standard)g(options)h(are)g(supp)s(orted)e(b)m(y)i -Fn(rtag)f Fs(\(see)i(Section)e(A.4)i([Common)f(options],)g(page)h(92,)g -(for)0 766 y(a)i(complete)g(description)d(of)j(them\):)0 -1068 y Fn(-D)f Fo(date)183 b Fs(T)-8 b(ag)31 b(the)g(most)g(recen)m(t)g -(revision)e(no)h(later)g(than)g Fo(date)p Fs(.)0 1244 +4925 y Fn(#)47 b Fs(sources)30 b(when)g(y)m(ou)h(issue)e(`)p +Fn(cvs)47 b(release)p Fs('.)240 5029 y Fn($)g(cvs)g(release)f(-d)h(tc) +240 5132 y(You)g(have)g([0])f(altered)g(files)h(in)g(this)f +(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 +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 +Fn(|)f Fs(-Ddate])j(sym)m(b)s(olic)p 2059 643 28 4 v +31 w(tag)e(mo)s(dules)p Fh(:)15 b(:)g(:)75 796 y Fq(\017)60 +b Fs(Requires:)40 b(rep)s(ository)-8 b(.)75 948 y Fq(\017)60 +b Fs(Changes:)40 b(rep)s(ository)-8 b(.)75 1101 y Fq(\017)60 +b Fs(Synon)m(ym:)40 b(rfreeze)125 1406 y(Y)-8 b(ou)42 +b(can)h(use)f(this)g(command)g(to)h(assign)f(sym)m(b)s(olic)e(tags)k +(to)f(particular,)h(explicitly)c(sp)s(eci\014ed)h(source)0 +1530 y(revisions)32 b(in)g(the)i(rep)s(ository)-8 b(.)49 +b Fn(rtag)33 b Fs(w)m(orks)g(directly)g(on)g(the)h(rep)s(ository)e(con) +m(ten)m(ts)k(\(and)d(requires)f(no)i(prior)0 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) +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 +(and)h(not)g(o)m(v)m(erwrite)h(that)0 2181 y(tag.)42 +b(Use)31 b(the)f(`)p Fn(-F)p Fs(')g(option)g(to)h(force)g(the)g(new)f +(tag)h(v)-5 b(alue.)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 +(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 y Fn(-f)384 b Fs(Only)31 b(useful)h(with)g(the)h(`)p Fn(-D)d Fo(date)5 b Fs(')34 b(or)f(`)p Fn(-r)d Fo(tag)8 b Fs(')34 b(\015ags.)49 b(If)33 b(no)g(matc)m(hing)g(revision)e(is)i -(found,)f(use)480 1369 y(the)f(most)f(recen)m(t)i(revision)c(\(instead) -i(of)h(ignoring)e(the)h(\014le\).)0 1546 y Fn(-F)384 +(found,)f(use)480 3635 y(the)f(most)f(recen)m(t)i(revision)c(\(instead) +i(of)h(ignoring)e(the)h(\014le\).)0 3815 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 1670 y(in)i Fr(cvs)g Fs(1.4.)42 b(The)30 b(old)g(b)s(eha)m(vior)f +480 3940 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)m(hed)h(b)m(y)f(`)p Fn(cvs)g(tag)f(-F)p Fs('.)0 -1847 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 2024 y Fn(-n)384 b Fs(Do)32 +4120 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 4301 y Fn(-n)384 b Fs(Do)32 b(not)e(run)g(an)m(y)h(tag)h(program)e(that)h(w)m(as)g(sp)s(eci\014ed)e (with)h(the)h(`)p Fn(-t)p Fs(')f(\015ag)h(inside)e(the)h(`)p -Fn(modules)p Fs(')480 2148 y(\014le.)40 b(\(see)31 b(Section)f(C.1)h -([mo)s(dules],)e(page)i(137\).)0 2325 y Fn(-R)384 b Fs(Commit)30 +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 b(directories)f(recursiv)m(ely)-8 b(.)40 b(This)28 b(is)i(on)g(b)m(y)g -(default.)0 2502 y Fn(-r)g Fo(tag)229 b Fs(Only)30 b(tag)j(those)f +(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 b(can)h(b)s(e)g(used)g(to)h(rename)g(a)g(tag:)44 b(tag)33 -b(only)e(the)480 2627 y(\014les)h(iden)m(ti\014ed)g(b)m(y)h(the)g(old)g +b(only)e(the)480 4911 y(\014les)h(iden)m(ti\014ed)g(b)m(y)h(the)g(old)g (tag,)i(then)e(delete)h(the)f(old)g(tag,)i(lea)m(ving)e(the)h(new)e -(tag)j(on)e(exactly)480 2751 y(the)e(same)f(\014les)g(as)g(the)h(old)e -(tag.)125 3052 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:)0 -3354 y Fn(-a)384 b Fs(Use)31 b(the)f(`)p Fn(-a)p Fs(')g(option)g(to)h -(ha)m(v)m(e)g Fn(rtag)e Fs(lo)s(ok)h(in)f(the)i(`)p Fn(Attic)p -Fs(')e(\(see)i(Chapter)f(11)h([Remo)m(ving)f(\014les],)480 -3478 y(page)c(61\))g(for)f(remo)m(v)m(ed)g(\014les)f(that)i(con)m(tain) -f(the)g(sp)s(eci\014ed)e(tag.)41 b(The)24 b(tag)i(is)e(remo)m(v)m(ed)i -(from)e(these)480 3603 y(\014les,)h(whic)m(h)f(mak)m(es)j(it)d(con)m(v) -m(enien)m(t)j(to)f(re-use)f(a)h(sym)m(b)s(olic)d(tag)k(as)e(dev)m -(elopmen)m(t)h(con)m(tin)m(ues)f(\(and)480 3727 y(\014les)k(get)j(remo) -m(v)m(ed)f(from)f(the)h(up-coming)e(distribution\).)0 -3904 y Fn(-b)384 b Fs(Mak)m(e)32 b(the)f(tag)g(a)g(branc)m(h)f(tag.)42 -b(See)30 b(Chapter)g(7)h([Branc)m(hes],)g(page)g(47.)0 -4081 y Fn(-d)384 b Fs(Delete)32 b(the)e(tag)i(instead)d(of)i(creating)g -(it.)480 4232 y(In)40 b(general,)k(tags)e(\(often)f(the)g(sym)m(b)s -(olic)e(names)i(of)g(soft)m(w)m(are)h(distributions\))c(should)h(not)i -(b)s(e)480 4356 y(remo)m(v)m(ed,)i(but)c(the)h(`)p Fn(-d)p -Fs(')f(option)g(is)g(a)m(v)-5 b(ailable)39 b(as)h(a)g(means)g(to)g -(remo)m(v)m(e)h(completely)e(obsolete)480 4481 y(sym)m(b)s(olic)j -(names)i(if)f(necessary)i(\(as)f(migh)m(t)g(b)s(e)g(the)g(case)h(for)f -(an)g(Alpha)f(release,)48 b(or)c(if)f(y)m(ou)480 4605 -y(mistagged)31 b(a)g(mo)s(dule\).)0 5065 y Fm(A.16)68 -b(status|Displa)l(y)32 b(status)g(information)f(on)g(c)l(hec)l(k)l(ed)f -(out)h(\014les)75 5340 y Fq(\017)60 b Fs(status)31 b([-lR])f([-v])h -([\014les)p Fh(:)15 b(:)g(:)p Fs(])p eop -%%Page: 120 122 -120 121 bop 0 -116 a Fs(120)2366 b(CVS|Concurren)m(t)29 -b(V)-8 b(ersions)30 b(System)75 366 y Fq(\017)60 b Fs(Requires:)40 -b(w)m(orking)29 b(directory)-8 b(,)31 b(rep)s(ository)-8 -b(.)75 525 y Fq(\017)60 b Fs(Changes:)40 b(nothing.)125 -843 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 967 y(information)39 -b(on)i(the)h(basic)e(output)h(see)h(Section)f(6.1)h([File)e(status],)45 -b(page)d(35.)73 b(F)-8 b(or)42 b(information)e(on)h(the)0 -1092 y Fn(Sticky)29 b(tag)35 b Fs(and)h Fn(Sticky)29 -b(date)35 b Fs(output,)j(see)g(Section)e(7.4)i([Stic)m(ky)e(tags],)k -(page)e(51.)60 b(F)-8 b(or)37 b(information)e(on)0 1216 -y(the)c Fn(Sticky)d(options)h Fs(output,)h(see)h(the)f(`)p -Fn(-k)p Fs(')h(option)e(in)h(Section)g(A.18.1)i([up)s(date)e(options],) -g(page)h(122.)125 1499 y(Y)-8 b(ou)36 b(can)h(also)f(use)g(this)f -(command)h(to)h(determine)f(the)g(p)s(oten)m(tial)g(impact)g(of)h(a)f -(`)p Fn(cvs)30 b(update)p Fs(')35 b(on)h(y)m(our)0 1624 -y(w)m(orking)25 b(source)g(directory|but)f(remem)m(b)s(er)h(that)h -(things)e(migh)m(t)h(c)m(hange)h(in)e(the)i(rep)s(ository)e(b)s(efore)h -(y)m(ou)g(run)0 1749 y Fn(update)p Fs(.)0 2247 y Fk(A.16.1)62 -b(status)31 b(options)125 2530 y Fs(These)f(standard)h(options)f(are)i -(supp)s(orted)d(b)m(y)i Fn(status)f Fs(\(see)i(Section)f(A.4)h([Common) -f(options],)g(page)h(92,)0 2655 y(for)e(a)h(complete)g(description)d -(of)j(them\):)0 2972 y Fn(-l)384 b Fs(Lo)s(cal;)30 b(run)f(only)h(in)f -(curren)m(t)h(w)m(orking)g(directory)-8 b(.)0 3165 y -Fn(-R)384 b Fs(Commit)30 b(directories)f(recursiv)m(ely)-8 -b(.)40 b(This)28 b(is)i(on)g(b)m(y)g(default.)125 3482 -y(There)f(is)h(one)g(additional)f(option:)0 3800 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 3924 y(together)j(with)d(the)i(n)m(umerical)e(v)-5 -b(alue)37 b(of)h(the)g(revision)e(or)h(branc)m(h)g(they)h(refer)f(to.) -63 b(F)-8 b(or)39 b(more)480 4049 y(information,)29 b(see)i(Section)f -(7.1)i([T)-8 b(ags],)31 b(page)h(47)0 4581 y Fm(A.17)68 -b(tag|Add)30 b(a)h(sym)l(b)t(olic)g(tag)g(to)g(c)l(hec)l(k)l(ed)g(out)f -(v)l(ersions)i(of)e(\014les)75 4864 y Fq(\017)60 b Fs(tag)32 -b([-lR])e([-b])g([-c])i([-d])f(sym)m(b)s(olic)p 1368 -4864 28 4 v 31 w(tag)g([\014les)p Fh(:)15 b(:)g(:)q Fs(])75 -5023 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 5181 y Fq(\017)60 b -Fs(Changes:)40 b(rep)s(ository)-8 b(.)75 5340 y Fq(\017)60 -b Fs(Synon)m(ym:)40 b(freeze)p eop +(tag)j(on)e(exactly)480 5035 y(the)e(same)f(\014les)g(as)g(the)h(old)e +(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)125 366 y(Use)35 b(this)g(command)g(to)h(assign)f -(sym)m(b)s(olic)f(tags)j(to)f(the)g(nearest)g(rep)s(ository)e(v)m -(ersions)h(to)h(y)m(our)g(w)m(orking)0 491 y(sources.)60 -b(The)36 b(tags)i(are)g(applied)c(immediately)h(to)j(the)f(rep)s -(ository)-8 b(,)38 b(as)f(with)f Fn(rtag)p Fs(,)h(but)f(the)h(v)m -(ersions)g(are)0 616 y(supplied)27 b(implicitly)g(b)m(y)j(the)g -Fr(cvs)g Fs(records)g(of)h(y)m(our)f(w)m(orking)g(\014les')f(history)g -(rather)i(than)f(applied)e(explicitly)-8 b(.)125 891 -y(One)29 b(use)g(for)g(tags)i(is)e(to)h(record)g(a)g(snapshot)f(of)h -(the)f(curren)m(t)h(sources)f(when)g(the)h(soft)m(w)m(are)h(freeze)f -(date)h(of)0 1015 y(a)d(pro)5 b(ject)28 b(arriv)m(es.)40 -b(As)28 b(bugs)f(are)h(\014xed)f(after)h(the)g(freeze)h(date,)g(only)e -(those)h(c)m(hanged)h(sources)e(that)i(are)f(to)h(b)s(e)0 -1140 y(part)h(of)h(the)f(release)h(need)f(b)s(e)g(re-tagged.)125 -1415 y(The)37 b(sym)m(b)s(olic)g(tags)i(are)g(mean)m(t)g(to)g(p)s -(ermanen)m(tly)d(record)i(whic)m(h)f(revisions)g(of)h(whic)m(h)f -(\014les)g(w)m(ere)i(used)0 1539 y(in)f(creating)j(a)f(soft)m(w)m(are)h -(distribution.)65 b(The)39 b Fn(checkout)f Fs(and)h Fn(update)f -Fs(commands)i(allo)m(w)f(y)m(ou)h(to)g(extract)0 1664 -y(an)33 b(exact)j(cop)m(y)e(of)g(a)g(tagged)h(release)f(at)g(an)m(y)g -(time)f(in)f(the)i(future,)g(regardless)f(of)g(whether)g(\014les)g(ha)m -(v)m(e)i(b)s(een)0 1788 y(c)m(hanged,)c(added,)f(or)h(remo)m(v)m(ed)g -(since)f(the)g(release)h(w)m(as)g(tagged.)125 2063 y(This)26 -b(command)h(can)h(also)g(b)s(e)f(used)g(to)i(delete)f(a)g(sym)m(b)s -(olic)e(tag,)k(or)e(to)h(create)g(a)f(branc)m(h.)40 b(See)28 -b(the)g(options)0 2188 y(section)j(b)s(elo)m(w.)125 2463 -y(If)d(y)m(ou)i(attempt)h(to)f(use)f(a)h(tag)g(name)g(that)g(already)e -(exists,)i Fr(cvs)e Fs(will)f(complain)h(and)h(not)g(o)m(v)m(erwrite)h -(that)0 2587 y(tag.)42 b(Use)31 b(the)f(`)p Fn(-F)p Fs(')g(option)g(to) -h(force)g(the)g(new)f(tag)h(v)-5 b(alue.)0 3011 y Fk(A.17.1)62 -b(tag)30 b(options)125 3286 y Fs(These)h(standard)f(options)h(are)h -(supp)s(orted)d(b)m(y)i Fn(tag)g Fs(\(see)h(Section)g(A.4)g([Common)f -(options],)g(page)h(92,)h(for)0 3410 y(a)e(complete)g(description)d(of) -j(them\):)0 3711 y Fn(-F)384 b Fs(Ov)m(erwrite)28 b(an)g(existing)g -(tag)i(of)f(the)f(same)h(name)g(on)g(a)g(di\013eren)m(t)f(revision.)38 -b(This)27 b(option)h(is)f(new)480 3836 y(in)i Fr(cvs)g -Fs(1.4.)42 b(The)30 b(old)g(b)s(eha)m(vior)f(is)h(matc)m(hed)h(b)m(y)f -(`)p Fn(cvs)g(tag)f(-F)p Fs('.)0 4012 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 4188 y Fn(-R)384 b Fs(Commit)30 b(directories)f(recursiv)m(ely)-8 -b(.)40 b(This)28 b(is)i(on)g(b)m(y)g(default.)125 4489 -y(Tw)m(o)g(sp)s(ecial)f(options)h(are)g(a)m(v)-5 b(ailable:)0 -4790 y Fn(-b)384 b Fs(The)31 b(-b)g(option)f(mak)m(es)i(the)g(tag)g(a)g -(branc)m(h)e(tag)i(\(see)h(Chapter)d(7)i([Branc)m(hes],)g(page)g(47\),) -h(allo)m(w-)480 4915 y(ing)39 b(concurren)m(t,)j(isolated)d(dev)m -(elopmen)m(t.)69 b(This)38 b(is)h(most)h(useful)d(for)j(creating)g(a)g -(patc)m(h)g(to)h(a)480 5039 y(previously)28 b(released)i(soft)m(w)m -(are)i(distribution.)0 5215 y Fn(-c)384 b Fs(The)30 b(-c)g(option)g(c)m -(hec)m(ks)i(that)e(all)f(\014les)g(whic)m(h)g(are)i(to)g(b)s(e)e -(tagged)j(are)e(unmo)s(di\014ed.)38 b(This)28 b(can)j(b)s(e)480 -5340 y(used)f(to)h(mak)m(e)g(sure)f(that)h(y)m(ou)f(can)h(reconstruct)g -(the)f(curren)m(t)h(\014le)e(con)m(ten)m(ts.)p eop +(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 +(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 +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 +1344 y(remo)m(v)m(ed,)i(but)c(the)h(`)p Fn(-d)p Fs(')f(option)g(is)g(a) +m(v)-5 b(ailable)39 b(as)h(a)g(means)g(to)g(remo)m(v)m(e)h(completely)e +(obsolete)480 1469 y(sym)m(b)s(olic)j(names)i(if)f(necessary)i(\(as)f +(migh)m(t)g(b)s(e)g(the)g(case)h(for)f(an)g(Alpha)f(release,)48 +b(or)c(if)f(y)m(ou)480 1593 y(mistagged)31 b(a)g(mo)s(dule\).)0 +2027 y Fm(A.16)68 b(status|Displa)l(y)32 b(status)g(information)f(on)g +(c)l(hec)l(k)l(ed)f(out)h(\014les)75 2301 y Fq(\017)60 +b Fs(status)31 b([-lR])f([-v])h([\014les)p Fh(:)15 b(:)g(:)p +Fs(])75 2446 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 2592 +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 +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 +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 +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 +b(source)g(directory|but)f(remem)m(b)s(er)h(that)h(things)e(migh)m(t)h +(c)m(hange)h(in)e(the)i(rep)s(ository)e(b)s(efore)h(y)m(ou)g(run)0 +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) +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 -b(V)-8 b(ersions)30 b(System)0 366 y Fn(-d)384 b Fs(Delete)32 -b(a)e(tag.)480 517 y(If)g(y)m(ou)g(use)g(`)p Fn(cvs)g(tag)f(-d)h -(symbolic_tag)p Fs(',)e(the)i(sym)m(b)s(olic)f(tag)i(y)m(ou)g(sp)s -(ecify)d(is)i(deleted)g(instead)480 641 y(of)25 b(b)s(eing)e(added.)39 +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 +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 +Fh(:)15 b(:)g(:)q Fs(])75 1572 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 1730 y Fq(\017)60 b Fs(Changes:)40 b(rep)s(ository)-8 +b(.)75 1887 y Fq(\017)60 b Fs(Synon)m(ym:)40 b(freeze)125 +2201 y(Use)35 b(this)g(command)g(to)h(assign)f(sym)m(b)s(olic)f(tags)j +(to)f(the)g(nearest)g(rep)s(ository)e(v)m(ersions)h(to)h(y)m(our)g(w)m +(orking)0 2326 y(sources.)60 b(The)36 b(tags)i(are)g(applied)c +(immediately)h(to)j(the)f(rep)s(ository)-8 b(,)38 b(as)f(with)f +Fn(rtag)p Fs(,)h(but)f(the)h(v)m(ersions)g(are)0 2450 +y(supplied)27 b(implicitly)g(b)m(y)j(the)g Fr(cvs)g Fs(records)g(of)h +(y)m(our)f(w)m(orking)g(\014les')f(history)g(rather)i(than)f(applied)e +(explicitly)-8 b(.)125 2732 y(One)29 b(use)g(for)g(tags)i(is)e(to)h +(record)g(a)g(snapshot)f(of)h(the)f(curren)m(t)h(sources)f(when)g(the)h +(soft)m(w)m(are)h(freeze)f(date)h(of)0 2857 y(a)d(pro)5 +b(ject)28 b(arriv)m(es.)40 b(As)28 b(bugs)f(are)h(\014xed)f(after)h +(the)g(freeze)h(date,)g(only)e(those)h(c)m(hanged)h(sources)e(that)i +(are)f(to)h(b)s(e)0 2981 y(part)h(of)h(the)f(release)h(need)f(b)s(e)g +(re-tagged.)125 3263 y(The)37 b(sym)m(b)s(olic)g(tags)i(are)g(mean)m(t) +g(to)g(p)s(ermanen)m(tly)d(record)i(whic)m(h)f(revisions)g(of)h(whic)m +(h)f(\014les)g(w)m(ere)i(used)0 3387 y(in)f(creating)j(a)f(soft)m(w)m +(are)h(distribution.)65 b(The)39 b Fn(checkout)f Fs(and)h +Fn(update)f Fs(commands)i(allo)m(w)f(y)m(ou)h(to)g(extract)0 +3512 y(an)33 b(exact)j(cop)m(y)e(of)g(a)g(tagged)h(release)f(at)g(an)m +(y)g(time)f(in)f(the)i(future,)g(regardless)f(of)g(whether)g(\014les)g +(ha)m(v)m(e)i(b)s(een)0 3636 y(c)m(hanged,)c(added,)f(or)h(remo)m(v)m +(ed)g(since)f(the)g(release)h(w)m(as)g(tagged.)125 3918 +y(This)26 b(command)h(can)h(also)g(b)s(e)f(used)g(to)i(delete)f(a)g +(sym)m(b)s(olic)e(tag,)k(or)e(to)h(create)g(a)f(branc)m(h.)40 +b(See)28 b(the)g(options)0 4043 y(section)j(b)s(elo)m(w.)125 +4324 y(If)d(y)m(ou)i(attempt)h(to)f(use)f(a)h(tag)g(name)g(that)g +(already)e(exists,)i Fr(cvs)e Fs(will)f(complain)h(and)h(not)g(o)m(v)m +(erwrite)h(that)0 4449 y(tag.)42 b(Use)31 b(the)f(`)p +Fn(-F)p Fs(')g(option)g(to)h(force)g(the)g(new)f(tag)h(v)-5 +b(alue.)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 +(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 +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) +m(hed)h(b)m(y)f(`)p Fn(cvs)g(tag)f(-F)p Fs('.)0 667 y +Fn(-l)384 b Fs(Lo)s(cal;)30 b(run)f(only)h(in)f(curren)m(t)h(w)m +(orking)g(directory)-8 b(.)0 842 y Fn(-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 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 +(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 +1868 y Fn(-c)384 b Fs(The)30 b(-c)g(option)g(c)m(hec)m(ks)i(that)e(all) +f(\014les)g(whic)m(h)g(are)i(to)g(b)s(e)e(tagged)j(are)e(unmo)s +(di\014ed.)38 b(This)28 b(can)j(b)s(e)480 1992 y(used)f(to)h(mak)m(e)g +(sure)f(that)h(y)m(ou)f(can)h(reconstruct)g(the)f(curren)m(t)h(\014le)e +(con)m(ten)m(ts.)0 2168 y Fn(-d)384 b Fs(Delete)32 b(a)e(tag.)480 +2318 y(If)g(y)m(ou)g(use)g(`)p Fn(cvs)g(tag)f(-d)h(symbolic_tag)p +Fs(',)e(the)i(sym)m(b)s(olic)f(tag)i(y)m(ou)g(sp)s(ecify)d(is)i +(deleted)g(instead)480 2443 y(of)25 b(b)s(eing)e(added.)39 b(W)-8 b(arning:)37 b(Be)26 b(v)m(ery)f(certain)f(of)h(y)m(our)g (ground)f(b)s(efore)g(y)m(ou)h(delete)h(a)f(tag;)j(doing)480 -766 y(this)g(p)s(ermanen)m(tly)g(discards)g(some)h(historical)f +2567 y(this)g(p)s(ermanen)m(tly)g(discards)g(some)h(historical)f (information,)g(whic)m(h)g(ma)m(y)i(later)f(turn)f(out)i(to)g(b)s(e)480 -890 y(v)-5 b(aluable.)0 1345 y Fm(A.18)68 b(up)t(date|Bring)30 +2692 y(v)-5 b(aluable.)0 3146 y Fm(A.18)68 b(up)t(date|Bring)30 b(w)l(ork)h(tree)g(in)g(sync)f(with)g(rep)t(ository)75 -1619 y Fq(\017)60 b Fs(up)s(date)30 b([-Ad\015PpR])f([-d])i([-r)f(tag)p -Fn(|)p Fs(-D)i(date])g(\014les)p Fh(:)15 b(:)g(:)75 1769 +3421 y Fq(\017)60 b Fs(up)s(date)30 b([-Ad\015PpR])f([-d])i([-r)f(tag)p +Fn(|)p Fs(-D)i(date])g(\014les)p Fh(:)15 b(:)g(:)75 3571 y Fq(\017)60 b Fs(Requires:)40 b(rep)s(ository)-8 b(,)30 -b(w)m(orking)f(directory)-8 b(.)75 1920 y Fq(\017)60 +b(w)m(orking)f(directory)-8 b(.)75 3721 y Fq(\017)60 b Fs(Changes:)40 b(w)m(orking)30 b(directory)-8 b(.)125 -2220 y(After)36 b(y)m(ou'v)m(e)h(run)d(c)m(hec)m(k)m(out)k(to)f(create) +4021 y(After)36 b(y)m(ou'v)m(e)h(run)d(c)m(hec)m(k)m(out)k(to)f(create) g(y)m(our)f(priv)-5 b(ate)35 b(cop)m(y)h(of)g(source)g(from)f(the)h -(common)g(rep)s(ository)-8 b(,)0 2344 y(other)24 b(dev)m(elop)s(ers)f +(common)g(rep)s(ository)-8 b(,)0 4146 y(other)24 b(dev)m(elop)s(ers)f (will)e(con)m(tin)m(ue)i(c)m(hanging)h(the)g(cen)m(tral)g(source.)38 b(F)-8 b(rom)24 b(time)f(to)i(time,)g(when)d(it)h(is)g(con)m(v)m(enien) -m(t)0 2469 y(in)h(y)m(our)h(dev)m(elopmen)m(t)h(pro)s(cess,)g(y)m(ou)f +m(t)0 4270 y(in)h(y)m(our)h(dev)m(elopmen)m(t)h(pro)s(cess,)g(y)m(ou)f (can)h(use)f(the)g Fn(update)e Fs(command)i(from)g(within)e(y)m(our)i -(w)m(orking)f(directory)0 2593 y(to)31 b(reconcile)e(y)m(our)h(w)m(ork) +(w)m(orking)f(directory)0 4395 y(to)31 b(reconcile)e(y)m(our)h(w)m(ork) g(with)f(an)m(y)h(revisions)e(applied)g(to)j(the)f(source)g(rep)s (ository)f(since)g(y)m(our)h(last)g(c)m(hec)m(k)m(out)0 -2718 y(or)g(up)s(date.)0 3139 y Fk(A.18.1)62 b(up)s(date)31 -b(options)125 3414 y Fs(These)d(standard)h(options)f(are)i(a)m(v)-5 +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(92,)0 3538 y(for)g(a)h(complete)g(description)d(of) -j(them\):)0 3839 y Fn(-D)f(date)162 b Fs(Use)28 b(the)f(most)g(recen)m -(t)i(revision)c(no)i(later)g(than)g Fo(date)p Fs(.)40 -b(This)26 b(option)g(is)g(stic)m(ky)-8 b(,)29 b(and)d(implies)f(`)p -Fn(-P)p Fs('.)480 3963 y(See)31 b(Section)f(7.4)h([Stic)m(ky)g(tags],)h -(page)f(51,)g(for)f(more)h(information)e(on)h(stic)m(ky)g(tags/dates.)0 -4139 y Fn(-f)384 b Fs(Only)42 b(useful)g(with)h(the)h(`)p -Fn(-D)30 b Fo(date)5 b Fs(')44 b(or)g(`)p Fn(-r)30 b -Fo(tag)8 b Fs(')45 b(\015ags.)81 b(If)44 b(no)f(matc)m(hing)h(revision) -e(is)h(found,)480 4264 y(retriev)m(e)31 b(the)f(most)h(recen)m(t)h -(revision)c(\(instead)i(of)h(ignoring)d(the)j(\014le\).)0 -4439 y Fn(-k)f Fo(k\015ag)165 b Fs(Pro)s(cess)43 b Fr(r)n(cs)f -Fs(k)m(eyw)m(ords)h(according)g(to)g Fo(k\015ag)p Fs(.)79 -b(See)43 b(co\(1\).)80 b(This)41 b(option)h(is)g(stic)m(ky;)50 -b(future)480 4564 y(up)s(dates)42 b(of)g(this)g(\014le)g(in)f(this)h(w) -m(orking)f(directory)i(will)d(use)i(the)h(same)g Fo(k\015ag)p -Fs(.)78 b(The)42 b Fn(status)480 4688 y Fs(command)28 -b(can)h(b)s(e)f(view)m(ed)g(to)h(see)g(the)g(stic)m(ky)g(options.)39 -b(See)29 b(Section)f(A.16)i([status],)g(page)f(119.)0 -4864 y Fn(-l)384 b Fs(Lo)s(cal;)51 b(run)42 b(only)h(in)g(curren)m(t)g -(w)m(orking)h(directory)-8 b(.)81 b(See)44 b(Chapter)f(9)h([Recursiv)m -(e)g(b)s(eha)m(vior],)480 4989 y(page)31 b(57.)0 5164 +(options],)g(page)h(94,)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 +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 +(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 +b(If)44 b(no)f(matc)m(hing)h(revision)e(is)h(found,)480 +790 y(retriev)m(e)31 b(the)f(most)h(recen)m(t)h(revision)c(\(instead)i +(of)h(ignoring)d(the)j(\014le\).)0 964 y Fn(-k)f Fo(k\015ag)165 +b Fs(Pro)s(cess)43 b Fr(r)n(cs)f Fs(k)m(eyw)m(ords)h(according)g(to)g +Fo(k\015ag)p Fs(.)79 b(See)43 b(co\(1\).)80 b(This)41 +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.) +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 y Fn(-P)384 b Fs(Prune)29 b(empt)m(y)i(directories.)40 -b(See)30 b(Chapter)g(15)h([Mo)m(ving)g(directories],)f(page)h(73.)0 -5340 y Fn(-p)384 b Fs(Pip)s(e)29 b(\014les)g(to)i(the)g(standard)e -(output.)p eop -%%Page: 123 125 -123 124 bop 0 -116 a Fs(App)s(endix)28 b(A:)i(Guide)g(to)h(CVS)e -(commands)2210 b(123)0 366 y Fn(-R)384 b Fs(Op)s(erate)30 -b(recursiv)m(ely)f(\(default\).)41 b(See)31 b(Chapter)e(9)i([Recursiv)m -(e)f(b)s(eha)m(vior],)g(page)i(57.)0 569 y Fn(-r)e(tag)210 -b Fs(Retriev)m(e)36 b(revision)d Fo(tag)p Fs(.)55 b(This)33 -b(option)i(is)f(stic)m(ky)-8 b(,)36 b(and)f(implies)d(`)p -Fn(-P)p Fs('.)54 b(See)35 b(Section)g(7.4)h([Stic)m(ky)480 -694 y(tags],)c(page)f(51,)h(for)e(more)g(information)f(on)h(stic)m(ky)h -(tags/dates.)125 993 y(These)f(sp)s(ecial)f(options)g(are)i(also)f(a)m -(v)-5 b(ailable)30 b(with)f Fn(update)p Fs(.)0 1321 y -Fn(-A)384 b Fs(Reset)30 b(an)m(y)f(stic)m(ky)g(tags,)h(dates,)g(or)f(`) -p Fn(-k)p Fs(')g(options.)39 b(See)29 b(Section)g(7.4)h([Stic)m(ky)f -(tags],)h(page)g(51,)g(for)480 1445 y(more)h(information)d(on)i(stic)m -(ky)h(tags/dates.)0 1648 y Fn(-d)384 b Fs(Create)32 b(an)m(y)g +b(See)30 b(Chapter)g(14)h([Mo)m(ving)g(directories],)f(page)h(75.)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 +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 +(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 +(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 1773 y(directory)-8 +(missing)e(from)i(the)h(w)m(orking)480 3324 y(directory)-8 b(.)38 b(Normally)-8 b(,)24 b Fn(update)e Fs(acts)i(only)e(on)h (directories)f(and)g(\014les)g(that)i(w)m(ere)f(already)g(enrolled)480 -1897 y(in)29 b(y)m(our)h(w)m(orking)g(directory)-8 b(.)480 -2061 y(This)38 b(is)i(useful)e(for)i(up)s(dating)e(directories)h(that)i +3448 y(in)29 b(y)m(our)h(w)m(orking)g(directory)-8 b(.)480 +3597 y(This)38 b(is)i(useful)e(for)i(up)s(dating)e(directories)h(that)i (w)m(ere)g(created)g(in)e(the)h(rep)s(ository)f(since)h(the)480 -2185 y(initial)h(c)m(hec)m(k)m(out;)54 b(but)43 b(it)h(has)g(an)g +3722 y(initial)h(c)m(hec)m(k)m(out;)54 b(but)43 b(it)h(has)g(an)g (unfortunate)f(side)g(e\013ect.)84 b(If)43 b(y)m(ou)i(delib)s(erately)c -(a)m(v)m(oided)480 2310 y(certain)35 b(directories)g(in)f(the)h(rep)s +(a)m(v)m(oided)480 3847 y(certain)35 b(directories)g(in)f(the)h(rep)s (ository)g(when)f(y)m(ou)i(created)g(y)m(our)g(w)m(orking)e(directory)h -(\(either)480 2435 y(through)42 b(use)h(of)g(a)g(mo)s(dule)e(name)i(or) +(\(either)480 3971 y(through)42 b(use)h(of)g(a)g(mo)s(dule)e(name)i(or) g(b)m(y)g(listing)d(explicitly)h(the)i(\014les)e(and)i(directories)f(y) -m(ou)480 2559 y(w)m(an)m(ted)c(on)g(the)f(command)h(line\),)g(then)f +m(ou)480 4096 y(w)m(an)m(ted)c(on)g(the)f(command)h(line\),)g(then)f (up)s(dating)f(with)g(`)p Fn(-d)p Fs(')i(will)c(create)40 -b(those)e(directories,)480 2684 y(whic)m(h)29 b(ma)m(y)i(not)g(b)s(e)e -(what)i(y)m(ou)f(w)m(an)m(t.)0 2887 y Fn(-I)g Fo(name)142 +b(those)e(directories,)480 4220 y(whic)m(h)29 b(ma)m(y)i(not)g(b)s(e)e +(what)i(y)m(ou)f(w)m(an)m(t.)0 4394 y Fn(-I)g Fo(name)142 b Fs(Ignore)33 b(\014les)f(whose)g(names)h(matc)m(h)g Fo(name)38 b Fs(\(in)32 b(y)m(our)h(w)m(orking)f(directory\))g(during)f -(the)h(up)s(date.)480 3011 y(Y)-8 b(ou)46 b(can)g(sp)s(ecify)e(`)p +(the)h(up)s(date.)480 4519 y(Y)-8 b(ou)46 b(can)g(sp)s(ecify)e(`)p Fn(-I)p Fs(')h(more)h(than)f(once)h(on)f(the)h(command)f(line)f(to)i -(sp)s(ecify)e(sev)m(eral)i(\014les)480 3136 y(to)39 b(ignore.)66 +(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 3260 y(page)31 b(148,)h(for)e(other)h(w)m(a)m(ys)g +([cvsignore],)480 4768 y(page)31 b(148,)h(for)e(other)h(w)m(a)m(ys)g (to)g(mak)m(e)g Fr(cvs)f Fs(ignore)g(some)h(\014les.)0 -3463 y Fn(-W)p Fo(sp)s(ec)214 b Fs(Sp)s(ecify)42 b(\014le)g(names)h +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 -b(Y)-8 b(ou)44 b(can)f(use)g(this)f(option)480 3588 y(rep)s(eatedly)-8 -b(.)480 3751 y Fo(sp)s(ec)59 b Fs(can)54 b(b)s(e)f(a)h(\014le)f(name)h +b(Y)-8 b(ou)44 b(can)f(use)g(this)f(option)480 5066 y(rep)s(eatedly)-8 +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 3876 y(`)p Fn(.cvswrappers)p Fs(')28 +(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.)0 4079 y Fn(-j)p Fo(revision)76 b Fs(With)39 -b(t)m(w)m(o)h(`)p Fn(-j)p Fs(')f(options,)i(merge)f(c)m(hanges)g(from)f -(the)g(revision)f(sp)s(eci\014ed)f(with)h(the)i(\014rst)e(`)p -Fn(-j)p Fs(')480 4203 y(option)30 b(to)h(the)g(revision)d(sp)s -(eci\014ed)h(with)g(the)h(second)h(`)p Fn(j)p Fs(')f(option,)g(in)m(to) -h(the)f(w)m(orking)g(directory)-8 b(.)480 4367 y(With)24 +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 +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 +(sp)s(eci\014ed)h(with)g(the)h(second)h(`)p Fn(j)p Fs(')f(option,)g(in) +m(to)h(the)f(w)m(orking)g(directory)-8 b(.)480 647 y(With)24 b(one)g(`)p Fn(-j)p Fs(')g(option,)i(merge)e(c)m(hanges)i(from)d(the)i (ancestor)g(revision)e(to)i(the)f(revision)f(sp)s(eci\014ed)480 -4492 y(with)30 b(the)h(`)p Fn(-j)p Fs(')g(option,)f(in)m(to)h(the)g(w)m +772 y(with)30 b(the)h(`)p Fn(-j)p Fs(')g(option,)f(in)m(to)h(the)g(w)m (orking)g(directory)-8 b(.)42 b(The)30 b(ancestor)i(revision)e(is)g -(the)h(common)480 4616 y(ancestor)45 b(of)f(the)g(revision)f(whic)m(h)g +(the)h(common)480 897 y(ancestor)45 b(of)f(the)g(revision)f(whic)m(h)g (the)h(w)m(orking)f(directory)h(is)f(based)g(on,)48 b(and)43 -b(the)i(revision)480 4741 y(sp)s(eci\014ed)29 b(in)g(the)h(`)p -Fn(-j)p Fs(')h(option.)480 4904 y(In)26 b(addition,)h(eac)m(h)h(-j)f +b(the)i(revision)480 1021 y(sp)s(eci\014ed)29 b(in)g(the)h(`)p +Fn(-j)p Fs(')h(option.)480 1177 y(In)26 b(addition,)h(eac)m(h)h(-j)f (option)g(can)g(con)m(tain)h(an)f(optional)f(date)i(sp)s(eci\014cation) -e(whic)m(h,)h(when)f(used)480 5029 y(with)i(branc)m(hes,)h(can)g(limit) +e(whic)m(h,)h(when)f(used)480 1302 y(with)i(branc)m(hes,)h(can)g(limit) e(the)i(c)m(hosen)g(revision)e(to)j(one)f(within)d(a)k(sp)s(eci\014c)d -(date.)41 b(An)29 b(optional)480 5154 y(date)i(is)e(sp)s(eci\014ed)g(b) +(date.)41 b(An)29 b(optional)480 1427 y(date)i(is)e(sp)s(eci\014ed)g(b) m(y)h(adding)f(a)i(colon)f(\(:\))42 b(to)31 b(the)g(tag:)41 -b(`)p Fn(-j)p Fo(Sym)m(b)s(olic)p 2962 5154 28 4 v 31 -w(T)-8 b(ag)8 b Fn(:)p Fo(Date)p 3386 5154 V 35 w(Sp)s(eci\014er)f -Fs('.)480 5317 y(See)31 b(Chapter)e(8)i([Merging],)g(page)g(53.)p -eop -%%Page: 124 126 -124 125 bop 0 -116 a Fs(124)2366 b(CVS|Concurren)m(t)29 -b(V)-8 b(ersions)30 b(System)0 366 y Fk(A.18.2)62 b(up)s(date)31 -b(output)125 650 y Fn(update)24 b Fs(and)i Fn(checkout)f -Fs(k)m(eep)i(y)m(ou)g(informed)e(of)h(its)g(progress)h(b)m(y)f(prin)m -(ting)f(a)i(line)d(for)j(eac)m(h)h(\014le,)e(preceded)0 -775 y(b)m(y)k(one)h(c)m(haracter)h(indicating)c(the)j(status)f(of)h -(the)f(\014le:)0 1094 y Fn(U)g Fo(\014le)285 b Fs(The)35 -b(\014le)f(w)m(as)h(brough)m(t)g(up)f(to)i(date)g(with)e(resp)s(ect)h -(to)h(the)f(rep)s(ository)-8 b(.)54 b(This)34 b(is)g(done)h(for)g(an)m -(y)480 1218 y(\014le)c(that)i(exists)f(in)f(the)h(rep)s(ository)f(but)h -(not)g(in)f(y)m(our)h(source,)h(and)f(for)g(\014les)f(that)i(y)m(ou)g -(ha)m(v)m(en't)480 1343 y(c)m(hanged)e(but)f(are)g(not)h(the)g(most)f -(recen)m(t)i(v)m(ersions)e(a)m(v)-5 b(ailable)29 b(in)g(the)i(rep)s -(ository)-8 b(.)0 1537 y Fn(P)30 b Fo(\014le)285 b Fs(Lik)m(e)34 -b(`)p Fn(U)p Fs(',)i(but)e(the)g Fr(cvs)f Fs(serv)m(er)i(sends)e(a)i -(patc)m(h)g(instead)f(of)g(an)g(en)m(tire)h(\014le.)51 -b(These)34 b(t)m(w)m(o)i(things)480 1661 y(accomplish)29 -b(the)i(same)f(thing.)0 1856 y Fn(A)g Fo(\014le)285 b -Fs(The)32 b(\014le)f(has)g(b)s(een)h(added)f(to)i(y)m(our)f(priv)-5 -b(ate)31 b(cop)m(y)i(of)f(the)h(sources,)f(and)g(will)d(b)s(e)j(added)f -(to)i(the)480 1980 y(source)d(rep)s(ository)e(when)h(y)m(ou)h(run)e +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 +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) +h(\014le,)e(preceded)0 2467 y(b)m(y)k(one)h(c)m(haracter)h(indicating)c +(the)j(status)f(of)h(the)f(\014le:)0 2779 y Fn(U)g Fo(\014le)285 +b Fs(The)35 b(\014le)f(w)m(as)h(brough)m(t)g(up)f(to)i(date)g(with)e +(resp)s(ect)h(to)h(the)f(rep)s(ository)-8 b(.)54 b(This)34 +b(is)g(done)h(for)g(an)m(y)480 2904 y(\014le)c(that)i(exists)f(in)f +(the)h(rep)s(ository)f(but)h(not)g(in)f(y)m(our)h(source,)h(and)f(for)g +(\014les)f(that)i(y)m(ou)g(ha)m(v)m(en't)480 3028 y(c)m(hanged)e(but)f +(are)g(not)h(the)g(most)f(recen)m(t)i(v)m(ersions)e(a)m(v)-5 +b(ailable)29 b(in)g(the)i(rep)s(ository)-8 b(.)0 3217 +y Fn(P)30 b Fo(\014le)285 b Fs(Lik)m(e)34 b(`)p Fn(U)p +Fs(',)i(but)e(the)g Fr(cvs)f Fs(serv)m(er)i(sends)e(a)i(patc)m(h)g +(instead)f(of)g(an)g(en)m(tire)h(\014le.)51 b(These)34 +b(t)m(w)m(o)i(things)480 3341 y(accomplish)29 b(the)i(same)f(thing.)0 +3530 y Fn(A)g Fo(\014le)285 b Fs(The)32 b(\014le)f(has)g(b)s(een)h +(added)f(to)i(y)m(our)f(priv)-5 b(ate)31 b(cop)m(y)i(of)f(the)h +(sources,)f(and)g(will)d(b)s(e)j(added)f(to)i(the)480 +3654 y(source)d(rep)s(ository)e(when)h(y)m(ou)h(run)e Fn(commit)g Fs(on)i(the)f(\014le.)40 b(This)28 b(is)h(a)h(reminder)d -(to)k(y)m(ou)f(that)g(the)480 2105 y(\014le)f(needs)h(to)i(b)s(e)d -(committed.)0 2299 y Fn(R)h Fo(\014le)285 b Fs(The)30 +(to)k(y)m(ou)f(that)g(the)480 3779 y(\014le)f(needs)h(to)i(b)s(e)d +(committed.)0 3967 y Fn(R)h Fo(\014le)285 b Fs(The)30 b(\014le)g(has)h(b)s(een)f(remo)m(v)m(ed)h(from)f(y)m(our)h(priv)-5 b(ate)30 b(cop)m(y)i(of)f(the)g(sources,)g(and)f(will)e(b)s(e)i(remo)m -(v)m(ed)480 2423 y(from)e(the)h(source)f(rep)s(ository)g(when)f(y)m(ou) +(v)m(ed)480 4092 y(from)e(the)h(source)f(rep)s(ository)g(when)f(y)m(ou) i(run)e Fn(commit)g Fs(on)h(the)h(\014le.)39 b(This)27 -b(is)g(a)i(reminder)d(to)k(y)m(ou)480 2548 y(that)h(the)g(\014le)e -(needs)h(to)h(b)s(e)f(committed.)0 2742 y Fn(M)g Fo(\014le)285 +b(is)g(a)i(reminder)d(to)k(y)m(ou)480 4216 y(that)h(the)g(\014le)e +(needs)h(to)h(b)s(e)f(committed.)0 4404 y Fn(M)g Fo(\014le)285 b Fs(The)30 b(\014le)f(is)h(mo)s(di\014ed)e(in)h(y)m(our)h(w)m(orking)g -(directory)-8 b(.)480 2902 y(`)p Fn(M)p Fs(')39 b(can)g(indicate)f(one) +(directory)-8 b(.)480 4561 y(`)p Fn(M)p Fs(')39 b(can)g(indicate)f(one) h(of)g(t)m(w)m(o)i(states)f(for)f(a)g(\014le)f(y)m(ou're)h(w)m(orking)g -(on:)57 b(either)39 b(there)g(w)m(ere)g(no)480 3026 y(mo)s +(on:)57 b(either)39 b(there)g(w)m(ere)g(no)480 4685 y(mo)s (di\014cations)34 b(to)i(the)g(same)h(\014le)d(in)h(the)h(rep)s (ository)-8 b(,)37 b(so)f(that)g(y)m(our)g(\014le)e(remains)h(as)h(y)m -(ou)g(last)480 3151 y(sa)m(w)d(it;)g(or)f(there)g(w)m(ere)h(mo)s +(ou)g(last)480 4810 y(sa)m(w)d(it;)g(or)f(there)g(w)m(ere)h(mo)s (di\014cations)e(in)g(the)h(rep)s(ository)f(as)i(w)m(ell)e(as)i(in)e(y) -m(our)h(cop)m(y)-8 b(,)34 b(but)e(they)480 3275 y(w)m(ere)f(merged)f +m(our)h(cop)m(y)-8 b(,)34 b(but)e(they)480 4934 y(w)m(ere)f(merged)f (successfully)-8 b(,)29 b(without)h(con\015ict,)g(in)f(y)m(our)i(w)m -(orking)e(directory)-8 b(.)480 3434 y Fr(cvs)23 b Fs(will)e(prin)m(t)h +(orking)e(directory)-8 b(.)480 5091 y Fr(cvs)23 b Fs(will)e(prin)m(t)h (some)i(messages)h(if)d(it)h(merges)h(y)m(our)g(w)m(ork,)h(and)e(a)h (bac)m(kup)g(cop)m(y)g(of)g(y)m(our)g(w)m(orking)480 -3559 y(\014le)32 b(\(as)h(it)f(lo)s(ok)m(ed)g(b)s(efore)h(y)m(ou)f(ran) +5215 y(\014le)32 b(\(as)h(it)f(lo)s(ok)m(ed)g(b)s(efore)h(y)m(ou)f(ran) 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 3684 y(prin)m(ted)d(while) -f Fn(update)h Fs(runs.)0 3878 y Fn(C)h Fo(\014le)285 +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 +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 -b(c)m(hanges)i(from)480 4002 y(the)43 b(source)g(rep)s(ository)-8 +b(c)m(hanges)i(from)480 491 y(the)43 b(source)g(rep)s(ository)-8 b(.)77 b Fo(\014le)47 b Fs(\(the)d(cop)m(y)f(in)f(y)m(our)h(w)m(orking) -f(directory\))h(is)e(no)m(w)i(the)g(output)480 4127 y(of)35 +f(directory\))h(is)e(no)m(w)i(the)g(output)480 616 y(of)35 b(the)h(rcsmerge\(1\))g(command)f(on)g(the)g(t)m(w)m(o)i(revisions;)f (an)f(unmo)s(di\014ed)d(cop)m(y)j(of)h(y)m(our)f(\014le)f(is)480 -4251 y(also)39 b(in)f(y)m(our)h(w)m(orking)f(directory)-8 +740 y(also)39 b(in)f(y)m(our)h(w)m(orking)f(directory)-8 b(,)42 b(with)37 b(the)j(name)f(`)p Fn(.#)p Fo(\014le)p Fn(.)p Fo(revision)p Fs(')d(where)i Fo(revision)g Fs(is)g(the)480 -4376 y Fr(r)n(cs)31 b Fs(revision)g(that)i(y)m(our)f(mo)s(di\014ed)e +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 4500 y(Section)g(6.3)h([Con\015icts)f(example],) -g(page)h(37)g(\(Note)h(that)f(some)f(systems)g(automatically)h(purge) -480 4625 y(\014les)h(that)h(b)s(egin)e(with)h(`)p Fn(.#)p +(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 +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 4749 +(few)g(da)m(ys.)48 b(If)32 b(y)m(ou)h(in)m(tend)480 1238 y(to)i(k)m(eep)f(a)h(cop)m(y)g(of)f(y)m(our)g(original)e(\014le,)i(it)g (is)f(a)h(v)m(ery)h(go)s(o)s(d)e(idea)h(to)h(rename)f(it.\))51 -b(Under)33 b Fr(vms)p Fs(,)480 4874 y(the)e(\014le)e(name)h(starts)h +b(Under)33 b Fr(vms)p Fs(,)480 1363 y(the)e(\014le)e(name)h(starts)h (with)e(`)p Fn(__)p Fs(')i(rather)f(than)g(`)p Fn(.#)p -Fs('.)0 5068 y Fn(?)g Fo(\014le)285 b(\014le)43 b Fs(is)38 +Fs('.)0 1537 y Fn(?)g Fo(\014le)285 b(\014le)43 b Fs(is)38 b(in)f(y)m(our)i(w)m(orking)f(directory)-8 b(,)40 b(but)e(do)s(es)h (not)g(corresp)s(ond)e(to)i(an)m(ything)g(in)e(the)i(source)480 -5193 y(rep)s(ository)-8 b(,)37 b(and)f(is)g(not)g(in)f(the)i(list)e(of) +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 5317 y(`)p Fn(-I)p Fs(')30 b(option,)g(and)g(see)h -(Section)f(C.9)h([cvsignore],)g(page)g(148\).)p eop -%%Page: 125 127 -125 126 bop 0 -116 a Fs(App)s(endix)28 b(A:)i(Guide)g(to)h(CVS)e -(commands)2210 b(125)0 366 y Fk(A.18.3)62 b(up)s(date)31 -b(examples)125 640 y Fs(The)22 b(follo)m(wing)f(line)g(will)f(displa)m -(y)h(all)h(\014les)f(whic)m(h)h(are)h(not)g(up-to-date)h(without)d -(actually)i(c)m(hange)h(an)m(ything)0 765 y(in)29 b(y)m(our)h(w)m -(orking)g(directory)-8 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 1018 y Fn($)47 b(cvs)g(-n)h(-q)f(update)p -eop -%%Page: 126 128 -126 127 bop 0 -116 a Fs(126)2366 b(CVS|Concurren)m(t)29 -b(V)-8 b(ersions)30 b(System)p eop +(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 +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) +0 2600 y(in)29 b(y)m(our)h(w)m(orking)g(directory)-8 +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 @@ -8137,22 +8149,22 @@ 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(91\))h +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 Fo(options)t Fn(])g([)p Fo(\014les)t Fh(:)15 b(:)g(:)p Fn(])480 1419 y Fs(Add)29 b(a)i(new)f(\014le/directory)-8 -b(.)40 b(See)31 b(Chapter)f(10)h([Adding)e(\014les],)h(page)h(59.)480 +b(.)40 b(See)31 b(Chapter)f(9)h([Adding)e(\014les],)g(page)i(61.)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(95.)480 +b(.)40 b(See)31 b(Section)f(A.5)h([admin],)f(page)h(97.)480 2249 y Fn(-b[)p Fo(rev)8 b Fn(])156 b Fs(Set)31 b(default)e(branc)m(h.) 480 2425 y Fn(-c)p Fo(string)155 b Fs(Set)31 b(commen)m(t)g(leader.)480 2602 y Fn(-k)p Fo(subst)175 b Fs(Set)25 b(k)m(eyw)m(ord)g -(substitution.)36 b(See)25 b(Chapter)f(17)h([Keyw)m(ord)g -(substitution],)f(page)h(77.)480 2778 y Fn(-l[)p Fo(rev)8 +(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 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 @@ -8170,464 +8182,464 @@ b Fs(Unlo)s(c)m(k)30 b(revision)f Fo(rev)p Fs(,)h(or)h(latest)g (revision.)0 4614 y Fn(annotate)d([)p Fo(options)t Fn(])h([)p Fo(\014les)t Fh(:)15 b(:)g(:)p Fn(])480 4738 y Fs(Sho)m(w)30 b(last)g(revision)e(where)h(eac)m(h)j(line)c(w)m(as)i(mo)s(di\014ed.)39 -b(See)30 b(Section)g(16.4)i([annotate],)g(page)f(76.)480 +b(See)30 b(Section)g(15.4)i([annotate],)g(page)f(78.)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(92.)480 +b(Section)f(A.4)960 5039 y([Common)30 b(options],)g(page)h(94.)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(92.)p eop +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 b(V)-8 b(ersions)30 b(System)480 366 y Fn(-l)384 b Fs(Lo)s(cal;)45 b(run)39 b(only)h(in)f(curren)m(t)h(w)m(orking)f(directory)-8 -b(.)71 b(See)40 b(Chapter)g(9)h([Recursiv)m(e)960 491 -y(b)s(eha)m(vior],)30 b(page)h(57.)480 670 y Fn(-r)f +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 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(92.)0 +b(See)31 b(Section)f(A.4)h([Common)f(options],)g(page)i(94.)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 -(99.)480 1154 y Fn(-A)384 b Fs(Reset)38 b(an)m(y)f(stic)m(ky)h -(tags/date/k)m(opts.)64 b(See)37 b(Section)g(7.4)i([Stic)m(ky)e(tags],) -j(page)e(51)960 1278 y(and)30 b(Chapter)g(17)h([Keyw)m(ord)f -(substitution],)f(page)i(77.)480 1458 y Fn(-c)384 b Fs(Output)56 +(101.)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 b(the)h(mo)s(dule)f(database.)122 b(See)57 b(Section)g(A.6.1)h([c)m -(hec)m(k)m(out)i(options],)960 1582 y(page)31 b(100.)480 +(hec)m(k)m(out)i(options],)960 1582 y(page)31 b(102.)480 1762 y Fn(-D)f Fo(date)183 b Fs(Chec)m(k)35 b(out)g(revisions)e(as)j (of)f Fo(date)40 b Fs(\(is)35 b(stic)m(ky\).)54 b(See)36 b(Section)e(A.4)i([Common)f(op-)960 1886 y(tions],)30 -b(page)h(92.)480 2066 y Fn(-d)f Fo(dir)241 b Fs(Chec)m(k)31 +b(page)h(94.)480 2066 y Fn(-d)f Fo(dir)241 b Fs(Chec)m(k)31 b(out)f(in)m(to)h Fo(dir)p Fs(.)39 b(See)30 b(Section)h(A.6.1)g([c)m -(hec)m(k)m(out)i(options],)e(page)g(100.)480 2245 y Fn(-f)384 +(hec)m(k)m(out)i(options],)e(page)g(102.)480 2245 y Fn(-f)384 b Fs(Use)21 b(head)g(revision)e(if)g(tag/date)k(not)e(found.)37 b(See)21 b(Section)f(A.4)i([Common)e(options],)960 2370 -y(page)31 b(92.)480 2549 y Fn(-j)f Fo(rev)230 b Fs(Merge)32 +y(page)31 b(94.)480 2549 y Fn(-j)f Fo(rev)230 b Fs(Merge)32 b(in)d(c)m(hanges.)41 b(See)31 b(Section)f(A.6.1)i([c)m(hec)m(k)m(out)h -(options],)d(page)h(100.)480 2729 y Fn(-k)f Fo(k\015ag)165 +(options],)d(page)h(102.)480 2729 y Fn(-k)f Fo(k\015ag)165 b Fs(Use)51 b Fo(k\015ag)59 b Fs(k)m(eyw)m(ord)51 b(expansion.)100 -b(See)51 b(Section)g(17.4)h([Substitution)c(mo)s(des],)960 -2853 y(page)31 b(79.)480 3033 y Fn(-l)384 b Fs(Lo)s(cal;)45 +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 b(run)39 b(only)h(in)f(curren)m(t)h(w)m(orking)f(directory)-8 -b(.)71 b(See)40 b(Chapter)g(9)h([Recursiv)m(e)960 3157 -y(b)s(eha)m(vior],)30 b(page)h(57.)480 3337 y Fn(-N)384 +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 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(100.)480 3641 y Fn(-n)384 +3461 y(options],)30 b(page)h(102.)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(100.)480 3945 y Fn(-P)384 b Fs(Prune)29 -b(empt)m(y)i(directories.)40 b(See)30 b(Chapter)g(15)h([Mo)m(ving)g -(directories],)f(page)h(73.)480 4124 y Fn(-p)384 b Fs(Chec)m(k)36 +3765 y(page)i(102.)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 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(100.)480 4428 y Fn(-r)f Fo(tag)229 +e(options],)d(page)h(102.)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(92.)480 4732 y Fn(-s)384 b Fs(Lik)m(e)35 +4553 y(page)31 b(94.)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(100.)0 5036 y Fn(commit)e([)p Fo(options)t +4857 y(page)31 b(102.)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(101.)480 +b(.)40 b(See)31 b(Section)f(A.7)h([commit],)g(page)g(103.)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(102.)p eop +(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 Fs(F)-8 b(orce)30 b(the)e(\014le)f(to)i(b)s(e)e(committed;)j(disables)c (recursion.)38 b(See)28 b(Section)g(A.7.1)i([com-)960 -491 y(mit)g(options],)g(page)h(102.)480 674 y Fn(-l)384 +491 y(mit)g(options],)g(page)h(104.)480 674 y Fn(-l)384 b Fs(Lo)s(cal;)45 b(run)39 b(only)h(in)f(curren)m(t)h(w)m(orking)f -(directory)-8 b(.)71 b(See)40 b(Chapter)g(9)h([Recursiv)m(e)960 -798 y(b)s(eha)m(vior],)30 b(page)h(57.)480 981 y Fn(-m)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 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(102.)480 +b(See)30 b(Section)h(A.7.1)h([commit)e(options],)g(page)h(104.)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(102.)480 1471 y Fn(-R)384 b Fs(Op)s(erate)24 -b(recursiv)m(ely)e(\(default\).)39 b(See)24 b(Chapter)f(9)h([Recursiv)m -(e)g(b)s(eha)m(vior],)g(page)h(57.)480 1653 y Fn(-r)30 +1288 y(page)g(104.)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 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(102.)0 +b(Section)f(A.7.1)i([commit)f(options],)f(page)h(104.)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(105.)64 b(In)37 b(addition)f(to)480 +b(],)39 b(page)g(106.)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(105.)480 2700 y Fn(-D)f Fo(date2)138 b +2517 y(page)i(107.)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(105.)480 2882 y Fn(-l)384 b Fs(Lo)s(cal;)45 b(run)39 +(page)g(107.)480 2882 y Fn(-l)384 b Fs(Lo)s(cal;)45 b(run)39 b(only)h(in)f(curren)m(t)h(w)m(orking)f(directory)-8 -b(.)71 b(See)40 b(Chapter)g(9)h([Recursiv)m(e)960 3007 -y(b)s(eha)m(vior],)30 b(page)h(57.)480 3190 y Fn(-N)384 +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 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(105.)480 3497 y Fn(-r)f Fo(rev1)185 b Fs(Di\013)30 +3314 y(page)g(107.)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(105.)480 3804 y Fn(-r)f Fo(rev2)185 b Fs(Di\013)30 +3621 y(page)i(107.)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(105.)0 3987 y Fn(edit)d([)p Fo(options)t +d(options],)h(page)i(107.)0 3987 y Fn(edit)d([)p Fo(options)t Fn(])g([)p Fo(\014les)t Fh(:)15 b(:)g(:)p Fn(])480 4111 y Fs(Get)31 b(ready)g(to)g(edit)f(a)g(w)m(atc)m(hed)i(\014le.)40 -b(See)30 b(Section)g(6.6.3)j([Editing)28 b(\014les],)i(page)h(44.)480 +b(See)30 b(Section)g(5.6.3)j([Editing)28 b(\014les],)i(page)h(42.)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(6.6.3)j([Editing)28 b(\014les],)i(page)h -(44.)480 4601 y Fn(-l)384 b Fs(Lo)s(cal;)45 b(run)39 +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 b(only)h(in)f(curren)m(t)h(w)m(orking)f(directory)-8 -b(.)71 b(See)40 b(Chapter)g(9)h([Recursiv)m(e)960 4726 -y(b)s(eha)m(vior],)30 b(page)h(57.)0 4908 y Fn(editors)d([)p +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 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(6.6.4)i([W)-8 b(atc)m(h)33 -b(information],)c(page)i(45.)480 5215 y Fn(-l)384 b Fs(Lo)s(cal;)45 +(\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(run)39 b(only)h(in)f(curren)m(t)h(w)m(orking)f(directory)-8 -b(.)71 b(See)40 b(Chapter)g(9)h([Recursiv)m(e)960 5340 -y(b)s(eha)m(vior],)30 b(page)h(57.)p eop +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 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(107.)480 670 y Fn(-D)f Fo(date)183 +([exp)s(ort],)g(page)g(108.)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(92.)480 +Fs(.)39 b(See)23 b(Section)g(A.4)h([Common)f(options],)i(page)f(94.)480 850 y Fn(-d)30 b Fo(dir)241 b Fs(Chec)m(k)31 b(out)f(in)m(to)h Fo(dir)p Fs(.)39 b(See)30 b(Section)h(A.9.1)g([exp)s(ort)g(options],)f -(page)h(107.)480 1029 y Fn(-f)384 b Fs(Use)21 b(head)g(revision)e(if)g +(page)h(109.)480 1029 y Fn(-f)384 b Fs(Use)21 b(head)g(revision)e(if)g (tag/date)k(not)e(found.)37 b(See)21 b(Section)f(A.4)i([Common)e -(options],)960 1154 y(page)31 b(92.)480 1333 y Fn(-k)f +(options],)960 1154 y(page)31 b(94.)480 1333 y Fn(-k)f Fo(k\015ag)165 b Fs(Use)51 b Fo(k\015ag)59 b Fs(k)m(eyw)m(ord)51 -b(expansion.)100 b(See)51 b(Section)g(17.4)h([Substitution)c(mo)s -(des],)960 1458 y(page)31 b(79.)480 1637 y Fn(-l)384 +b(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 b Fs(Lo)s(cal;)45 b(run)39 b(only)h(in)f(curren)m(t)h(w)m(orking)f -(directory)-8 b(.)71 b(See)40 b(Chapter)g(9)h([Recursiv)m(e)960 -1762 y(b)s(eha)m(vior],)30 b(page)h(57.)480 1941 y Fn(-N)384 +(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 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(107.)480 2245 y Fn(-n)384 b Fs(Do)35 +2066 y(tions],)d(page)h(109.)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(107.)480 2549 y Fn(-P)384 b Fs(Prune)29 -b(empt)m(y)i(directories.)40 b(See)30 b(Chapter)g(15)h([Mo)m(ving)g -(directories],)f(page)h(73.)480 2729 y Fn(-r)f Fo(tag)229 +2370 y(page)d(109.)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 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(92.)0 3033 y Fn(history)d([)p Fo(options)t +2853 y(page)31 b(94.)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(108.)480 +b(.)40 b(See)31 b(Section)f(A.10)h([history],)f(page)i(110.)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 -(108.)480 3516 y Fn(-b)f Fo(str)247 b Fs(Bac)m(k)46 b(to)e(record)g +(110.)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 -(108.)480 3820 y Fn(-c)384 b Fs(Rep)s(ort)25 b(on)g(committed)g(\(mo)s +(110.)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(108.)480 4124 y Fn(-D)f +(options],)960 3945 y(page)31 b(110.)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(108.)480 +b(Section)h(A.10.1)h([history)d(options],)i(page)g(110.)480 4304 y Fn(-e)384 b Fs(Rep)s(ort)29 b(on)g(all)f(record)h(t)m(yp)s(es.) -40 b(See)29 b(Section)g(A.10.1)i([history)d(options],)i(page)f(108.)480 +40 b(See)29 b(Section)g(A.10.1)i([history)d(options],)i(page)f(110.)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(108.)480 4787 y Fn(-m)f Fo(mo)s(dule)960 +4608 y(options],)g(page)h(110.)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(108.)480 5215 y Fn(-n)f Fo(mo)s(dule)960 +5036 y(page)31 b(110.)480 5215 y Fn(-n)f Fo(mo)s(dule)960 5340 y Fs(In)g Fo(mo)s(dule)p Fs(.)39 b(See)30 b(Section)g(A.10.1)j -([history)c(options],)i(page)g(108.)p eop +([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 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(108.)480 668 y Fn(-r)f Fo(rev)230 b Fs(Since)29 +491 y(page)31 b(110.)480 668 y Fn(-r)f Fo(rev)230 b Fs(Since)29 b(revision)g Fo(rev)p Fs(.)41 b(See)30 b(Section)g(A.10.1)j([history)c -(options],)i(page)g(108.)480 844 y Fn(-T)384 b Fs(Pro)s(duce)21 +(options],)i(page)g(110.)480 844 y Fn(-T)384 b Fs(Pro)s(duce)21 b(rep)s(ort)h(on)g(all)f(T)-8 b(A)m(Gs.)39 b(See)23 b(Section)f(A.10.1) -i([history)e(options],)h(page)g(108.)480 1021 y Fn(-t)30 +i([history)e(options],)h(page)g(110.)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(108.)480 1322 +1145 y([history)30 b(options],)g(page)h(110.)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(108.)480 1498 y Fn(-w)384 b Fs(W)-8 +(options],)g(page)g(110.)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(108.)480 1799 y Fn(-x)f Fo(t)m(yp)s(es)144 b Fs(Rep)s(ort)28 +b(110.)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(108.)480 2101 y Fn(-z)f Fo(zone)178 +1924 y(options],)g(page)h(110.)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(108.)0 +b(See)29 b(Section)f(A.10.1)j([history)c(options],)i(page)g(110.)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 -(110.)480 2578 y Fn(-b)f Fo(bra)222 b Fs(Imp)s(ort)56 +(112.)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(111.)480 2879 y Fn(-d)384 b Fs(Use)32 b(the)g(\014le's)g +y(page)31 b(113.)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 -(111.)480 3180 y Fn(-k)f Fo(k\015ag)165 b Fs(Set)36 b(default)f(R)m(CS) +(113.)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(111.)480 3481 y Fn(-m)f Fo(msg)197 b Fs(Use)31 +b(page)h(113.)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(111.)480 +b(Section)f(A.11.1)j([imp)s(ort)c(options],)h(page)h(113.)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(111.)480 3959 y Fn(-W)f +(options],)960 3783 y(page)31 b(113.)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(111.)0 +b(Section)h(A.11.1)h([imp)s(ort)d(options],)h(page)h(113.)0 4136 y Fn(init)288 b Fs(Create)39 b(a)f(CVS)f(rep)s(ository)g(if)g(it)h -(do)s(esn't)f(exist.)63 b(See)39 b(Section)e(4.5)i([Creating)f(a)g(rep) -s(ository],)480 4260 y(page)31 b(20.)0 4437 y Fn(log)e([)p +(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 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(113.)480 +(\014les.)40 b(See)30 b(Section)h(A.12)g([log],)g(page)h(114.)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(113.)480 5039 y Fn(-d)f Fo(dates)147 b +4862 y(page)h(114.)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 -(113.)480 5340 y Fn(-h)384 b Fs(Only)29 b(prin)m(t)g(header.)40 -b(See)31 b(Section)f(A.12.1)i([log)f(options],)f(page)h(113.)p +(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 eop %%Page: 132 134 132 133 bop 0 -116 a Fs(132)2366 b(CVS|Concurren)m(t)29 b(V)-8 b(ersions)30 b(System)480 366 y Fn(-l)384 b Fs(Lo)s(cal;)45 b(run)39 b(only)h(in)f(curren)m(t)h(w)m(orking)f(directory)-8 -b(.)71 b(See)40 b(Chapter)g(9)h([Recursiv)m(e)960 491 -y(b)s(eha)m(vior],)30 b(page)h(57.)480 668 y Fn(-N)384 +b(.)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 b Fs(Do)31 b(not)g(list)e(tags.)42 b(See)30 b(Section)g(A.12.1)j([log)d -(options],)h(page)g(113.)480 844 y Fn(-R)384 b Fs(Only)29 +(options],)h(page)g(114.)480 844 y Fn(-R)384 b Fs(Only)29 b(prin)m(t)g(name)h(of)h(R)m(CS)f(\014le.)39 b(See)31 -b(Section)f(A.12.1)j([log)d(options],)g(page)i(113.)480 +b(Section)f(A.12.1)j([log)d(options],)g(page)i(114.)480 1021 y Fn(-r)e Fo(revs)194 b Fs(Only)29 b(list)g(revisions)f Fo(revs)p Fs(.)41 b(See)30 b(Section)h(A.12.1)h([log)f(options],)f -(page)h(113.)480 1197 y Fn(-s)f Fo(states)127 b Fs(Only)33 +(page)h(114.)480 1197 y Fn(-s)f Fo(states)127 b Fs(Only)33 b(list)g(revisions)f(with)h(sp)s(eci\014ed)g(states.)53 b(See)35 b(Section)f(A.12.1)i([log)f(options],)960 1322 -y(page)c(113.)480 1498 y Fn(-t)384 b Fs(Only)34 b(prin)m(t)g(header)i +y(page)c(114.)480 1498 y Fn(-t)384 b Fs(Only)34 b(prin)m(t)g(header)i (and)f(descriptiv)m(e)g(text.)58 b(See)36 b(Section)f(A.12.1)j([log)e -(options],)960 1623 y(page)31 b(113.)480 1799 y Fn(-w)f +(options],)960 1623 y(page)31 b(114.)480 1799 y Fn(-w)f Fo(logins)125 b Fs(Only)33 b(list)h(revisions)f(c)m(hec)m(k)m(ed)k(in)c (b)m(y)i(sp)s(eci\014ed)e(logins.)53 b(See)35 b(Section)g(A.12.1)i -([log)960 1924 y(options],)30 b(page)h(113.)0 2101 y +([log)960 1924 y(options],)30 b(page)h(114.)0 2101 y Fn(login)240 b Fs(Prompt)31 b(for)g(passw)m(ord)g(for)h(authen)m -(ticating)f(serv)m(er.)45 b(See)32 b(Section)f(4.6.3.2)j([P)m(assw)m -(ord)e(authen-)480 2225 y(tication)e(clien)m(t],)h(page)g(25.)0 +(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 2402 y Fn(logout)192 b Fs(Remo)m(v)m(e)36 b(stored)f(passw)m(ord)f(for) -g(authen)m(ticating)h(serv)m(er.)53 b(See)35 b(Section)f(4.6.3.2)j([P)m +g(authen)m(ticating)h(serv)m(er.)53 b(See)35 b(Section)f(3.6.3.2)j([P)m (assw)m(ord)e(au-)480 2526 y(then)m(tication)c(clien)m(t],)f(page)h -(25.)0 2703 y Fn(rdiff)e([)p Fo(options)t Fn(])g Fo(mo)s(dules)t +(23.)0 2703 y Fn(rdiff)e([)p Fo(options)t Fn(])g Fo(mo)s(dules)t Fh(:)15 b(:)g(:)480 2827 y Fs(Sho)m(w)30 b(di\013erences)g(b)s(et)m(w)m (een)h(releases.)40 b(See)31 b(Section)f(A.13)i([rdi\013)7 -b(],)29 b(page)j(115.)480 3004 y Fn(-c)384 b Fs(Con)m(text)41 +b(],)29 b(page)j(116.)480 3004 y Fn(-c)384 b Fs(Con)m(text)41 b(di\013)d(output)i(format)g(\(default\).)69 b(See)40 b(Section)f(A.13.1)j([rdi\013)c(options],)960 3128 y(page)31 -b(115.)480 3305 y Fn(-D)f Fo(date)183 b Fs(Select)23 +b(117.)480 3305 y Fn(-D)f Fo(date)183 b Fs(Select)23 b(revisions)f(based)h(on)g Fo(date)p Fs(.)39 b(See)23 -b(Section)g(A.4)h([Common)f(options],)i(page)f(92.)480 +b(Section)g(A.4)h([Common)f(options],)i(page)f(94.)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(92.)480 3783 y Fn(-l)384 b Fs(Lo)s(cal;)45 +3606 y(page)31 b(94.)480 3783 y Fn(-l)384 b Fs(Lo)s(cal;)45 b(run)39 b(only)h(in)f(curren)m(t)h(w)m(orking)f(directory)-8 -b(.)71 b(See)40 b(Chapter)g(9)h([Recursiv)m(e)960 3907 -y(b)s(eha)m(vior],)30 b(page)h(57.)480 4084 y Fn(-r)f +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 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(92.)480 4260 y Fn(-s)384 b Fs(Short)25 b(patc)m(h)h(-)f(one)h(liner)d +h(94.)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(115.)480 4437 y Fn(-t)384 b Fs(T)-8 +(options],)i(page)g(117.)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(105.)480 4738 y Fn(-u)384 b Fs(Unidi\013)28 +4561 y(page)31 b(107.)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(115.)480 4914 y Fn(-V)f Fo(v)m(ers)197 +(options],)h(page)h(117.)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(115.)0 5215 +([rdi\013)960 5039 y(options],)30 b(page)h(117.)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(116.)p +(use.)41 b(See)30 b(Section)h(A.14)g([release],)h(page)f(118.)p eop %%Page: 133 135 133 134 bop 0 -116 a Fs(App)s(endix)28 b(B:)j(Quic)m(k)e(reference)i (to)g(CVS)f(commands)1837 b(133)480 366 y Fn(-d)384 b Fs(Delete)32 b(the)e(giv)m(en)h(directory)-8 b(.)40 b(See)31 -b(Section)f(A.14.1)i([release)f(options],)f(page)i(117.)0 +b(Section)f(A.14.1)i([release)f(options],)f(page)i(118.)0 544 y Fn(remove)d([)p Fo(options)t Fn(])g([)p Fo(\014les)t Fh(:)15 b(:)g(:)o Fn(])480 669 y Fs(Remo)m(v)m(e)32 b(an)e(en)m(try)h -(from)f(the)h(rep)s(ository)-8 b(.)40 b(See)30 b(Chapter)g(11)h([Remo)m -(ving)g(\014les],)f(page)h(61.)480 846 y Fn(-f)384 b +(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 Fs(Delete)24 b(the)f(\014le)e(b)s(efore)h(remo)m(ving)h(it.)38 -b(See)22 b(Chapter)g(11)i([Remo)m(ving)f(\014les],)g(page)h(61.)480 +b(See)22 b(Chapter)g(10)i([Remo)m(ving)f(\014les],)g(page)h(63.)480 1024 y Fn(-l)384 b Fs(Lo)s(cal;)45 b(run)39 b(only)h(in)f(curren)m(t)h -(w)m(orking)f(directory)-8 b(.)71 b(See)40 b(Chapter)g(9)h([Recursiv)m -(e)960 1148 y(b)s(eha)m(vior],)30 b(page)h(57.)480 1326 +(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 y Fn(-R)384 b Fs(Op)s(erate)24 b(recursiv)m(ely)e(\(default\).)39 -b(See)24 b(Chapter)f(9)h([Recursiv)m(e)g(b)s(eha)m(vior],)g(page)h(57.) +b(See)24 b(Chapter)f(8)h([Recursiv)m(e)g(b)s(eha)m(vior],)g(page)h(59.) 0 1503 y Fn(rtag)k([)p Fo(options)t Fn(])g Fo(tag)39 b(mo)s(dules)t Fh(:)15 b(:)g(:)480 1628 y Fs(Add)29 b(a)i(sym)m(b)s (olic)e(tag)j(to)f(a)f(mo)s(dule.)40 b(See)30 b(Section)g(A.15)i -([rtag],)g(page)f(118.)480 1805 y Fn(-a)384 b Fs(Clear)43 +([rtag],)g(page)f(120.)480 1805 y Fn(-a)384 b Fs(Clear)43 b(tag)h(from)f(remo)m(v)m(ed)i(\014les)d(that)i(w)m(ould)f(not)g (otherwise)g(b)s(e)g(tagged.)82 b(See)960 1930 y(Section)30 -b(A.15.1)j([rtag)e(options],)f(page)h(119.)480 2107 y +b(A.15.1)j([rtag)e(options],)f(page)h(120.)480 2107 y Fn(-b)384 b Fs(Create)31 b(a)g(branc)m(h)f(named)g Fo(tag)p -Fs(.)42 b(See)30 b(Section)g(A.15.1)j([rtag)e(options],)f(page)h(119.) +Fs(.)42 b(See)30 b(Section)g(A.15.1)j([rtag)e(options],)f(page)h(120.) 480 2285 y Fn(-D)f Fo(date)183 b Fs(T)-8 b(ag)31 b(revisions)e(as)h(of) h Fo(date)p Fs(.)41 b(See)31 b(Section)f(A.15.1)i([rtag)g(options],)e -(page)h(119.)480 2462 y Fn(-d)384 b Fs(Delete)32 b(the)e(giv)m(en)h -(tag.)41 b(See)31 b(Section)f(A.15.1)j([rtag)e(options],)f(page)h(119.) +(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.) 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 -(119.)480 2817 y Fn(-f)384 b Fs(F)-8 b(orce)26 b(a)e(head)g(revision)f +(120.)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(119.)480 +b(Section)f(A.15.1)i([rtag)960 2942 y(options],)k(page)h(120.)480 3120 y Fn(-l)384 b Fs(Lo)s(cal;)45 b(run)39 b(only)h(in)f(curren)m(t)h -(w)m(orking)f(directory)-8 b(.)71 b(See)40 b(Chapter)g(9)h([Recursiv)m -(e)960 3244 y(b)s(eha)m(vior],)30 b(page)h(57.)480 3422 +(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 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(119.)480 +b(See)31 b(Section)f(A.15.1)i([rtag)g(options],)e(page)h(120.)480 3599 y Fn(-R)384 b Fs(Op)s(erate)24 b(recursiv)m(ely)e(\(default\).)39 -b(See)24 b(Chapter)f(9)h([Recursiv)m(e)g(b)s(eha)m(vior],)g(page)h(57.) +b(See)24 b(Chapter)f(8)h([Recursiv)m(e)g(b)s(eha)m(vior],)g(page)h(59.) 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(119.)0 3954 y Fn(status)e([)p Fo(options)t Fn(])g +(page)h(120.)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(119.)480 +b(.)40 b(See)28 b(Section)h(A.16)g([status],)h(page)f(121.)480 4256 y Fn(-l)384 b Fs(Lo)s(cal;)45 b(run)39 b(only)h(in)f(curren)m(t)h -(w)m(orking)f(directory)-8 b(.)71 b(See)40 b(Chapter)g(9)h([Recursiv)m -(e)960 4381 y(b)s(eha)m(vior],)30 b(page)h(57.)480 4558 +(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 y Fn(-R)384 b Fs(Op)s(erate)24 b(recursiv)m(ely)e(\(default\).)39 -b(See)24 b(Chapter)f(9)h([Recursiv)m(e)g(b)s(eha)m(vior],)g(page)h(57.) +b(See)24 b(Chapter)f(8)h([Recursiv)m(e)g(b)s(eha)m(vior],)g(page)h(59.) 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(120.)0 5038 y Fn(tag)e([)p Fo(options)t +4860 y(page)31 b(121.)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(120.)480 5340 y Fn(-b)384 +b(Section)g(A.17)i([tag],)g(page)g(122.)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(121.)p +b(See)30 b(Section)g(A.17.1)j([tag)f(options],)e(page)h(122.)p eop %%Page: 134 136 134 135 bop 0 -116 a Fs(134)2366 b(CVS|Concurren)m(t)29 b(V)-8 b(ersions)30 b(System)480 366 y Fn(-D)g Fo(date)183 b Fs(T)-8 b(ag)31 b(revisions)e(as)h(of)h Fo(date)p Fs(.)41 -b(See)31 b(Section)f(A.17.1)i([tag)g(options],)e(page)i(121.)480 +b(See)31 b(Section)f(A.17.1)i([tag)g(options],)e(page)i(122.)480 540 y Fn(-d)384 b Fs(Delete)32 b(the)e(giv)m(en)h(tag.)41 -b(See)31 b(Section)f(A.17.1)j([tag)e(options],)g(page)g(121.)480 +b(See)31 b(Section)f(A.17.1)j([tag)e(options],)g(page)g(122.)480 714 y Fn(-F)384 b Fs(Mo)m(v)m(e)32 b(tag)g(if)d(it)h(already)g(exists.) -41 b(See)30 b(Section)g(A.17.1)j([tag)f(options],)e(page)h(121.)480 +41 b(See)30 b(Section)g(A.17.1)j([tag)f(options],)e(page)h(122.)480 888 y Fn(-f)384 b Fs(F)-8 b(orce)29 b(a)f(head)f(revision)e(matc)m(h)k (if)d(tag/date)k(not)d(found.)38 b(See)28 b(Section)f(A.17.1)i([tag)960 -1013 y(options],)h(page)h(121.)480 1187 y Fn(-l)384 b +1013 y(options],)h(page)h(122.)480 1187 y Fn(-l)384 b Fs(Lo)s(cal;)45 b(run)39 b(only)h(in)f(curren)m(t)h(w)m(orking)f -(directory)-8 b(.)71 b(See)40 b(Chapter)g(9)h([Recursiv)m(e)960 -1311 y(b)s(eha)m(vior],)30 b(page)h(57.)480 1485 y Fn(-n)384 +(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 b Fs(No)31 b(execution)g(of)f(tag)i(program.)40 b(See)31 -b(Section)f(A.17.1)i([tag)g(options],)e(page)h(121.)480 +b(Section)f(A.17.1)i([tag)g(options],)e(page)h(122.)480 1659 y Fn(-R)384 b Fs(Op)s(erate)24 b(recursiv)m(ely)e(\(default\).)39 -b(See)24 b(Chapter)f(9)h([Recursiv)m(e)g(b)s(eha)m(vior],)g(page)h(57.) +b(See)24 b(Chapter)f(8)h([Recursiv)m(e)g(b)s(eha)m(vior],)g(page)h(59.) 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(121.)0 2007 y Fn(unedit)e([)p Fo(options)t Fn(])g([)p +h(122.)0 2007 y Fn(unedit)e([)p Fo(options)t Fn(])g([)p Fo(\014les)t Fh(:)15 b(:)g(:)o Fn(])480 2132 y Fs(Undo)30 -b(an)g(edit)g(command.)41 b(See)30 b(Section)g(6.6.3)i([Editing)d -(\014les],)h(page)h(44.)480 2306 y Fn(-a)f Fo(actions)76 +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 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(6.6.3)j([Editing)28 -b(\014les],)i(page)h(44.)480 2604 y Fn(-l)384 b Fs(Lo)s(cal;)45 +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(run)39 b(only)h(in)f(curren)m(t)h(w)m(orking)f(directory)-8 -b(.)71 b(See)40 b(Chapter)g(9)h([Recursiv)m(e)960 2729 -y(b)s(eha)m(vior],)30 b(page)h(57.)0 2903 y Fn(update)e([)p +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 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 -(122.)480 3201 y Fn(-A)384 b Fs(Reset)38 b(an)m(y)f(stic)m(ky)h -(tags/date/k)m(opts.)64 b(See)37 b(Section)g(7.4)i([Stic)m(ky)e(tags],) -j(page)e(51)960 3326 y(and)30 b(Chapter)g(17)h([Keyw)m(ord)f -(substitution],)f(page)i(77.)480 3500 y Fn(-D)f Fo(date)183 +(123.)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 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(92.)480 3798 y Fn(-d)384 +(op-)960 3624 y(tions],)30 b(page)h(94.)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(122.)480 3972 y Fn(-f)384 +(date)e(options],)g(page)h(123.)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(92.)480 4271 y Fn(-I)f Fo(ign)232 b Fs(More)45 +y(page)31 b(94.)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(111.)480 4569 y Fn(-j)f Fo(rev)230 b +4395 y(page)31 b(113.)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(122.)480 4743 y Fn(-k)e Fo(k\015ag)165 +(date)e(options],)g(page)i(123.)480 4743 y Fn(-k)e Fo(k\015ag)165 b Fs(Use)51 b Fo(k\015ag)59 b Fs(k)m(eyw)m(ord)51 b(expansion.)100 -b(See)51 b(Section)g(17.4)h([Substitution)c(mo)s(des],)960 -4868 y(page)31 b(79.)480 5042 y Fn(-l)384 b Fs(Lo)s(cal;)45 +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 b(run)39 b(only)h(in)f(curren)m(t)h(w)m(orking)f(directory)-8 -b(.)71 b(See)40 b(Chapter)g(9)h([Recursiv)m(e)960 5166 -y(b)s(eha)m(vior],)30 b(page)h(57.)480 5340 y Fn(-P)384 -b Fs(Prune)29 b(empt)m(y)i(directories.)40 b(See)30 b(Chapter)g(15)h -([Mo)m(ving)g(directories],)f(page)h(73.)p eop +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 +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 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(122.)480 665 y +491 y([up)s(date)e(options],)g(page)h(123.)480 665 y Fn(-R)384 b Fs(Op)s(erate)24 b(recursiv)m(ely)e(\(default\).)39 -b(See)24 b(Chapter)f(9)h([Recursiv)m(e)g(b)s(eha)m(vior],)g(page)h(57.) +b(See)24 b(Chapter)f(8)h([Recursiv)m(e)g(b)s(eha)m(vior],)g(page)h(59.) 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(92.)480 1139 y Fn(-W)f Fo(sp)s(ec)184 b Fs(More)31 +y(page)31 b(94.)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(111.)0 1313 y Fn(watch)e([on|off|add|remove])c([)p +h(page)h(113.)0 1313 y Fn(watch)e([on|off|add|remove])c([)p Fo(options)t Fn(])k([)p Fo(\014les)t Fh(:)15 b(:)g(:)o Fn(])480 1437 y Fs(on/o\013:)57 b(turn)37 b(on/o\013)i(read-only)e(c)m -(hec)m(k)m(outs)k(of)d(\014les.)63 b(See)38 b(Section)g(6.6.1)i -([Setting)e(a)g(w)m(atc)m(h],)480 1562 y(page)31 b(42.)480 +(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 1711 y(add/remo)m(v)m(e:)38 b(add)20 b(or)i(remo)m(v)m(e)g -(noti\014cation)f(on)g(actions.)38 b(See)22 b(Section)f(6.6.2)i -([Getting)f(Noti\014ed],)480 1836 y(page)31 b(42.)480 +(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 2010 y Fn(-a)f Fo(actions)76 b Fs(Sp)s(ecify)52 b(actions)h(for)h(temp) s(orary)f(w)m(atc)m(h,)60 b(where)53 b Fo(actions)58 b Fs(is)52 b Fn(edit)p Fs(,)58 b Fn(unedit)p Fs(,)960 2135 y Fn(commit)p Fs(,)29 b Fn(all)p Fs(,)h(or)g Fn(none)p -Fs(.)40 b(See)30 b(Section)g(6.6.3)j([Editing)28 b(\014les],)i(page)h -(44.)480 2309 y Fn(-l)384 b Fs(Lo)s(cal;)45 b(run)39 +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 b(only)h(in)f(curren)m(t)h(w)m(orking)f(directory)-8 -b(.)71 b(See)40 b(Chapter)g(9)h([Recursiv)m(e)960 2434 -y(b)s(eha)m(vior],)30 b(page)h(57.)0 2608 y Fn(watchers)d([)p +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 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(6.6.4)i([W)-8 b(atc)m(h)33 b(information],)c(page) -i(45.)480 2907 y Fn(-l)384 b Fs(Lo)s(cal;)45 b(run)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 b(only)h(in)f(curren)m(t)h(w)m(orking)f(directory)-8 -b(.)71 b(See)40 b(Chapter)g(9)h([Recursiv)m(e)960 3031 -y(b)s(eha)m(vior],)30 b(page)h(57.)p eop +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 b(V)-8 b(ersions)30 b(System)p eop @@ -8643,8 +8655,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(4.3)h([In)m(tro)0 1135 y(administrativ)m(e)h -(\014les],)h(page)h(19.)125 1413 y(The)38 b(most)h(imp)s(ortan)m(t)f +(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 (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 @@ -8801,8 +8813,8 @@ y(other,)37 b(and)d(require)g(the)h(user)f(using)g(mec)m(hanisms)g (hanges.)55 b(The)0 2193 y(`)p Fn(-m)p Fs(')31 b(wrapp)s(er)f(option)h (only)g(a\013ects)i(b)s(eha)m(vior)d(when)h(merging)g(is)f(done)i(on)f (up)s(date;)h(it)f(do)s(es)g(not)h(a\013ect)h(ho)m(w)0 -2317 y(\014les)c(are)i(stored.)41 b(See)31 b(See)f(Chapter)g(18)h -([Binary)f(\014les],)g(page)h(81,)g(for)f(more)h(on)f(binary)f +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 (\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 @@ -8861,7 +8873,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(102\).)125 +(A.7.1)0 1819 y([commit)g(options],)f(page)h(104\).)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 @@ -8970,7 +8982,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(4.6)g([Remote)h(rep)s(ositories],)d(page)i(21\).)0 +f(\(see)i(Section)g(3.6)g([Remote)h(rep)s(ositories],)d(page)i(19\).)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) @@ -9043,7 +9055,7 @@ Fs(The)g(`)p Fn(editinfo)p Fs(')e(feature)j(has)e(b)s(een)h(rendered)f 144 145 bop 0 -116 a Fs(144)2366 b(CVS|Concurren)m(t)29 b(V)-8 b(ersions)30 b(System)0 366 y(or)j(the)g(`)p Fn(-e)p Fs(')f(global)h(option)f(\(see)i(Section)e(A.3)i([Global)e(options],)h -(page)h(91\).)49 b(See)33 b(Section)g(C.5)g([v)m(erifymsg],)0 +(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 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) @@ -9186,8 +9198,8 @@ b(another)g(example,)h(`)p Fn(\045{})p Fs(')f(means)g(that)h(only)f 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(4.6)g -([Remote)h(rep)s(ositories],)d(page)i(21\).)p eop +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 @@ -9278,7 +9290,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(124\).)125 +(\(see)g(Section)f(A.18.2)i([up)s(date)e(output],)h(page)g(125\).)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 @@ -9347,11 +9359,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(108\).)50 b(This)31 b(\014le)i(m)m(ust)g(b)s(e)f +([history],)g(page)g(110\).)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(4.5)h -([Creating)0 4817 y(a)g(rep)s(ository],)f(page)h(20\).)125 +(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 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 @@ -9376,8 +9388,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(4.6.3)j([P)m -(assw)m(ord)e(authen)m(ticated],)h(page)g(23\))g(is)d(in)h(used;)h +(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 (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 @@ -9395,17 +9407,17 @@ Fn({)p Fs(')h(and)f(`)p Fn(})p Fs(')g(can)h(b)s(e)f(omitted.)40 b(The)30 b Fr(cvs)g Fs(in)m(ternal)f(v)-5 b(ariables)29 b(are:)0 2480 y Fn(CVSROOT)144 b Fs(This)35 b(is)h(the)h(v)-5 b(alue)36 b(of)h(the)f Fr(cvs)g Fs(ro)s(ot)h(in)f(use.)59 -b(See)37 b(Chapter)f(4)h([Rep)s(ository],)h(page)g(15,)h(for)e(a)480 +b(See)37 b(Chapter)f(3)h([Rep)s(ository],)h(page)g(13,)h(for)e(a)480 2605 y(description)28 b(of)j(the)g(v)-5 b(arious)29 b(w)m(a)m(ys)i(to)g (sp)s(ecify)e(this.)0 2773 y Fn(RCSBIN)192 b Fs(This)30 b(is)i(the)g(v)-5 b(alue)32 b Fr(cvs)f Fs(is)g(using)g(for)h(where)g (to)h(\014nd)e Fr(r)n(cs)g Fs(binaries.)44 b(See)32 b(Section)g(A.3)h -([Global)480 2897 y(options],)d(page)h(91,)h(for)e(a)h(description)d +([Global)480 2897 y(options],)d(page)h(93,)h(for)e(a)h(description)d (of)j(ho)m(w)f(to)h(sp)s(ecify)e(this.)0 3065 y Fn(CVSEDITOR)0 3190 y(VISUAL)0 3314 y(EDITOR)192 b Fs(These)37 b(all)f(expand)g(to)i (the)f(same)h(v)-5 b(alue,)38 b(whic)m(h)e(is)g(the)h(editor)g(that)h Fr(cvs)e Fs(is)g(using.)59 b(See)37 b(Sec-)480 3439 y(tion)30 -b(A.3)h([Global)f(options],)g(page)h(91,)h(for)e(ho)m(w)g(to)h(sp)s +b(A.3)h([Global)f(options],)g(page)h(93,)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 @@ -9420,7 +9432,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(89\).) +Fs(')g(\(see)h(Section)f(A.2)h([)p Fn(~)p Fs(/.cvsrc],)h(page)f(91\).) 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 @@ -9482,18 +9494,18 @@ Fr(cvs)p Fs(,)g(it)f(will)e(use)j Fn($PATH)e Fs(to)i(try)g(to)g(\014nd) b Fs(This)30 b(is)i(the)g(v)-5 b(alue)32 b Fr(cvs)f Fs(is)g(using)g (for)h(where)g(to)h(\014nd)e Fr(r)n(cs)g Fs(binaries.)44 b(See)32 b(Section)g(A.3)h([Global)480 4298 y(options],)40 -b(page)f(91,)i(for)d(a)h(description)d(of)i(ho)m(w)h(to)g(sp)s(ecify)d +b(page)f(93,)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(89)0 5215 y Fn($CVS_RSH)96 +([)p Fn(~)p Fs(/.cvsrc],)f(page)g(91)0 5215 y Fn($CVS_RSH)96 b Fs(Sp)s(eci\014es)31 b(the)i(external)g(program)g(whic)m(h)f(CVS)g (connects)i(with,)f(when)f Fn(:ext:)f Fs(access)j(metho)s(d)480 -5340 y(is)29 b(sp)s(eci\014ed.)39 b(see)31 b(Section)g(4.6.2)h -([Connecting)e(via)g(rsh],)g(page)h(22.)p eop +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 b(V)-8 b(ersions)30 b(System)0 366 y Fn($CVS_SERVER)480 @@ -9503,16 +9515,16 @@ b(It)32 b(sp)s(eci\014es)480 616 y(the)26 b(name)g(of)g(the)g(program)g (to)g(start)h(on)f(the)g(serv)m(er)g(side)f(when)g(accessing)h(a)g (remote)h(rep)s(ository)480 740 y(using)i Fr(rsh)p Fs(.)40 b(The)30 b(default)f(v)-5 b(alue)30 b(is)f Fn(cvs)p Fs(.)40 -b(see)31 b(Section)f(4.6.2)j([Connecting)d(via)g(rsh],)f(page)i(22)0 +b(see)31 b(Section)f(3.6.2)j([Connecting)d(via)g(rsh],)f(page)i(20)0 933 y Fn($CVS_PASSFILE)480 1057 y Fs(Used)42 b(in)e(clien)m(t-serv)m (er)i(mo)s(de)f(when)g(accessing)h(the)g Fn(cvs)30 b(login)f(server)p Fs(.)73 b(Default)42 b(v)-5 b(alue)41 b(is)480 1182 y(`)p -Fn($HOME/.cvspass)p Fs('.)c(see)31 b(Section)f(4.6.3.2)j([P)m(assw)m -(ord)e(authen)m(tication)g(clien)m(t],)f(page)h(25)0 +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 1375 y Fn($CVS_CLIENT_PORT)480 1499 y Fs(Used)k(in)e(clien)m(t-serv)m (er)j(mo)s(de)e(when)g(accessing)i(the)f(serv)m(er)g(via)f(Kerb)s -(eros.)54 b(see)35 b(Section)g(4.6.4)480 1624 y([Kerb)s(eros)30 -b(authen)m(ticated],)h(page)g(27)0 1817 y Fn($CVS_RCMD_PORT)480 +(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 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 @@ -9544,7 +9556,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(91,)480 +b(See)32 b(Section)g(A.3)h([Global)e(options],)i(page)g(93,)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 @@ -9588,10 +9600,10 @@ b(V)-8 b(ersions)30 b(System)p eop (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)43 -b(2.1)h([Revision)e(n)m(um)m(b)s(ers],)j(page)f(9.)80 -b(That)43 b(is)f(not)h(the)h(whole)e(truth,)k(ho)m(w)m(ev)m(er.)80 -b(F)-8 b(or)44 b(e\016ciency)0 1437 y(reasons)32 b Fr(cvs)f +(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 @@ -10105,121 +10117,121 @@ eop 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(53)0 1095 y(-k)25 b(\(R)n(CS)g(k\015ags\))15 b Fe(.)e(.)g(.)g(.)g +b Ff(55)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(79)0 1320 y Fm(.)0 1453 y Ff(.#)26 b(\014les)17 +b Ff(81)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(124)0 1569 +(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)44 b Ff(126)0 1569 y(.bashrc,)26 b(setting)h(CVSR)n(OOT)d(in)7 b Fe(.)14 b(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g -(.)g(.)g(.)g(.)34 b Ff(15)0 1686 y(.cshrc,)27 b(setting)f(CVSR)n(OOT)e +(.)g(.)g(.)g(.)34 b Ff(13)0 1686 y(.cshrc,)27 b(setting)f(CVSR)n(OOT)e (in)14 b Fe(.)f(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g -(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)40 b Ff(15)0 1802 y(.cvsrc)26 +(.)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(89)0 +(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)42 b Ff(91)0 1918 y(.pro\014le,)27 b(setting)f(CVSR)n(OOT)e(in)12 b Fe(.)h(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.) -g(.)g(.)h(.)f(.)g(.)38 b Ff(15)0 2034 y(.tcshrc,)26 b(setting)h(CVSR)n +g(.)g(.)h(.)f(.)g(.)38 b Ff(13)0 2034 y(.tcshrc,)26 b(setting)h(CVSR)n (OOT)d(in)16 b Fe(.)d(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f -(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)42 b Ff(15)0 2260 +(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)42 b Ff(13)0 2260 y Fm(/)0 2392 y Ff(/usr/lo)r(cal/cvsro)r(ot,)30 b(as)c(example)f(rep)r (ository)20 b Fe(.)14 b(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)46 -b Ff(15)0 2618 y Fm(:)0 2750 y Ff(:ext:)14 b Fe(.)f(.)g(.)g(.)g(.)g(.)h +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(23)0 2867 y(:kserv)n(er:)15 +(.)g(.)g(.)h(.)f(.)g(.)40 b Ff(21)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(27)0 2983 +(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)42 b Ff(25)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(15)0 3099 y(:pserv)n(er:)14 b Fe(.)g(.)f(.)g(.)g(.)g(.)g(.)h(.)f +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(25)0 3215 y(:serv)n(er:)19 b Fe(.)13 b(.)h(.)f(.)g(.)g(.)g(.)g(.)g +b Ff(23)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(23)0 3441 y Fm(=)0 3573 y Ff(=======)15 b +(.)45 b Ff(21)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(39)p 8 3799 41 6 v 5 3932 24 +g(.)h(.)f(.)g(.)41 b Ff(37)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(124)0 4157 y Fg(>)0 4290 y Fd(>>>>>>>)18 +g(.)33 b Ff(126)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(39)0 4515 +(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)45 b Ff(37)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(39)0 4873 y Fm(A)0 5006 y Ff(A)25 b(sample)h(session)8 -b Fe(.)15 b(.)e(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f -(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.) -g(.)35 b Ff(11)0 5122 y(abandoning)26 b(w)n(ork)21 b -Fe(.)13 b(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g +b Ff(37)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(44)0 5238 y(Ab)r(out)25 b(this)h(man)n(ual)11 +48 b Ff(42)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(59)2031 846 y(Adding)25 b(a)h(tag)21 b Fe(.)13 b(.)g(.)g(.)g(.)g +b Ff(61)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(.) g(.)g(.)g(.)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(59)2031 1078 y(Admin)24 b(\(sub)r(command\))17 b +b Ff(61)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(95)2031 1195 y(Administrativ)n(e)25 b(\014les)h(\(in)n(tro\))12 +b Ff(97)2031 1195 y(Administrativ)n(e)25 b(\014les)h(\(in)n(tro\))12 b Fe(.)h(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.) -h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)38 b Ff(19)2031 1311 +h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)38 b Ff(17)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 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(20)2031 +(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)44 b Ff(18)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 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(76)2031 1776 y(A)n(tomic)25 b(transactions,)i(lac)n(k)f(of)9 +b Ff(78)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(41)2031 1892 y(authen)n(ticated) +(.)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(25)2031 2008 y(authen)n(ticating)26 b(serv)n(er,)g(setting)g(up)19 +b Ff(23)2031 2008 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(23)2031 2124 y(Author)25 b(k)n(eyw)n(ord)19 +(.)g(.)g(.)46 b Ff(21)2031 2124 y(Author)25 b(k)n(eyw)n(ord)19 b Fe(.)13 b(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g (.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.) -h(.)46 b Ff(77)2031 2241 y(Automatically)25 b(ignored)i(\014les)8 +h(.)46 b Ff(79)2031 2241 y(Automatically)25 b(ignored)i(\014les)8 b Fe(.)13 b(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g (.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)35 b Ff(148)2031 2357 y(Av)n(oiding)25 b(editor)h(in)n(v)n(o)r(cation)16 b Fe(.)e(.)f(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g -(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)42 b Ff(94)2031 2619 y +(.)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(83)2031 2868 y(Binary)26 b(\014les)16 b Fe(.)e(.)f(.)g(.)g(.)g(.)g +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(81)2031 2984 y(Branc)n(h)26 b(merge)f(example)11 +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(53)2031 3100 y(Branc)n(h)26 b(n)n(um)n(b)r(er)17 b -Fe(.)11 b(.)i(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g +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(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.) -g(.)h(.)f(.)44 b Ff(9)2031 3216 y(Branc)n(h)26 b(n)n(um)n(b)r(ers)17 +g(.)42 b Ff(45)2031 3216 y(Branc)n(h)26 b(n)n(um)n(b)r(ers)17 b Fe(.)11 b(.)i(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g (.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.) h(.)43 b Ff(51)2031 3333 y(Branc)n(h,)26 b(creating)h(a)16 @@ -10228,20 +10240,20 @@ 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(.)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(65)2031 3565 y(Branc)n(hes)21 b Fe(.)13 b(.)g(.)g(.)g(.)h(.)f(.)g +b Ff(67)2031 3565 y(Branc)n(hes)21 b Fe(.)13 b(.)g(.)g(.)g(.)h(.)f(.)g (.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.) g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)47 -b Ff(47)2031 3681 y(Branc)n(hes)26 b(motiv)l(ation)15 +b Ff(45)2031 3681 y(Branc)n(hes)26 b(motiv)l(ation)15 b Fe(.)e(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.) g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)41 -b Ff(49)2031 3798 y(Branc)n(hes,)27 b(cop)n(ying)e(c)n(hanges)h(b)r(et) +b Ff(50)2031 3798 y(Branc)n(hes,)27 b(cop)n(ying)e(c)n(hanges)h(b)r(et) n(w)n(een)c Fe(.)14 b(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g -(.)g(.)g(.)49 b Ff(53)2031 3914 y(Branc)n(hes,)27 b(stic)n(ky)18 +(.)g(.)g(.)49 b Ff(55)2031 3914 y(Branc)n(hes,)27 b(stic)n(ky)18 b Fe(.)13 b(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g (.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.) -h(.)45 b Ff(51)2031 4030 y(Bringing)27 b(a)f(\014le)g(up)e(to)i(date)20 +h(.)45 b Ff(52)2031 4030 y(Bringing)27 b(a)f(\014le)g(up)e(to)i(date)20 b Fe(.)13 b(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g -(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)46 b Ff(36)2031 +(.)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 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 @@ -10253,12 +10265,12 @@ h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g b Ff(3)2031 4495 y(builds)21 b Fe(.)13 b(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.) g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g (.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.) -h(.)47 b Ff(83)2031 4757 y Fm(C)2031 4890 y Ff(Changes,)27 +h(.)47 b Ff(85)2031 4757 y Fm(C)2031 4890 y Ff(Changes,)27 b(cop)n(ying)f(b)r(et)n(w)n(een)f(branc)n(hes)16 b Fe(.)d(.)h(.)f(.)g -(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)43 b Ff(53)2031 +(.)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(96)2031 5122 y(c)n(hec)n(k)n(ed)25 +g(.)g(.)g(.)g(.)37 b Ff(98)2031 5122 y(c)n(hec)n(k)n(ed)25 b(out)g(cop)n(y)-6 b(,)25 b(k)n(eeping)11 b Fe(.)j(.)f(.)g(.)g(.)g(.)g (.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.) f(.)38 b Ff(147)2031 5238 y(Chec)n(kin)25 b(program)19 @@ -10270,71 +10282,72 @@ b(.)h(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g b Ff(141)p eop %%Page: 166 168 166 167 bop 0 -116 a Fs(166)2366 b(CVS|Concurren)m(t)29 -b(V)-8 b(ersions)30 b(System)0 366 y Ff(Chec)n(king)c(out)f(source)d -Fe(.)13 b(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g -(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)47 -b Ff(11)0 483 y(Chec)n(k)n(out)25 b(\(sub)r(command\))8 -b Fe(.)j(.)i(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.) -g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)35 b Ff(99)0 -599 y(Chec)n(k)n(out)25 b(program)13 b Fe(.)h(.)f(.)g(.)g(.)g(.)g(.)g -(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.) -g(.)g(.)g(.)g(.)g(.)h(.)f(.)40 b Ff(138)0 715 y(c)n(hec)n(k)n(out,)25 +b(V)-8 b(ersions)30 b(System)0 366 y Ff(Chec)n(king)c(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 +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 +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 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(44)0 831 y(Chec)n(k)n(out,)26 -b(example)8 b Fe(.)k(.)h(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.) -g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g -(.)g(.)35 b Ff(11)0 948 y(c)n(ho)r(osing,)27 b(reserv)n(ed)f(or)g +b(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)49 b Ff(42)0 831 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 (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(46)0 1064 y(Cleaning)27 b(up)20 b +(.)f(.)g(.)46 b Ff(44)0 1064 y(Cleaning)27 b(up)20 b Fe(.)14 b(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h (.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.) -g(.)g(.)g(.)g(.)g(.)48 b Ff(12)0 1180 y(Clien)n(t/Serv)n(er)26 +g(.)g(.)g(.)g(.)g(.)48 b Ff(10)0 1180 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(21)0 1296 y(Co)26 b(\(sub)r(command\))16 b Fe(.)11 -b(.)i(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g -(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)42 -b Ff(99)0 1413 y(Command)24 b(reference)7 b Fe(.)14 b(.)f(.)h(.)f(.)g -(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.) -g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)34 b Ff(127)0 1529 y(Command)24 -b(structure)f Fe(.)13 b(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g -(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.) -49 b Ff(89)0 1645 y(Commen)n(t)24 b(leader)16 b Fe(.)e(.)f(.)g(.)g(.)g +b Ff(19)0 1296 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 +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 +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 (.)g(.)g(.)g(.)h(.)f(.)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(98)0 1761 y(Commit)25 b(\(sub)r(command\))9 b Fe(.)i(.)i(.)g(.)g(.)g -(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.) -h(.)f(.)g(.)g(.)36 b Ff(101)0 1877 y(Commit)25 b(\014les)8 -b Fe(.)13 b(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g +g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)40 b Ff(100)0 +1761 y(Commit)25 b(\(sub)r(command\))9 b Fe(.)i(.)i(.)g(.)g(.)g(.)g(.)g +(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.) +g(.)g(.)36 b Ff(103)0 1877 y(Commit)25 b(\014les)8 b +Fe(.)13 b(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g (.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.) h(.)f(.)g(.)g(.)35 b Ff(140)0 1994 y(Commit,)25 b(when)h(to)15 b Fe(.)e(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.) f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)41 -b Ff(87)0 2110 y(Commitinfo)22 b Fe(.)13 b(.)g(.)g(.)h(.)f(.)g(.)g(.)g +b Ff(89)0 2110 y(Commitinfo)22 b Fe(.)13 b(.)g(.)g(.)h(.)f(.)g(.)g(.)g (.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.) g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)49 b -Ff(141)0 2226 y(Committing)25 b(c)n(hanges)16 b Fe(.)d(.)g(.)g(.)h(.)f -(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.) -g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)42 b Ff(11)0 2342 y(Common)25 -b(options)e Fe(.)13 b(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g +Ff(141)0 2226 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 +(.)g(.)g(.)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 +y(Common)25 b(syn)n(tax)f(of)j(info)f(\014les)7 b Fe(.)14 +b(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g +(.)g(.)g(.)g(.)g(.)34 b Ff(141)0 2575 y(compatibilit)n(y)-6 +b(,)25 b(b)r(et)n(w)n(een)h(CVS)f(v)n(ersions)20 b Fe(.)13 +b(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)46 +b Ff(87)0 2691 y(COMSPEC)10 b Fe(.)15 b(.)e(.)g(.)g(.)g(.)g(.)h(.)f(.)g (.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.) -g(.)g(.)g(.)50 b Ff(92)0 2459 y(Common)25 b(syn)n(tax)f(of)j(info)f -(\014les)7 b Fe(.)14 b(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g -(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)34 b Ff(141)0 -2575 y(compatibilit)n(y)-6 b(,)25 b(b)r(et)n(w)n(een)h(CVS)f(v)n -(ersions)20 b Fe(.)13 b(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g -(.)g(.)46 b Ff(85)0 2691 y(COMSPEC)10 b Fe(.)15 b(.)e(.)g(.)g(.)g(.)g -(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.) -g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)37 -b Ff(152)0 2807 y(Con\015ict)26 b(mark)n(ers)14 b Fe(.)f(.)g(.)g(.)g(.) -g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h -(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)41 -b Ff(39)0 2924 y(Con\015ict)26 b(resolution)17 b Fe(.)d(.)f(.)g(.)g(.)g +g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)37 b +Ff(152)0 2807 y(Con\015ict)26 b(mark)n(ers)14 b Fe(.)f(.)g(.)g(.)g(.)g +(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.) +f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)41 b +Ff(37)0 2924 y(Con\015ict)26 b(resolution)17 b Fe(.)d(.)f(.)g(.)g(.)g (.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.) -g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)43 b Ff(39)0 +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 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(38)0 3156 y(Con)n(tributors)26 +(.)g(.)g(.)g(.)g(.)h(.)f(.)48 b Ff(36)0 3156 y(Con)n(tributors)26 b(\(CVS)f(program\))10 b Fe(.)j(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g (.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)37 b Ff(5)0 3272 y(Con)n(tributors)26 b(\(man)n(ual\))16 @@ -10343,18 +10356,18 @@ g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)44 b Ff(2)0 3388 y(Cop)n(ying)26 b(c)n(hanges)11 b Fe(.)j(.)f(.)g(.)g(.)g (.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.) g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)38 b -Ff(53)0 3505 y(Correcting)27 b(a)f(log)h(message)10 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(96)0 3621 +(.)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(31)0 3853 y(Creating)27 b(a)f(rep)r(ository)19 +(.)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(20)0 3970 y(Credits)26 b(\(CVS)g(program\))17 b +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 @@ -10362,13 +10375,13 @@ Fe(.)c(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)34 b Ff(2)0 4202 y(CVS)25 b(1.6,)i(and)f(w)n(atc)n(hes)9 b Fe(.)14 b(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g -(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)36 b Ff(45)0 +(.)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(89)0 4435 y(CVS)25 b(passwd)i(\014le)19 +g(.)g(.)38 b Ff(91)0 4435 y(CVS)25 b(passwd)i(\014le)19 b Fe(.)14 b(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h (.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.) -g(.)46 b Ff(24)0 4551 y(CVS,)26 b(history)f(of)15 b Fe(.)g(.)e(.)g(.)g +g(.)46 b Ff(22)0 4551 y(CVS,)26 b(history)f(of)15 b Fe(.)g(.)e(.)g(.)g (.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.) h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)43 b Ff(5)0 4667 y(CVS,)26 b(in)n(tro)r(duction)f(to)7 b @@ -10377,18 +10390,18 @@ Fe(.)14 b(.)f(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g b Ff(5)0 4783 y(CVS,)26 b(v)n(ersions)g(of)14 b Fe(.)g(.)f(.)g(.)g(.)h (.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.) g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)41 b -Ff(85)0 4899 y(CVS)p 161 4899 24 4 v 27 w(CLIENT)p 484 +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 (.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.) -g(.)h(.)f(.)41 b Ff(27)0 5132 y(CVS)p 161 5132 V 27 w(IGNORE)p +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(26)2031 366 y(CVS)p 2192 +(.)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 @@ -10398,18 +10411,18 @@ 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(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.) -g(.)h(.)f(.)g(.)g(.)38 b Ff(22)2031 715 y(CVS)p 2192 +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(.)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)8 b Fe(.)13 b(.)g(.)g(.)g(.)h(.)f(.)g -(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)34 b Ff(11)2031 1064 -y(CVSIGNORE)20 b Fe(.)13 b(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g -(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.) -h(.)f(.)g(.)g(.)g(.)g(.)48 b Ff(151)2031 1180 y(cvsignore)27 +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(.) @@ -10418,10 +10431,10 @@ g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g 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(92)2031 1529 y(cvsro)r(ot)17 b Fe(.)c(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.) +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(15)2031 1645 y(CVSR)n(OOT)12 b Fe(.)g(.)h(.)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 @@ -10429,18 +10442,18 @@ 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) 14 b Fe(.)f(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g -(.)h(.)40 b Ff(15)2031 1994 y(CVSR)n(OOT,)25 b(mo)r(dule)g(name)c +(.)h(.)40 b Ff(13)2031 1994 y(CVSR)n(OOT,)25 b(mo)r(dule)g(name)c Fe(.)13 b(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g -(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)48 b Ff(19)2031 2110 +(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)48 b Ff(17)2031 2110 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(20)2031 2226 y(CVSR)n(OOT,)25 b(o)n(v)n(erriding)11 +(.)g(.)g(.)34 b Ff(18)2031 2226 y(CVSR)n(OOT,)25 b(o)n(v)n(erriding)11 b Fe(.)i(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.) g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)37 b -Ff(91)2031 2342 y(CVSUMASK)18 b Fe(.)13 b(.)g(.)g(.)g(.)g(.)g(.)h(.)f +Ff(93)2031 2342 y(CVSUMASK)18 b Fe(.)13 b(.)g(.)g(.)g(.)g(.)g(.)h(.)f (.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.) g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)46 b -Ff(18)2031 2459 y(CVSWRAPPERS)20 b Fe(.)13 b(.)h(.)f(.)g(.)g(.)g(.)g(.) +Ff(16)2031 2459 y(CVSWRAPPERS)20 b Fe(.)13 b(.)h(.)f(.)g(.)g(.)g(.)g(.) g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h (.)f(.)g(.)g(.)g(.)g(.)g(.)49 b Ff(151)2031 2575 y(cvswrapp)r(ers)26 b(\(admin)f(\014le\))12 b Fe(.)h(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.) @@ -10450,15 +10463,15 @@ f Fe(.)14 b(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)48 b Ff(139)2031 2999 y Fm(D)2031 3132 y Ff(Date)26 b(k)n(eyw)n(ord)9 b Fe(.)j(.)h(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.) g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g -(.)g(.)h(.)f(.)35 b Ff(77)2031 3248 y(Dates)9 b Fe(.)k(.)g(.)g(.)g(.)h +(.)g(.)h(.)f(.)35 b Ff(79)2031 3248 y(Dates)9 b Fe(.)k(.)g(.)g(.)g(.)h (.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.) g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g -(.)g(.)g(.)h(.)f(.)g(.)35 b Ff(92)2031 3364 y(Decimal)26 -b(revision)g(n)n(um)n(b)r(er)13 b Fe(.)e(.)i(.)g(.)g(.)g(.)g(.)h(.)f(.) -g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g -(.)g(.)40 b Ff(9)2031 3480 y(DEF)-9 b(A)n(UL)j(T)25 b(in)h(commitinfo) -16 b Fe(.)c(.)h(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g -(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)43 b Ff(142)2031 3597 +(.)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 @@ -10467,84 +10480,84 @@ 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(33)2031 3945 +g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)45 b Ff(31)2031 3945 y(De\014ning)25 b(mo)r(dules)g(\(in)n(tro\))15 b Fe(.)e(.)g(.)h(.)f(.)g (.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.) -g(.)g(.)g(.)h(.)41 b Ff(19)2031 4061 y(De\014ning)25 +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(61)2031 4294 y(Deleting)26 b(revisions)11 b Fe(.)k(.)e(.)g(.)g(.)g +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(96)2031 +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(57)2031 4643 y(Di\013)8 b Fe(.)13 +(.)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(13)2031 4759 y(Di\013)25 b(\(sub)r(command\))15 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(105)2031 4875 y(Di\013erences,)26 b(merging)20 b +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(55)2031 4991 y(Directories,)27 b(mo)n(ving)17 b +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(73)2031 5108 y(directories,)27 b(remo)n(ving)10 +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(63)2031 5224 y(Directory)-6 b(,)26 b(descending)17 +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(57)2031 5340 y(Disjoin)n(t)26 b(rep)r(ositories)7 +b Ff(59)2031 5340 y(Disjoin)n(t)26 b(rep)r(ositories)7 b Fe(.)16 b(.)d(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h (.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)33 -b Ff(20)p eop +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(37)0 +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 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(44)0 978 y(editinfo)26 b(\(admin)f(\014le\))d Fe(.)13 +b Ff(42)0 978 y(editinfo)26 b(\(admin)f(\014le\))d Fe(.)13 b(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h (.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)49 b Ff(143)0 1094 y(Editing)26 b(administrativ)n(e)f(\014les)7 b Fe(.)14 b(.)f(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g -(.)h(.)f(.)g(.)g(.)g(.)g(.)34 b Ff(20)0 1211 y(Editing)26 +(.)h(.)f(.)g(.)g(.)g(.)g(.)34 b Ff(18)0 1211 y(Editing)26 b(the)f(mo)r(dules)h(\014le)9 b Fe(.)j(.)i(.)f(.)g(.)g(.)g(.)g(.)g(.)h (.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.) -g(.)35 b Ff(33)0 1327 y(EDITOR)15 b Fe(.)e(.)g(.)g(.)g(.)g(.)g(.)h(.)f +g(.)35 b Ff(31)0 1327 y(EDITOR)15 b Fe(.)e(.)g(.)g(.)g(.)g(.)g(.)h(.)f (.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.) g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)42 b Ff(151)0 1443 y(Editor,)26 b(a)n(v)n(oiding)h(in)n(v)n(o)r(cation)f (of)14 b Fe(.)g(.)f(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h -(.)f(.)g(.)g(.)g(.)g(.)g(.)41 b Ff(94)0 1559 y(EDITOR,)25 -b(en)n(vironmen)n(t)f(v)l(ariable)17 b Fe(.)d(.)f(.)g(.)g(.)g(.)h(.)f -(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)44 -b Ff(11)0 1676 y(EDITOR,)25 b(o)n(v)n(erriding)14 b Fe(.)g(.)f(.)g(.)g +(.)f(.)g(.)g(.)g(.)g(.)g(.)41 b Ff(96)0 1559 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 (.)g(.)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(91)0 1792 +g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)41 b Ff(93)0 1792 y(Editor,)26 b(sp)r(ecifying)h(p)r(er)f(mo)r(dule)13 b Fe(.)f(.)h(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.) g(.)g(.)g(.)g(.)40 b Ff(143)0 1908 y(editors)26 b(\(sub)r(command\))17 b Fe(.)12 b(.)h(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h (.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)44 -b Ff(45)0 2024 y(emerge)21 b Fe(.)13 b(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g +b Ff(43)0 2024 y(emerge)21 b Fe(.)13 b(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g (.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.) g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)47 -b Ff(40)0 2141 y(En)n(vironmen)n(t)24 b(v)l(ariables)16 +b Ff(38)0 2141 y(En)n(vironmen)n(t)24 b(v)l(ariables)16 b Fe(.)e(.)f(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.) g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)43 b Ff(151)0 2257 y(Errors,)27 b(rep)r(orting)f(\(CVS\))9 b Fe(.)k(.)g(.)g(.)g(.)h @@ -10552,83 +10565,83 @@ g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)43 b Ff(151)0 g(.)g(.)g(.)g(.)h(.)f(.)36 b Ff(6)0 2373 y(Errors,)27 b(rep)r(orting)f(\(man)n(ual\))16 b Fe(.)c(.)h(.)g(.)g(.)h(.)f(.)g(.)g (.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.) -43 b Ff(3)0 2489 y(Example)25 b(of)h(a)g(w)n(ork-session)c -Fe(.)13 b(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h -(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)46 b Ff(11)0 2605 +43 b Ff(3)0 2489 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 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(37)0 2722 y(Example,)25 +g(.)g(.)h(.)f(.)g(.)g(.)49 b Ff(35)0 2722 y(Example,)25 b(branc)n(h)g(merge)14 b Fe(.)f(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g (.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)40 -b Ff(53)0 2838 y(Exp)r(ort)25 b(\(sub)r(command\))11 +b Ff(55)0 2838 y(Exp)r(ort)25 b(\(sub)r(command\))11 b Fe(.)g(.)i(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.) -g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)38 b Ff(107)0 +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)15 b Fe(.)f(.)f(.)g(.)h -(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.) -g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)41 -b Ff(11)0 3450 y(File)27 b(had)e(con\015icts)h(on)g(merge)8 +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(36)0 3566 +(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)35 b Ff(34)0 3566 y(File)27 b(lo)r(c)n(king)12 b Fe(.)h(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h (.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.) g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)39 -b Ff(35)0 3682 y(File)27 b(p)r(ermissions)22 b Fe(.)13 +b Ff(33)0 3682 y(File)27 b(p)r(ermissions)22 b Fe(.)13 b(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g (.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)48 -b Ff(18)0 3798 y(File)27 b(status)13 b Fe(.)g(.)g(.)g(.)g(.)g(.)g(.)g +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(35)0 3915 y(Files,)27 b(mo)n(ving)17 b Fe(.)c(.)g(.)g(.)g(.)g(.)g +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(69)0 4031 y(Files,)27 b(reference)g(man)n(ual)6 +b Ff(71)0 4031 y(Files,)27 b(reference)g(man)n(ual)6 b Fe(.)12 b(.)i(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g (.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)33 b Ff(137)0 4147 y(Fixing)26 b(a)g(log)h(message)12 b Fe(.)h(.)g(.)g(.)g(.)h(.)f(.) g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g -(.)g(.)g(.)h(.)f(.)g(.)g(.)38 b Ff(96)0 4263 y(F)-6 b(orcing)26 +(.)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(93)0 4380 y(F)-6 b(orm)25 b(for)h(log)h(message)20 +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 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(89)0 4742 -y Fm(G)0 4875 y Ff(Getting)26 b(started)16 b Fe(.)e(.)f(.)g(.)g(.)g(.)g -(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.) -g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)43 b -Ff(11)0 4991 y(Getting)26 b(the)f(source)14 b Fe(.)g(.)f(.)h(.)f(.)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(.) g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g -(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)41 b Ff(11)0 5108 -y(Global)27 b(cvsignore)11 b Fe(.)j(.)f(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g -(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.) -h(.)f(.)g(.)g(.)g(.)g(.)38 b Ff(148)0 5224 y(Global)27 +(.)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(91)0 5340 y(Group)14 +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(18)2031 +(.)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 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(77)2031 616 y(History)26 b(\(sub)r(command\))19 +h(.)48 b Ff(79)2031 616 y(History)26 b(\(sub)r(command\))19 b Fe(.)13 b(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g -(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)49 b Ff(108)2031 +(.)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(75)2031 +(.)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 (.)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 (.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.) g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)49 -b Ff(18)2031 1080 y(History)26 b(of)g(CVS)18 b Fe(.)c(.)f(.)g(.)g(.)g +b Ff(16)2031 1080 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 @@ -10640,13 +10653,13 @@ 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 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(77)2031 1797 y(Iden)n(t)25 +g(.)g(.)g(.)g(.)g(.)h(.)46 b Ff(79)2031 1797 y(Iden)n(t)25 b(\(shell)h(command\))14 b Fe(.)d(.)j(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f (.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.) -g(.)41 b Ff(78)2031 1913 y(Iden)n(tifying)25 b(\014les)17 +g(.)41 b Ff(80)2031 1913 y(Iden)n(tifying)25 b(\014les)17 b Fe(.)c(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.) h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f -(.)g(.)43 b Ff(77)2031 2029 y(Ignored)26 b(\014les)18 +(.)g(.)43 b Ff(79)2031 2029 y(Ignored)26 b(\014les)18 b Fe(.)13 b(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f (.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.) g(.)g(.)g(.)h(.)44 b Ff(148)2031 2145 y(Ignoring)26 b(\014les)d @@ -10654,15 +10667,15 @@ 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 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(110)2031 +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(.)g(.)g(.)g(.)g(.)h(.)f(.)g -(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)39 b Ff(31)2031 +(.)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(32)2031 2610 y(Imp)r(orting)25 +(trol)g(systesm)10 b Fe(.)j(.)35 b Ff(30)2031 2610 y(Imp)r(orting)25 b(mo)r(dules)7 b Fe(.)12 b(.)i(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g (.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.) -g(.)g(.)h(.)33 b Ff(65)2031 2727 y(Index)8 b Fe(.)k(.)h(.)g(.)h(.)f(.)g +g(.)g(.)h(.)33 b Ff(67)2031 2727 y(Index)8 b Fe(.)k(.)h(.)g(.)h(.)f(.)g (.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.) g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g (.)h(.)f(.)g(.)35 b Ff(165)2031 2843 y(Info)26 b(\014les)g(\(syn)n @@ -10671,10 +10684,10 @@ g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)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(40)2031 3075 y(init)26 b(\(sub)r(command\))19 +(.)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(21)2031 3191 y(In)n(tro)r(duction)25 b(to)h(CVS)15 +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 @@ -10683,246 +10696,243 @@ b(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f 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(75)2031 3659 y Fm(J)2031 3791 y Ff(Join)16 +(.)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(53)2031 4026 y Fm(K)2031 4159 y Ff(k)n(eeping)25 +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(27)2031 4391 y(Keyw)n(ord)25 b(expansion)15 +(.)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(77)2031 4508 y(Keyw)n(ord)25 b(substitution)14 b +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(77)2031 4624 y(K\015ag)15 b Fe(.)e(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g +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(79)2031 4740 y(kinit)9 b Fe(.)k(.)g(.)g(.)h(.)f(.)g(.)g +(.)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(27)2031 4856 y(Kno)n(wn)25 +(.)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 (.)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(15)2031 5340 y(Left-hand)25 b(options)11 +(.)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(91)p eop +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)15 -b Fe(.)d(.)h(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.) -g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)42 -b Ff(9)0 483 y(link,)26 b(sym)n(b)r(olic,)f(imp)r(orting)d +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(112)0 599 +(.)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 (.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.) g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)45 b Ff(5)0 715 y(Lo)r(cally)27 b(Added)13 b Fe(.)f(.)h(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h (.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.) -g(.)g(.)g(.)g(.)g(.)40 b Ff(35)0 831 y(Lo)r(cally)27 +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(35)0 948 y(Lo)r(cally)27 +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(36)0 1064 y(Lo)r(c)n(k)n(er)26 +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(.)g(.)h(.)f(.)g(.) -g(.)g(.)g(.)g(.)h(.)f(.)38 b Ff(77)0 1180 y(Lo)r(c)n(king)26 +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(35)0 1296 y(lo)r(c)n(ks,)27 +h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)42 b Ff(33)0 1296 y(lo)r(c)n(ks,)27 b(cvs)14 b Fe(.)f(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f (.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.) -g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)41 b Ff(40)0 +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(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.) -g(.)h(.)f(.)g(.)g(.)g(.)42 b Ff(113)0 1529 y(Log)26 b(information,)h +g(.)h(.)f(.)g(.)g(.)g(.)42 b Ff(114)0 1529 y(Log)26 b(information,)h (sa)n(ving)11 b Fe(.)i(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f (.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)38 b Ff(149)0 1645 y(Log)26 b(k)n(eyw)n(ord)10 b Fe(.)j(.)g(.)g(.)g(.)g(.) g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f (.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)36 -b Ff(77)0 1761 y(Log)26 b(k)n(eyw)n(ord,)g(selecting)h(commen)n(t)c -(leader)8 b Fe(.)15 b(.)e(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)35 -b Ff(98)0 1877 y(Log)26 b(message)h(en)n(try)16 b Fe(.)c(.)h(.)g(.)g(.) -g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g -(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)42 b Ff(11)0 -1994 y(Log)26 b(message)h(template)21 b Fe(.)13 b(.)h(.)f(.)g(.)g(.)g -(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.) -g(.)h(.)f(.)g(.)49 b Ff(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(96)0 -2226 y(log)27 b(message,)f(v)n(erifying)10 b Fe(.)k(.)f(.)g(.)g(.)g(.)g +b Ff(79)0 1761 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(.)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(.)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(.)g(.)37 b Ff(142)0 2342 y(Log)26 b(messages)14 -b Fe(.)g(.)f(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.) -g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g -(.)g(.)h(.)40 b Ff(145)0 2459 y(Log)26 b(messages,)h(editing)11 -b Fe(.)j(.)f(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.) -g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)38 b -Ff(143)0 2575 y(Login)26 b(\(sub)r(command\))17 b Fe(.)d(.)f(.)g(.)g(.) -g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g -(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)46 b Ff(25)0 2691 y(loginfo)28 -b(\(admin)c(\014le\))c Fe(.)13 b(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.) -h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g -(.)g(.)g(.)47 b Ff(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(26)0 3231 y Fm(M)0 3364 y Ff(Mail,)27 b(automatic)f(mail)g(on)f -(commit)19 b Fe(.)13 b(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g -(.)g(.)g(.)g(.)g(.)g(.)47 b Ff(40)0 3480 y(Mailing)27 -b(list)18 b Fe(.)c(.)f(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g -(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.) -g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)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 +f(.)g(.)g(.)g(.)38 b Ff(98)0 2226 y(log)27 b(message,)f(v)n(erifying)10 +b Fe(.)k(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.) +g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)37 b +Ff(142)0 2342 y(Log)26 b(messages)14 b Fe(.)g(.)f(.)g(.)g(.)h(.)f(.)g (.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.) -g(.)g(.)g(.)h(.)33 b Ff(145)0 3713 y(Main)26 b(trunk)f(\(in)n(tro\))13 -b Fe(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.) -g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)41 -b Ff(9)0 3829 y(Main)26 b(trunk)f(and)g(branc)n(hes)20 -b Fe(.)13 b(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f -(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)46 b Ff(47)0 3945 -y(mak)n(e)17 b Fe(.)12 b(.)h(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.) -g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f -(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)43 -b Ff(83)0 4061 y(Man)n(y)25 b(rep)r(ositories)10 b Fe(.)15 -b(.)f(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f -(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)36 -b Ff(20)0 4178 y(Mark)n(ers,)27 b(con\015ict)11 b Fe(.)i(.)g(.)g(.)g(.) -h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g -(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)38 -b Ff(39)0 4294 y(Merge,)27 b(an)f(example)8 b Fe(.)k(.)h(.)h(.)f(.)g(.) -g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g -(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)35 b Ff(37)0 4410 -y(Merge,)27 b(branc)n(h)e(example)19 b Fe(.)13 b(.)g(.)h(.)f(.)g(.)g(.) -g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g -(.)g(.)h(.)f(.)46 b Ff(53)0 4526 y(Merging)18 b Fe(.)c(.)f(.)h(.)f(.)g +g(.)g(.)g(.)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(.) +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 +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(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g -(.)h(.)f(.)44 b Ff(53)0 4643 y(Merging)27 b(a)f(branc)n(h)12 -b Fe(.)h(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.) -g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)39 -b Ff(53)0 4759 y(Merging)27 b(a)f(\014le)9 b Fe(.)14 -b(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f +g(.)46 b Ff(23)0 2691 y(loginfo)28 b(\(admin)c(\014le\))c +Fe(.)13 b(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g +(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)47 +b Ff(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 +(.)h(.)f(.)g(.)g(.)g(.)g(.)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 +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 (.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.) -g(.)g(.)36 b Ff(36)0 4875 y(Merging)27 b(t)n(w)n(o)f(revisions)10 +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 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(55)0 4991 y(Mo)r(di\014cations,)28 b(cop)n(ying)d(b)r(et)n(w)n +b Ff(57)0 4991 y(Mo)r(di\014cations,)28 b(cop)n(ying)d(b)r(et)n(w)n (een)h(branc)n(hes)16 b Fe(.)d(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)43 -b Ff(53)0 5108 y(Mo)r(dule)26 b(status)16 b Fe(.)e(.)f(.)g(.)h(.)f(.)g +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(33)0 5340 y(Mo)r(dules)27 b(\(admin)d(\014le\))8 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 (.)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(\(in)n(tro\))13 b -Fe(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g -(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.) -g(.)h(.)40 b Ff(9)2031 483 y(Mo)r(dules)27 b(\014le)21 -b Fe(.)13 b(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f -(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.) -g(.)g(.)g(.)g(.)h(.)47 b Ff(19)2031 599 y(Mo)r(dules)27 -b(\014le,)f(c)n(hanging)20 b Fe(.)13 b(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g -(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.) -h(.)f(.)46 b Ff(33)2031 715 y(Motiv)l(ation)26 b(for)h(branc)n(hes)10 +b Ff(137)2031 366 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 +(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 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(49)2031 -831 y(Mo)n(ving)26 b(directories)15 b Fe(.)g(.)e(.)g(.)g(.)h(.)f(.)g(.) +g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)37 b Ff(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(73)2031 948 y(Mo)n(ving)26 +(.)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(69)2031 1064 -y(Multiple)26 b(dev)n(elop)r(ers)14 b Fe(.)g(.)f(.)g(.)h(.)f(.)g(.)g(.) -g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g -(.)g(.)h(.)f(.)g(.)g(.)g(.)41 b Ff(35)2031 1180 y(Multiple)26 -b(rep)r(ositories)14 b Fe(.)i(.)d(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g -(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.) -g(.)g(.)41 b Ff(20)2031 1427 y Fm(N)2031 1559 y Ff(Name)25 -b(k)n(eyw)n(ord)9 b Fe(.)k(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g -(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.) -g(.)h(.)f(.)g(.)g(.)g(.)g(.)36 b Ff(77)2031 1676 y(Name,)25 -b(sym)n(b)r(olic)g(\(tag\))14 b Fe(.)g(.)f(.)h(.)f(.)g(.)g(.)g(.)g(.)g -(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.) -f(.)g(.)g(.)41 b Ff(47)2031 1792 y(Needs)25 b(Chec)n(k)n(out)e -Fe(.)13 b(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g -(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.) -g(.)50 b Ff(36)2031 1908 y(Needs)25 b(Merge)8 b Fe(.)15 -b(.)e(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g -(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.) -g(.)g(.)h(.)34 b Ff(36)2031 2024 y(Needs)25 b(P)n(atc)n(h)15 -b Fe(.)f(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.) +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 +(.)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(.)g(.)g(.)42 b Ff(36)2031 2141 y(Newsgroups)9 -b Fe(.)14 b(.)f(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g -(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.) -g(.)g(.)h(.)f(.)g(.)g(.)g(.)36 b Ff(5)2031 2257 y(notify)26 -b(\(admin)e(\014le\))19 b Fe(.)13 b(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f -(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.) -g(.)g(.)g(.)g(.)h(.)45 b Ff(43)2031 2373 y(Nro\013)25 -b(\(selecting)i(commen)n(t)d(leader\))15 b Fe(.)f(.)f(.)g(.)g(.)g(.)h -(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)42 -b Ff(98)2031 2489 y(Num)n(b)r(er,)24 b(branc)n(h)c Fe(.)14 -b(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f -(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.) -48 b Ff(9)2031 2605 y(Num)n(b)r(er,)24 b(revision-)10 -b Fe(.)k(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.) -h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g -(.)37 b Ff(9)2031 2852 y Fm(O)2031 2985 y Ff(option)26 +(.)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(.)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 +(.)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 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 +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 +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(89)2031 3101 y(Options,)26 +(.)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 (.)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(91)2031 3217 y(Outdating)25 +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(96)2031 3333 y(Ov)n(erlap)6 b Fe(.)13 b(.)g(.)g(.)g(.)g(.)h +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(37)2031 3450 y(Ov)n(erriding)25 b(CVSREAD)12 +(.)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(92)2031 3566 y(Ov)n(erriding)25 b(CVSR)n(OOT)10 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(91)2031 -3682 y(Ov)n(erriding)25 b(EDITOR)13 b Fe(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.) +(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)36 b Ff(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(91)2031 3798 y(Ov)n(erriding)25 +(.)g(.)g(.)g(.)g(.)h(.)39 b Ff(93)2031 3760 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(91)2031 3915 y(Ov)n(erriding)25 b(TMPDIR)8 b +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(91)2031 4161 y Fm(P)2031 4294 y Ff(P)n(arallel)28 +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(20)2031 4410 y(passwd)26 b(\(admin)f(\014le\))14 +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(24)2031 4526 y(passw)n(ord)27 b(clien)n(t,)f(using)10 +b Ff(22)2031 4526 y(passw)n(ord)27 b(clien)n(t,)f(using)10 b Fe(.)j(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.) g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)36 -b Ff(25)2031 4643 y(passw)n(ord)27 b(serv)n(er,)f(setting)g(up)6 +b Ff(23)2031 4643 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(23)2031 4759 +(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)33 b Ff(21)2031 4759 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 @@ -10932,7 +10942,7 @@ b(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g b Ff(143)2031 4991 y(P)n(olicy)18 b Fe(.)c(.)g(.)f(.)g(.)g(.)g(.)g(.)g (.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.) f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g -(.)g(.)45 b Ff(87)2031 5108 y(Precommit)25 b(c)n(hec)n(king)19 +(.)g(.)45 b Ff(89)2031 5108 y(Precommit)25 b(c)n(hec)n(king)19 b Fe(.)13 b(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g (.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)46 b Ff(141)2031 5224 y(Preface)17 b Fe(.)e(.)e(.)g(.)g(.)h(.)f(.)g(.)g(.) @@ -10941,33 +10951,33 @@ g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g h(.)44 b Ff(1)2031 5340 y(Pserv)n(er)26 b(\(sub)r(command\))6 b Fe(.)11 b(.)i(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g (.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)33 -b Ff(23)p eop +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(18)0 +(.)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(77)0 +(.)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(32)0 964 y(R)n(CS-st)n(yle) +(.)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 (.)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 1080 y(R)n(CSBIN)7 b +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(91)0 1313 y(R)n(CS\014le)25 b(k)n(eyw)n(ord)15 +g(.)g(.)50 b Ff(93)0 1313 y(R)n(CS\014le)25 b(k)n(eyw)n(ord)15 b Fe(.)e(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.) g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g -(.)42 b Ff(77)0 1429 y(rcsinfo)27 b(\(admin)d(\014le\))e +(.)42 b Ff(79)0 1429 y(rcsinfo)27 b(\(admin)d(\014le\))e Fe(.)13 b(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g (.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)49 b Ff(148)0 1545 y(R)n(CSINIT)10 b Fe(.)i(.)h(.)g(.)g(.)h(.)f(.)g(.)g(.) @@ -10976,27 +10986,27 @@ g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g b Ff(153)0 1662 y(Rdi\013)25 b(\(sub)r(command\))12 b Fe(.)f(.)i(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f (.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)39 -b Ff(115)0 1778 y(read-only)25 b(\014les,)i(and)e(-r)17 +b Ff(116)0 1778 y(read-only)25 b(\014les,)i(and)e(-r)17 b Fe(.)c(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.) g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)44 -b Ff(91)0 1894 y(read-only)25 b(\014les,)i(and)e(CVSREAD)6 +b Ff(93)0 1894 y(read-only)25 b(\014les,)i(and)e(CVSREAD)6 b Fe(.)12 b(.)h(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g (.)g(.)h(.)f(.)33 b Ff(151)0 2010 y(read-only)25 b(\014les,)i(and)e(w)n (atc)n(hes)17 b Fe(.)d(.)f(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g -(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)44 b Ff(42)0 +(.)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 b Fe(.)14 b(.)f(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g -(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)35 b Ff(18)0 2243 y(Read-only)25 +(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)35 b Ff(16)0 2243 y(Read-only)25 b(mo)r(de)18 b Fe(.)13 b(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.) g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h -(.)f(.)g(.)g(.)g(.)45 b Ff(91)0 2359 y(read-only)25 b(rep)r(ository)i +(.)f(.)g(.)g(.)g(.)45 b Ff(93)0 2359 y(read-only)25 b(rep)r(ository)i (access)11 b Fe(.)j(.)f(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h -(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)37 b Ff(28)0 +(.)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 (.)g(.)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(28)0 2591 y(Recursiv)n(e)25 +g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)41 b Ff(26)0 2591 y(Recursiv)n(e)25 b(\(directory)h(descending\))17 b Fe(.)c(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.) -f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)43 b Ff(57)0 +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 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 @@ -11009,37 +11019,37 @@ 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(116)0 +(.)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 Fe(.)13 b(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g -(.)g(.)g(.)g(.)47 b Ff(10)0 3405 y(Releasing)27 b(y)n(our)e(w)n(orking) +(.)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(12)0 3521 +(.)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(21)0 3638 y(Remo)n(v)n(e)24 +(.)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(61)0 3754 y(Remo)n(ving)24 b(a)i(c)n(hange)17 +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(55)0 3870 y(remo)n(ving)25 b(directories)d Fe(.)13 +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(63)0 3986 y(Remo)n(ving)24 b(\014les)14 b Fe(.)g(.)f(.)g(.)g(.)g +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(61)0 4102 y(Remo)n(ving)24 b(y)n(our)i(w)n(orking)g(cop)n(y)8 +b Ff(63)0 4102 y(Remo)n(ving)24 b(y)n(our)i(w)n(orking)g(cop)n(y)8 b Fe(.)k(.)h(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.) -g(.)g(.)h(.)f(.)g(.)g(.)34 b Ff(12)0 4219 y(Renaming)25 +g(.)g(.)h(.)f(.)g(.)g(.)34 b Ff(10)0 4219 y(Renaming)25 b(directories)e Fe(.)14 b(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g (.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.) -49 b Ff(73)0 4335 y(Renaming)25 b(\014les)12 b Fe(.)h(.)g(.)g(.)g(.)h +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(69)0 4451 y(Replacing)26 b(a)g(log)h(message)c Fe(.)13 +b Ff(71)0 4451 y(Replacing)26 b(a)g(log)h(message)c Fe(.)13 b(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g -(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)49 b Ff(96)0 4567 +(.)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 @@ -11048,119 +11058,119 @@ 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(20)0 4916 y(Rep)r(ositories,)28 b(remote)17 b Fe(.)12 +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(21)0 5032 y(Rep)r(ository)26 b(\(in)n(tro\))21 b +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(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)48 -b Ff(15)0 5149 y(Rep)r(ository)-6 b(,)26 b(example)19 +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(15)0 5265 y(Rep)r(ository)-6 b(,)26 b(ho)n(w)g(data)g(is)g(stored) +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(16)2031 366 y(Rep)r(ository)-6 +(.)g(.)g(.)g(.)h(.)f(.)46 b Ff(14)2031 366 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(20)2031 483 y(reserv)n(ed)25 b(c)n(hec)n(k)n(outs)16 +g(.)g(.)33 b Ff(18)2031 483 y(reserv)n(ed)25 b(c)n(hec)n(k)n(outs)16 b Fe(.)d(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.) g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)43 -b Ff(35)2031 599 y(Resetting)26 b(stic)n(ky)f(tags)10 +b Ff(33)2031 599 y(Resetting)26 b(stic)n(ky)f(tags)10 b Fe(.)k(.)g(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.) g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)37 b Ff(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(39)2031 831 y(Restoring)26 b(old)g(v)n(ersion)g(of)h(remo)n(v)n +b Ff(37)2031 831 y(Restoring)26 b(old)g(v)n(ersion)g(of)h(remo)n(v)n (ed)d(\014le)c Fe(.)13 b(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.) h(.)f(.)46 b Ff(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 (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(48)2031 1180 y(rev)n(erting)26 +(.)g(.)h(.)f(.)g(.)g(.)44 b Ff(49)2031 1180 y(rev)n(erting)26 b(to)g(rep)r(ository)g(v)n(ersion)d Fe(.)13 b(.)g(.)g(.)g(.)g(.)g(.)g (.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)49 -b Ff(44)2031 1296 y(Revision)26 b(k)n(eyw)n(ord)15 b +b Ff(42)2031 1296 y(Revision)26 b(k)n(eyw)n(ord)15 b Fe(.)d(.)i(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g (.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)41 -b Ff(77)2031 1413 y(Revision)26 b(managemen)n(t)10 b +b Ff(79)2031 1413 y(Revision)26 b(managemen)n(t)10 b Fe(.)h(.)i(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g (.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)36 -b Ff(87)2031 1529 y(Revision)26 b(n)n(um)n(b)r(ers)14 -b Fe(.)d(.)i(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.) -g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g -(.)41 b Ff(9)2031 1645 y(Revision)26 b(tree)6 b Fe(.)14 -b(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f -(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.) -g(.)g(.)g(.)h(.)33 b Ff(9)2031 1761 y(Revision)26 b(tree,)g(making)f -(branc)n(hes)6 b Fe(.)13 b(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g -(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)33 b Ff(47)2031 1877 -y(Revisions,)26 b(merging)g(di\013erences)g(b)r(et)n(w)n(een)16 -b Fe(.)e(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)43 -b Ff(55)2031 1994 y(Revisions,)26 b(v)n(ersions)h(and)e(releases)d -Fe(.)13 b(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g -(.)g(.)g(.)g(.)47 b Ff(10)2031 2110 y(Righ)n(t-hand)24 -b(options)c Fe(.)13 b(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g +b Ff(89)2031 1529 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 +(.)g(.)g(.)g(.)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 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 +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 +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 +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(.)46 b Ff(92)2031 2226 y(rsh)19 b Fe(.)13 b(.)g(.)g(.)g(.)g(.)g(.)h -(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.) -g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g -(.)g(.)g(.)h(.)f(.)g(.)45 b Ff(22)2031 2342 y(R)n(tag)26 -b(\(sub)r(command\))14 b Fe(.)c(.)k(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g -(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.) -g(.)41 b Ff(118)2031 2459 y(rtag,)27 b(creating)f(a)g(branc)n(h)f -(using)11 b Fe(.)j(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g -(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)38 b Ff(50)2031 2766 -y Fm(S)2031 2899 y Ff(Sa)n(ving)25 b(space)10 b Fe(.)k(.)g(.)f(.)g(.)g -(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.) -g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)37 -b Ff(96)2031 3015 y(SCCS,)26 b(imp)r(orting)g(\014les)g(from)8 +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 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 +(.)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(32)2031 3132 +(.)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(18)2031 3248 y(serv)n(er,)26 b(CVS)7 b Fe(.)13 b(.)g(.)g(.)g(.)g +b Ff(16)2031 3248 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(21)2031 3364 y(setgid)24 b Fe(.)13 b(.)g(.)g(.)g(.)g(.)g(.)h(.)f +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(19)2031 3480 y(Setting)26 b(up)e(a)i(rep)r(ository)e +(.)g(.)50 b Ff(17)2031 3480 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(20)2031 +(.)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(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f (.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)47 -b Ff(19)2031 3713 y(Sign)n(um)24 b(Supp)r(ort)c Fe(.)13 +b Ff(17)2031 3713 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(77)2031 3945 y(Source,)26 b(getting)g(CVS)g(source)c +g(.)39 b Ff(79)2031 3945 y(Source,)26 b(getting)g(CVS)g(source)c Fe(.)13 b(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g (.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)49 b Ff(5)2031 4061 -y(Source,)26 b(getting)g(from)g(CVS)12 b Fe(.)h(.)g(.)g(.)g(.)g(.)h(.)f -(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.) -g(.)39 b Ff(11)2031 4178 y(Sp)r(ecifying)26 b(dates)20 +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(92)2031 4294 y(Spreading)26 b(information)20 +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(40)2031 4410 y(Starting)26 b(a)g(pro)t(ject)g(with)g(CVS)19 +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(31)2031 4526 y(State)26 +(.)g(.)g(.)g(.)g(.)h(.)f(.)45 b Ff(29)2031 4526 y(State)26 b(k)n(eyw)n(ord)18 b Fe(.)13 b(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g (.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.) -f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)45 b Ff(78)2031 4643 +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(119)2031 4759 y(Status)25 b(of)i(a)f(\014le)13 +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(35)2031 4875 y(Status)25 b(of)i(a)f(mo)r(dule)c +(.)g(.)g(.)40 b Ff(33)2031 4875 y(Status)25 b(of)i(a)f(mo)r(dule)c Fe(.)13 b(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g (.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)50 b Ff(138)2031 4991 y(stic)n(ky)25 b(date)7 b Fe(.)13 @@ -11169,7 +11179,7 @@ b(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h 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(51)2031 5224 +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 @@ -11181,53 +11191,53 @@ g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g 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(89)0 483 y(Sub)r(directories)20 +(.)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(57)0 599 y(Supp)r(ort,)25 b(getting)h(CVS)g(supp)r +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(link,)h(imp)r(orting)15 b Fe(.)e(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f (.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)42 -b Ff(112)0 831 y(Sym)n(b)r(olic)25 b(name)f(\(tag\))9 +b Ff(114)0 831 y(Sym)n(b)r(olic)25 b(name)f(\(tag\))9 b Fe(.)14 b(.)f(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g (.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)36 -b Ff(47)0 948 y(Syn)n(tax)24 b(of)j(info)f(\014les)11 +b Ff(48)0 948 y(Syn)n(tax)24 b(of)j(info)f(\014les)11 b Fe(.)j(.)f(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.) g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)38 b Ff(141)0 1163 y Fm(T)0 1296 y Ff(T)-6 b(ag)26 b(\(sub)r(command\))14 b Fe(.)e(.)h(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.) g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)41 -b Ff(120)0 1413 y(T)-6 b(ag)26 b(program)c Fe(.)14 b(.)f(.)g(.)g(.)g(.) +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(47)0 1645 y(tag,)27 +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(48)0 1877 y(T)-6 b(ag,)27 b(sym)n(b)r(olic)e(name)8 +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(47)0 1994 y(taginfo)24 b Fe(.)13 b(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g +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(75)0 2110 y(T)-6 b(ags)9 b Fe(.)14 b(.)g(.)f(.)g(.)g(.)g(.)g(.)g +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(.) 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 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(51)0 2342 y(tc,)26 b(T)-6 -b(rivial)27 b(Compiler)f(\(example\))18 b Fe(.)11 b(.)i(.)h(.)f(.)g(.)g -(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)44 -b Ff(11)0 2459 y(T)-6 b(eam)25 b(of)i(dev)n(elop)r(ers)20 +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(35)0 2575 y(TEMP)22 b Fe(.)14 b(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.) +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 @@ -11237,16 +11247,16 @@ 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(65)0 +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(92)0 3156 y(timezone,)26 b(in)f(input)18 b Fe(.)13 +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(93)0 3272 y(timezone,)26 b(in)f(output)10 b Fe(.)j(.)g(.)g(.)g(.)g +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(113)0 3388 y(TMP)13 +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 @@ -11255,135 +11265,135 @@ g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)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(91)0 3737 y(T)-6 b(race)11 +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(92)0 +(.)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(.)h(.)f(.)g(.)g(.)g(.)g(.)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(75)0 3970 y(T)-6 b(rac)n(king)26 b(sources)13 b +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(65)0 4086 y(T)-6 b(ransactions,)27 b(atomic,)g(lac)n(k)e(of)14 +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(41)0 4202 y(T)-6 b(rivial)27 -b(Compiler)f(\(example\))21 b Fe(.)13 b(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f -(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)48 -b Ff(11)0 4318 y(T)n(ypical)26 b(rep)r(ository)20 b Fe(.)13 +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(15)0 4534 y Fm(U)0 4667 y Ff(umask,)25 b(for)h(rep)r(ository)h +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(18)0 4783 y(Undoing)25 b(a)h(c)n(hange)8 b Fe(.)14 +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(55)0 4899 y(unedit)25 b(\(sub)r(command\))7 b Fe(.)k(.)i(.)g(.)g +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(44)0 5016 y(Unkno)n(wn)14 +h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)34 b Ff(42)0 5016 y(Unkno)n(wn)14 b Fe(.)e(.)h(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.) f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g -(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)40 b Ff(36)2031 366 y(unreserv)n(ed)25 +(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)40 b Ff(34)2031 366 y(unreserv)n(ed)25 b(c)n(hec)n(k)n(outs)8 b Fe(.)k(.)h(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g (.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.) -f(.)g(.)34 b Ff(35)2031 483 y(Up-to-date)7 b Fe(.)12 +f(.)g(.)34 b Ff(33)2031 483 y(Up-to-date)7 b Fe(.)12 b(.)h(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g (.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.) -f(.)g(.)g(.)g(.)g(.)34 b Ff(35)2031 599 y(Up)r(date)25 +f(.)g(.)g(.)g(.)g(.)34 b Ff(33)2031 599 y(Up)r(date)25 b(\(sub)r(command\))20 b Fe(.)13 b(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g (.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)49 -b Ff(122)2031 715 y(Up)r(date)25 b(program)12 b Fe(.)i(.)f(.)g(.)g(.)g +b Ff(123)2031 715 y(Up)r(date)25 b(program)12 b Fe(.)i(.)f(.)g(.)g(.)g (.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.) g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)39 b Ff(138)2031 831 y(up)r(date,)25 b(in)n(tro)r(duction)14 b Fe(.)f(.)g(.)g(.)h(.)f(.) g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g -(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)40 b Ff(36)2031 948 y(Up)r(dating)25 +(.)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(.)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 1064 y(USER)15 +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(25)2031 1296 y(users)26 b(\(admin)f(\014le\))16 +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(43)2031 1551 y Fm(V)2031 1684 y Ff(V)-6 b(endor)18 +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(65)2031 +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(65)2031 1916 y(v)n(erifymsg)25 b(\(admin)g(\014le\))e +Ff(67)2031 1916 y(v)n(erifymsg)25 b(\(admin)g(\014le\))e Fe(.)13 b(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f (.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)50 b Ff(142)2031 2032 y(v)n(ersions,)26 b(of)h(CVS)14 b Fe(.)f(.)g(.)g(.)g(.)g(.)h(.)f (.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.) -g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)41 b Ff(85)2031 +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(10)2031 2265 y(Viewing)27 +(.)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(13)2031 2520 y Fm(W)2031 2652 y Ff(w)n(atc)n(h)26 +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(42)2031 2769 y(w)n(atc)n(h)26 b(o\013)g(\(sub)r(command\))12 +b Ff(40)2031 2769 y(w)n(atc)n(h)26 b(o\013)g(\(sub)r(command\))12 b Fe(.)f(.)i(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.) -g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)39 b Ff(42)2031 +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(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.) -h(.)f(.)g(.)g(.)g(.)40 b Ff(42)2031 3001 y(w)n(atc)n(h)26 +h(.)f(.)g(.)g(.)g(.)40 b Ff(40)2031 3001 y(w)n(atc)n(h)26 b(remo)n(v)n(e)e(\(sub)r(command\))19 b Fe(.)13 b(.)g(.)g(.)g(.)h(.)f (.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)47 -b Ff(43)2031 3117 y(w)n(atc)n(hers)26 b(\(sub)r(command\))18 +b Ff(41)2031 3117 y(w)n(atc)n(hers)26 b(\(sub)r(command\))18 b Fe(.)13 b(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f -(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)46 b Ff(45)2031 +(.)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(.)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(41)2031 3350 y(Wdi\013)25 b(\(imp)r(ort)g(example\))10 +b Ff(39)2031 3350 y(Wdi\013)25 b(\(imp)r(ort)g(example\))10 b Fe(.)j(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.) -g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)37 b Ff(65)2031 +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 b Fe(.)k(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.) 36 b Ff(147)2031 3582 y(What)25 b(\(shell)i(command\))7 b Fe(.)k(.)i(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.) g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)34 b -Ff(78)2031 3698 y(What)25 b(branc)n(hes)h(are)g(go)r(o)r(d)h(for)9 +Ff(80)2031 3698 y(What)25 b(branc)n(hes)h(are)g(go)r(o)r(d)h(for)9 b Fe(.)14 b(.)f(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f -(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)35 b Ff(49)2031 3815 y(What)25 +(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)35 b Ff(50)2031 3815 y(What)25 b(is)i(CVS?)18 b Fe(.)12 b(.)i(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g (.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.) g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)45 b Ff(5)2031 3931 y(When)25 b(to)h(commit)7 b Fe(.)12 b(.)h(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g (.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.) -f(.)g(.)g(.)g(.)g(.)34 b Ff(87)2031 4047 y(W)-6 b(ork-session,)26 -b(example)f(of)6 b Fe(.)15 b(.)e(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.) -g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)33 -b Ff(11)2031 4163 y(W)-6 b(orking)25 b(cop)n(y)9 b Fe(.)k(.)h(.)f(.)g -(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.) -g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)36 -b Ff(35)2031 4280 y(W)-6 b(orking)25 b(cop)n(y)-6 b(,)26 +f(.)g(.)g(.)g(.)g(.)34 b Ff(89)2031 4047 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(remo)n(ving)c Fe(.)13 b(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h (.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)50 -b Ff(12)2031 4396 y(W)-6 b(rapp)r(ers)9 b Fe(.)k(.)g(.)g(.)g(.)h(.)f(.) +b Ff(10)2031 4396 y(W)-6 b(rapp)r(ers)9 b Fe(.)k(.)g(.)g(.)g(.)h(.)f(.) g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g (.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)36 b Ff(139)2031 4512 y(writers)27 b(\(admin)d(\014le\))19 b Fe(.)13 b(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g (.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)45 -b Ff(28)2031 4767 y Fm(Z)2031 4899 y Ff(zone,)26 b(time,)g(in)f(input) +b Ff(26)2031 4767 y Fm(Z)2031 4899 y Ff(zone,)26 b(time,)g(in)f(input) 13 b Fe(.)f(.)h(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g (.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)39 -b Ff(93)2031 5016 y(zone,)26 b(time,)g(in)f(output)20 +b Ff(95)2031 5016 y(zone,)26 b(time,)g(in)f(output)20 b Fe(.)13 b(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g (.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)48 -b Ff(113)p eop +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 599 y Fc(Ab)s(out)j(this)h(man)m(ual)17 b Fb(.)h(.)i(.)g(.)g(.)f(.)h(.) @@ -11393,88 +11403,83 @@ g(.)49 b Fc(1)0 732 y(1)156 b(What)33 b(is)f(CVS?)38 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(.)70 b Fc(5)0 865 y(2)156 -b(Basic)32 b(concepts)k 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(.)f(.)h(.)g(.)66 -b Fc(9)0 997 y(3)156 b(A)32 b(sample)g(session)17 b Fb(.)j(.)g(.)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 -(.)48 b Fc(11)0 1130 y(4)156 b(The)33 b(Rep)s(ository)17 -b Fb(.)j(.)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(.)49 b Fc(15)0 1263 y(5)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(31)0 1396 y(6)156 b(Multiple)31 b(dev)m(elop)s(ers)15 -b Fb(.)21 b(.)f(.)f(.)h(.)g(.)g(.)f(.)h(.)g(.)g(.)g(.)f(.)h(.)g(.)g(.)g +b(A)32 b(sample)g(session)13 b Fb(.)21 b(.)f(.)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(.)45 +b Fc(9)0 997 y(3)156 b(The)33 b(Rep)s(ository)17 b Fb(.)j(.)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(.)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) +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 +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 +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 +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 +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(.)47 b Fc(35)0 1529 y(7)156 b(Branc)m(hes)16 -b Fb(.)21 b(.)f(.)g(.)g(.)f(.)h(.)g(.)g(.)g(.)f(.)h(.)g(.)g(.)g(.)f(.)h +g(.)g(.)f(.)h(.)g(.)g(.)g(.)f(.)43 b Fc(61)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 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 +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 +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 +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(.)g(.)g(.)g(.)f(.)h(.)g(.)g(.)g(.)f(.)h(.)48 b -Fc(47)0 1662 y(8)156 b(Merging)34 b Fb(.)20 b(.)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 +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(.)f(.)h(.)g(.)g(.)g(.)f(.)h(.)g(.)g(.)g(.)f(.)h -(.)g(.)g(.)g(.)66 b Fc(53)0 1794 y(9)156 b(Recursiv)m(e)34 -b(b)s(eha)m(vior)29 b Fb(.)19 b(.)h(.)g(.)g(.)g(.)f(.)h(.)g(.)g(.)g(.)f -(.)h(.)g(.)g(.)g(.)f(.)h(.)g(.)g(.)g(.)f(.)h(.)g(.)g(.)f(.)h(.)g(.)g(.) -g(.)f(.)h(.)g(.)g(.)g(.)f(.)h(.)g(.)61 b Fc(57)0 1927 -y(10)107 b(Adding)32 b(\014les)h(to)f(a)g(directory)11 -b Fb(.)20 b(.)g(.)f(.)h(.)g(.)g(.)g(.)f(.)h(.)g(.)g(.)g(.)f(.)h(.)g(.)g -(.)f(.)h(.)g(.)g(.)g(.)f(.)h(.)g(.)g(.)g(.)f(.)h(.)g(.)g(.)g(.)f(.)43 -b Fc(59)0 2060 y(11)107 b(Remo)m(ving)31 b(\014les)11 -b Fb(.)20 b(.)g(.)g(.)g(.)g(.)f(.)h(.)g(.)g(.)g(.)f(.)h(.)g(.)g(.)f(.)h -(.)g(.)g(.)g(.)f(.)h(.)g(.)g(.)g(.)f(.)h(.)g(.)g(.)g(.)f(.)h(.)g(.)g(.) -g(.)f(.)h(.)g(.)g(.)f(.)h(.)g(.)43 b Fc(61)0 2193 y(12)107 -b(Remo)m(ving)31 b(directories)12 b Fb(.)20 b(.)g(.)g(.)f(.)h(.)g(.)g -(.)g(.)f(.)h(.)g(.)g(.)g(.)f(.)h(.)g(.)g(.)g(.)f(.)h(.)g(.)g(.)f(.)h(.) -g(.)g(.)g(.)f(.)h(.)g(.)g(.)g(.)f(.)h(.)g(.)g(.)44 b -Fc(63)0 2326 y(13)107 b(T)-8 b(rac)m(king)33 b(third-part)m(y)f -(sources)22 b Fb(.)f(.)e(.)h(.)g(.)g(.)g(.)f(.)h(.)g(.)g(.)g(.)f(.)h(.) -g(.)g(.)f(.)h(.)g(.)g(.)g(.)f(.)h(.)g(.)g(.)g(.)f(.)h(.)g(.)g(.)g(.)53 -b Fc(65)0 2459 y(14)107 b(Mo)m(ving)32 b(and)h(renaming)e(\014les)k -Fb(.)20 b(.)g(.)f(.)h(.)g(.)g(.)g(.)f(.)h(.)g(.)g(.)f(.)h(.)g(.)g(.)g -(.)f(.)h(.)g(.)g(.)g(.)f(.)h(.)g(.)g(.)g(.)f(.)h(.)g(.)g(.)f(.)67 -b Fc(69)0 2591 y(15)107 b(Mo)m(ving)32 b(and)h(renaming)e(directories) -36 b Fb(.)19 b(.)h(.)g(.)g(.)g(.)f(.)h(.)g(.)g(.)g(.)f(.)h(.)g(.)g(.)g -(.)f(.)h(.)g(.)g(.)f(.)h(.)g(.)g(.)g(.)f(.)h(.)68 b Fc(73)0 -2724 y(16)107 b(History)32 b(bro)m(wsing)14 b Fb(.)21 -b(.)e(.)h(.)g(.)g(.)g(.)f(.)h(.)g(.)g(.)g(.)f(.)h(.)g(.)g(.)g(.)f(.)h -(.)g(.)g(.)f(.)h(.)g(.)g(.)g(.)f(.)h(.)g(.)g(.)g(.)f(.)h(.)g(.)g(.)g(.) -f(.)h(.)g(.)g(.)46 b Fc(75)0 2857 y(17)107 b(Keyw)m(ord)34 +g(.)g(.)f(.)h(.)g(.)g(.)46 b Fc(77)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(77)0 2990 y(18)107 +h(.)g(.)g(.)g(.)f(.)h(.)g(.)59 b Fc(79)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(81)0 -3123 y(19)107 b(Ho)m(w)33 b(y)m(our)g(build)f(system)h(in)m(teracts)g +(.)f(.)h(.)g(.)g(.)g(.)f(.)h(.)g(.)g(.)g(.)f(.)48 b Fc(83)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(83)0 3256 y(20)107 +(.)g(.)f(.)h(.)g(.)g(.)g(.)48 b Fc(85)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(85)0 -3388 y(21)107 b(Revision)32 b(managemen)m(t)21 b Fb(.)e(.)h(.)g(.)f(.)h +g(.)g(.)g(.)f(.)h(.)g(.)g(.)f(.)h(.)g(.)g(.)63 b Fc(87)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(87)0 3521 y(App)s(endix)33 b(A)99 b(Guide)32 b(to)h(CVS)g +b Fc(89)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(89)0 3654 y(App)s(endix)33 b(B)103 b(Quic)m(k)33 +b Fc(91)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 -3787 y(App)s(endix)33 b(C)102 b(Reference)34 b(man)m(ual)e(for)g(the)h +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 3920 y(App)s(endix)33 b(D)97 b(All)31 +(.)g(.)46 b Fc(137)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 -4053 y(App)s(endix)33 b(E)106 b(T)-8 b(roublesho)s(oting)24 +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 4185 y(App)s(endix)33 b(F)108 b(GNU)33 b(GENERAL)g(PUBLIC)g +b Fc(155)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 4318 y(Index)30 b Fb(.)20 b(.)g(.)f(.)h(.)g(.)g(.) +(.)h(.)70 b Fc(157)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 @@ -11506,534 +11511,532 @@ 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 -b(Basic)45 b(concepts)14 b Fb(.)19 b(.)h(.)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(.)58 b Fm(9)299 -1915 y Fs(2.1)92 b(Revision)29 b(n)m(um)m(b)s(ers)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(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.) -g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)55 b -Fs(9)299 2040 y(2.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 +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 +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(.)g(.)47 b Fs(10)0 2289 y Fm(3)135 b(A)44 b(sample)i(session)24 -b Fb(.)c(.)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(.)69 -b Fm(11)299 2445 y Fs(3.1)92 b(Getting)31 b(the)f(source)f -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(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)58 b Fs(11)299 -2569 y(3.2)92 b(Committing)29 b(y)m(our)h(c)m(hanges)15 -b Fa(.)i(.)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(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f -(.)g(.)g(.)g(.)44 b Fs(11)299 2694 y(3.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(.)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 +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(.) 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(12)299 2818 y(3.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(.)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 +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(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)45 b Fs(13)0 3067 -y Fm(4)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(15)299 -3223 y Fs(4.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(15)299 3347 y(4.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(16)598 3472 y(4.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(16)598 3597 y(4.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(18)299 3721 -y(4.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(.)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 +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 +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 +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 +(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 +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(.)g(.)43 b Fs(19)598 3846 y(4.3.1)93 b(Editing)28 -b(administrativ)m(e)h(\014les)18 b Fa(.)c(.)h(.)g(.)g(.)g(.)g(.)g(.)g -(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.) -g(.)g(.)47 b Fs(20)299 3970 y(4.4)92 b(Multiple)28 b(rep)s(ositories)9 -b Fa(.)14 b(.)h(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f +g(.)g(.)g(.)g(.)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(.)g(.)g(.)39 b Fs(20)299 4095 -y(4.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(.)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(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g -(.)g(.)45 b Fs(20)299 4219 y(4.6)92 b(Remote)32 b(rep)s(ositories)23 +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(21)598 4344 -y(4.6.1)93 b(Serv)m(er)30 b(requiremen)m(ts)12 b Fa(.)i(.)h(.)g(.)g(.)g +g(.)g(.)g(.)g(.)g(.)g(.)g(.)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(22)598 4468 y(4.6.2)93 b(Connecting)29 b(with)g(rsh)23 +Fs(20)598 3939 y(3.6.2)93 b(Connecting)29 b(with)g(rsh)23 b Fa(.)15 b(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f (.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.) -53 b Fs(22)598 4593 y(4.6.3)93 b(Direct)30 b(connection)h(with)e(passw) +53 b Fs(20)598 4064 y(3.6.3)93 b(Direct)30 b(connection)h(with)e(passw) m(ord)h(authen)m(tication)14 b Fa(.)h(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)43 -b Fs(23)897 4717 y(4.6.3.1)93 b(Setting)30 b(up)g(the)g(serv)m(er)h -(for)f(passw)m(ord)g(authen)m(tication)1104 4842 y Fa(.)15 +b 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(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g (.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.) g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)55 b -Fs(23)897 4966 y(4.6.3.2)93 b(Using)30 b(the)g(clien)m(t)g(with)f -(passw)m(ord)h(authen)m(tication)17 b Fa(.)e(.)46 b Fs(25)897 -5091 y(4.6.3.3)93 b(Securit)m(y)30 b(considerations)f(with)g(passw)m -(ord)1078 5215 y(authen)m(tication)19 b Fa(.)c(.)g(.)g(.)g(.)g(.)g(.)g +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 (.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.) -g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)48 b Fs(26)598 -5340 y(4.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(24)598 +4811 y(3.6.4)93 b(Direct)30 b(connection)h(with)e(k)m(erb)s(eros)8 b Fa(.)15 b(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g -(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)37 b Fs(27)p eop +(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)37 b Fs(25)299 4935 y(3.7)92 +b(Read-only)30 b(rep)s(ository)f(access)19 b Fa(.)e(.)e(.)g(.)g(.)g(.)g +(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.) +g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)48 b +Fs(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 +(.)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)299 83 y(4.7)92 b(Read-only)30 -b(rep)s(ository)f(access)19 b Fa(.)e(.)e(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.) -g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)h -(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)48 b Fs(28)0 332 y -Fm(5)135 b(Starting)46 b(a)f(pro)7 b(ject)46 b(with)f(CVS)17 -b Fb(.)i(.)h(.)g(.)f(.)h(.)g(.)g(.)g(.)f(.)h(.)g(.)g(.)g(.)f(.)h(.)g(.) -g(.)g(.)f(.)h(.)g(.)62 b Fm(31)299 488 y Fs(5.1)92 b(Setting)30 -b(up)f(the)i(\014les)21 b Fa(.)14 b(.)h(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)h -(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.) -g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)50 -b Fs(31)598 612 y(5.1.1)93 b(Creating)30 b(a)g(directory)g(tree)h(from) -f(a)h(n)m(um)m(b)s(er)e(of)h(\014les)18 b Fa(.)d(.)g(.)g(.)g(.)g(.)g(.) -g(.)g(.)47 b Fs(31)598 737 y(5.1.2)93 b(Creating)30 b(Files)f(F)-8 -b(rom)31 b(Other)f(V)-8 b(ersion)30 b(Con)m(trol)g(Systems)18 -b Fa(.)c(.)h(.)g(.)g(.)47 b Fs(32)598 861 y(5.1.3)93 +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 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(33)299 986 y(5.2)92 b(De\014ning)29 b(the)i(mo)s(dule)15 +g(.)44 b Fs(31)299 457 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(33)0 1235 -y Fm(6)135 b(Multiple)45 b(dev)l(elop)t(ers)22 b Fb(.)g(.)d(.)h(.)g(.)g +(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)44 b Fs(31)0 706 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(35)299 1391 y -Fs(6.1)92 b(File)30 b(status)16 b Fa(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.) +g(.)g(.)g(.)f(.)h(.)g(.)g(.)g(.)67 b Fm(33)299 861 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(35)299 1515 y(6.2)92 +g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)45 b Fs(33)299 986 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(36)299 1640 y(6.3)92 b(Con\015icts)29 +g(.)g(.)52 b Fs(34)299 1110 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(37)299 1764 y(6.4)92 b(Informing)28 b(others)j(ab)s(out)f(commits) +b Fs(35)299 1235 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(40)299 1889 y(6.5)92 b(Sev)m(eral)30 b(dev)m(elop)s(ers)g(sim)m +b Fs(38)299 1359 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(40)299 2013 y(6.6)92 +b(.)h(.)g(.)g(.)g(.)g(.)g(.)49 b Fs(38)299 1484 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(41)598 2138 y(6.6.1)93 +g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)39 b Fs(39)598 1609 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(42)598 2262 y(6.6.2)93 b(T)-8 +g(.)g(.)g(.)h(.)f(.)43 b Fs(40)598 1733 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(42)598 -2387 y(6.6.3)93 b(Ho)m(w)31 b(to)g(edit)f(a)g(\014le)g(whic)m(h)f(is)g +(.)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 (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(44)598 2511 y(6.6.4)93 +(.)g(.)g(.)g(.)g(.)g(.)45 b Fs(42)598 1982 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(45)598 2636 y(6.6.5)93 b(Using)29 b(w)m(atc)m(hes)j(with)d(old)h +b Fs(43)598 2107 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(45)299 2760 y(6.7)92 +(.)g(.)g(.)g(.)g(.)g(.)g(.)52 b Fs(43)299 2231 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(46)0 3010 y Fm(7)135 b(Branc)l(hes)30 -b Fb(.)19 b(.)h(.)g(.)g(.)f(.)h(.)g(.)g(.)g(.)f(.)h(.)g(.)g(.)g(.)f(.)h -(.)g(.)g(.)g(.)f(.)h(.)g(.)g(.)f(.)h(.)g(.)g(.)g(.)f(.)h(.)g(.)g(.)g(.) -f(.)h(.)g(.)g(.)g(.)f(.)h(.)g(.)75 b Fm(47)299 3165 y -Fs(7.1)92 b(T)-8 b(ags{Sym)m(b)s(olic)30 b(revisions)21 +g(.)g(.)g(.)48 b Fs(44)0 2480 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 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 +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 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 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 3290 y(7.2)92 b(What)31 +g(.)g(.)g(.)g(.)g(.)53 b Fs(47)299 3134 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(49)299 3414 y(7.3)92 b(Creating)30 b(a)h(branc)m(h)16 +Fs(50)299 3259 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 -3539 y(7.4)92 b(Stic)m(ky)30 b(tags)g Fa(.)15 b(.)g(.)g(.)g(.)g(.)g(.)g +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(.)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(51)0 3788 -y Fm(8)135 b(Merging)25 b Fb(.)20 b(.)g(.)f(.)h(.)g(.)g(.)f(.)h(.)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(53)299 3944 y Fs(8.1)92 b(Merging)30 b(an)h(en)m(tire)f(branc)m(h) +b Fm(55)299 3788 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(53)299 4068 y(8.2)92 b(Merging)30 +g(.)g(.)g(.)g(.)g(.)52 b Fs(55)299 3912 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(54)299 4193 y(8.3)92 b(Merging)30 +g(.)g(.)g(.)g(.)g(.)42 b Fs(56)299 4037 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(55)299 4317 y(8.4)92 b(Merging)30 +(.)g(.)g(.)47 b Fs(57)299 4161 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(55)0 4566 y Fm(9)135 b(Recursiv)l(e)46 b(b)t(eha)l(vior)16 +b Fs(57)0 4411 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(57)0 4846 y(10)135 b(Adding)44 b(\014les)h(to)h(a)f(directory)17 -b Fb(.)j(.)g(.)g(.)g(.)g(.)f(.)h(.)g(.)g(.)g(.)f(.)h(.)g(.)g(.)f(.)h(.) -g(.)g(.)g(.)f(.)h(.)g(.)62 b Fm(59)0 5127 y(11)135 b(Remo)l(ving)46 -b(\014les)31 b Fb(.)20 b(.)g(.)f(.)h(.)g(.)g(.)f(.)h(.)g(.)g(.)g(.)f(.) -h(.)g(.)g(.)g(.)f(.)h(.)g(.)g(.)g(.)f(.)h(.)g(.)g(.)g(.)f(.)h(.)g(.)g -(.)f(.)h(.)g(.)g(.)75 b Fm(61)p eop +b Fm(59)0 4691 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(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(63)0 363 y(13)135 b(T)-11 b(rac)l(king)45 b(third-part)l(y)g -(sources)12 b Fb(.)20 b(.)g(.)g(.)f(.)h(.)g(.)g(.)f(.)h(.)g(.)g(.)g(.)f -(.)h(.)g(.)g(.)g(.)f(.)h(.)g(.)57 b Fm(65)299 519 y Fs(13.1)92 -b(Imp)s(orting)29 b(a)i(mo)s(dule)d(for)j(the)f(\014rst)g(time)19 -b Fa(.)c(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.) -g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)48 b Fs(65)299 643 -y(13.2)92 b(Up)s(dating)29 b(a)i(mo)s(dule)e(with)g(the)i(imp)s(ort)d -(command)10 b Fa(.)15 b(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g -(.)g(.)g(.)g(.)g(.)39 b Fs(66)299 768 y(13.3)92 b(Rev)m(erting)31 +-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 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(66)299 892 y(13.4)92 b(Ho)m(w)31 +g(.)g(.)g(.)45 b Fs(68)299 612 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(67)0 1142 y Fm(14)135 b(Mo)l(ving)45 +g(.)g(.)g(.)g(.)44 b Fs(69)0 861 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(69)299 1297 y Fs(14.1)92 b(The)30 b(Normal)g(w)m(a)m(y)i(to)f +b Fm(71)299 1017 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(69)299 1422 y(14.2)92 b(Mo)m(ving)31 +g(.)g(.)g(.)56 b Fs(71)299 1142 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(69)299 1546 y(14.3)92 b(Cop)m(ying)30 b(the)h(history)e(\014le)14 +b Fs(71)299 1266 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(70)0 1795 y Fm(15)135 b(Mo)l(ving)45 +(.)g(.)g(.)g(.)g(.)43 b Fs(72)0 1515 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(73)0 2076 -y(16)135 b(History)46 b(bro)l(wsing)11 b Fb(.)20 b(.)g(.)g(.)g(.)g(.)f +(.)f(.)h(.)g(.)g(.)f(.)h(.)g(.)g(.)58 b Fm(75)0 1795 +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(75)299 2231 -y Fs(16.1)92 b(Log)31 b(messages)22 b Fa(.)17 b(.)e(.)g(.)g(.)g(.)g(.)g +g(.)f(.)h(.)g(.)g(.)f(.)h(.)g(.)g(.)56 b Fm(77)299 1951 +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(75)299 2356 y(16.2)92 +(.)g(.)g(.)g(.)g(.)g(.)52 b Fs(77)299 2076 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(75)299 2480 y(16.3)92 b(User-de\014ned)30 b(logging)15 +b Fs(77)299 2200 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(75)299 2605 y(16.4)92 +(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)44 b Fs(77)299 2325 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(76)0 2854 y Fm(17)135 b(Keyw)l(ord)46 b(substitution)16 +b Fs(78)0 2574 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(77)299 -3010 y Fs(17.1)92 b(R)m(CS)30 b(Keyw)m(ords)10 b Fa(.)15 +(.)g(.)f(.)h(.)g(.)g(.)f(.)h(.)g(.)g(.)g(.)f(.)62 b Fm(79)299 +2729 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(77)299 -3134 y(17.2)92 b(Using)30 b(k)m(eyw)m(ords)22 b Fa(.)15 +g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)39 b Fs(79)299 +2854 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(78)299 -3259 y(17.3)92 b(Av)m(oiding)30 b(substitution)9 b Fa(.)j(.)j(.)g(.)g +g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)51 b Fs(80)299 +2978 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(79)299 3383 y(17.4)92 b(Substitution)28 +(.)g(.)38 b Fs(81)299 3103 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(79)299 3508 y(17.5)92 b(Problems)29 b(with)g(the)i($Log: cvs.ps,v $ -Fs(79)299 3508 y(17.5)92 b(Problems)29 b(with)g(the)i(Revision 1.1.1.7 1997/03/18 02:05:33 tholo -Fs(79)299 3508 y(17.5)92 b(Problems)29 b(with)g(the)i(Files missed from previous import -Fs(79)299 3508 y(17.5)92 b(Problems)29 b(with)g(the)i()h(k)m(eyw)m +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 (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(80)0 3757 y Fm(18)135 b(Handling)45 b(binary)g(\014les)11 +b Fs(82)0 3477 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(81)0 4037 y(19)135 b(Ho)l(w)46 b(y)l(our)f(build)f(system)i(in)l +b Fm(83)0 3757 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(83)0 4317 y(20)135 b(Compatibilit)l(y)47 b(b)t(et)l(w)l(een)f(CVS) +b Fm(85)0 4037 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(85)0 4597 y(21)135 b(Revision)46 b(managemen)l(t)40 +78 b Fm(87)0 4317 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(87)299 -4753 y Fs(21.1)92 b(When)31 b(to)g(commit?)16 b Fa(.)f(.)g(.)g(.)g(.)g +(.)h(.)g(.)g(.)g(.)f(.)h(.)g(.)g(.)f(.)h(.)83 b Fm(89)299 +4473 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(87)p eop -%%Page: -6 178 --6 177 bop 0 -116 a Fs(vi)2427 b(CVS|Concurren)m(t)29 -b(V)-8 b(ersions)30 b(System)0 83 y Fm(App)t(endix)44 -b(A)134 b(Guide)44 b(to)i(CVS)e(commands)30 b Fb(.)20 -b(.)g(.)g(.)f(.)h(.)g(.)g(.)g(.)f(.)h(.)g(.)g(.)75 b -Fm(89)299 239 y Fs(A.1)92 b(Ov)m(erall)29 b(structure)h(of)h(CVS)e -(commands)g Fa(.)15 b(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g -(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)58 -b Fs(89)299 363 y(A.2)92 b(Default)30 b(options)g(and)g(the)g -Fn(~)p Fs(/.cvsrc)h(\014le)10 b Fa(.)k(.)h(.)g(.)g(.)g(.)g(.)g(.)g(.)g -(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.) -g(.)39 b Fs(89)299 488 y(A.3)92 b(Global)29 b(options)9 -b Fa(.)15 b(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g -(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.) -g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)39 -b Fs(91)299 612 y(A.4)92 b(Common)30 b(command)g(options)13 +(.)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 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(92)299 737 y(A.5)92 b(admin|Administration)26 +(.)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 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(95)598 861 y(A.5.1)92 b(admin)29 b(options)d Fa(.)15 +b Fs(97)598 208 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(95)598 986 y(A.5.2)92 b(admin)29 -b(examples)11 b Fa(.)k(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g -(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.) -g(.)g(.)g(.)g(.)g(.)g(.)g(.)40 b Fs(98)897 1110 y(A.5.2.1)93 -b(Outdating)29 b(is)h(dangerous)24 b Fa(.)15 b(.)g(.)g(.)g(.)g(.)g(.)g -(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)54 -b Fs(98)897 1235 y(A.5.2.2)93 b(Commen)m(t)31 b(leaders)16 -b Fa(.)e(.)h(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.) -g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)45 b Fs(98)299 -1359 y(A.6)92 b(c)m(hec)m(k)m(out|Chec)m(k)33 b(out)d(sources)h(for)f -(editing)19 b Fa(.)14 b(.)h(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g -(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)48 b Fs(99)598 -1484 y(A.6.1)92 b(c)m(hec)m(k)m(out)33 b(options)20 b -Fa(.)14 b(.)h(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g +g(.)g(.)g(.)55 b Fs(97)598 332 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(.)50 b Fs(100)598 1609 y(A.6.2)92 b(c)m(hec)m(k)m(out)33 +g(.)g(.)g(.)g(.)g(.)h(.)39 b Fs(100)897 457 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 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 +(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 +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 b(examples)26 b Fa(.)15 b(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g (.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.) -g(.)g(.)g(.)g(.)56 b Fs(101)299 1733 y(A.7)92 b(commit|Chec)m(k)30 +g(.)g(.)g(.)g(.)56 b Fs(103)299 1079 y(A.7)92 b(commit|Chec)m(k)30 b(\014les)g(in)m(to)g(the)h(rep)s(ository)23 b Fa(.)14 b(.)h(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g -(.)g(.)g(.)g(.)g(.)53 b Fs(101)598 1858 y(A.7.1)92 b(commit)31 +(.)g(.)g(.)g(.)g(.)53 b Fs(103)598 1204 y(A.7.1)92 b(commit)31 b(options)21 b Fa(.)14 b(.)h(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.) g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g -(.)g(.)g(.)g(.)g(.)g(.)g(.)51 b Fs(102)598 1982 y(A.7.2)92 +(.)g(.)g(.)g(.)g(.)g(.)g(.)51 b Fs(104)598 1328 y(A.7.2)92 b(commit)31 b(examples)c Fa(.)15 b(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g (.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.) -g(.)g(.)g(.)g(.)g(.)g(.)g(.)57 b Fs(103)897 2107 y(A.7.2.1)93 -b(New)30 b(ma)5 b(jor)31 b(release)f(n)m(um)m(b)s(er)21 -b Fa(.)15 b(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g -(.)g(.)51 b Fs(103)897 2231 y(A.7.2.2)93 b(Committing)29 -b(to)i(a)g(branc)m(h)26 b Fa(.)15 b(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g -(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)56 b Fs(104)897 -2356 y(A.7.2.3)93 b(Creating)30 b(the)g(branc)m(h)g(after)h(editing)23 -b Fa(.)14 b(.)h(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)53 -b Fs(104)299 2480 y(A.8)92 b(di\013|Run)28 b(di\013s)h(b)s(et)m(w)m +g(.)g(.)g(.)g(.)g(.)g(.)g(.)57 b Fs(105)897 1453 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) +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 (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(105)598 2605 y(A.8.1)92 b(di\013)29 b(options)20 +(.)42 b Fs(106)598 1826 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(105)598 2729 y(A.8.2)92 +g(.)g(.)g(.)h(.)f(.)g(.)g(.)49 b Fs(107)598 1951 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(106)299 -2854 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(108)299 +2076 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(107)598 2978 y(A.9.1)92 b(exp)s(ort)30 +(.)g(.)56 b Fs(108)598 2200 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(107)299 3103 y(A.10)92 +(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)49 b Fs(109)299 2325 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(108)598 3227 y(A.10.1)93 +(.)g(.)g(.)g(.)g(.)g(.)g(.)54 b Fs(110)598 2449 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(108)299 -3352 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(110)299 +2574 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(110)598 3477 y(A.11.1)93 b(imp)s(ort)28 b(options)12 +b Fs(112)598 2698 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(111)598 3601 y(A.11.2)93 b(imp)s(ort)28 +(.)g(.)g(.)42 b Fs(113)598 2823 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(112)598 3726 y(A.11.3)93 +g(.)g(.)g(.)g(.)g(.)g(.)52 b Fs(113)598 2947 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(112)299 3850 +g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)48 b Fs(114)299 3072 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(113)598 3975 y(A.12.1)93 +(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)55 b Fs(114)598 3196 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(113)598 4099 y(A.12.2)93 b(log)30 b(examples)10 b +Fs(114)598 3321 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(114)299 4224 y(A.13)92 b(rdi\013|'patc)m +g(.)h(.)f(.)g(.)g(.)39 b Fs(116)299 3445 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(115)598 4348 y(A.13.1)93 b(rdi\013)28 +(.)g(.)g(.)g(.)39 b Fs(116)598 3570 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(115)598 4473 +(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)52 b Fs(117)598 3694 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(116)299 4597 y(A.14)92 b(release|Indicate)30 b(that)h(a)g(Mo)s(dule) +Fs(117)299 3819 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(116)598 4722 y(A.14.1)93 b(release)30 +(.)g(.)g(.)g(.)44 b Fs(118)598 3944 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(117)598 4846 y(A.14.2)93 +g(.)g(.)g(.)h(.)f(.)g(.)45 b Fs(118)598 4068 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(117)598 4971 +g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)56 b Fs(119)598 4193 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(118)299 -5095 y(A.15)92 b(rtag|Add)30 b(a)h(sym)m(b)s(olic)e(tag)i(to)h(a)e(mo)s +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 (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(118)598 5220 +g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)53 b Fs(120)598 4442 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(119)p eop -%%Page: -7 179 --7 178 bop 3802 -116 a Fs(vii)299 203 y(A.16)92 b(status|Displa)m(y)30 -b(status)h(information)d(on)j(c)m(hec)m(k)m(ed)h(out)f(\014les)20 -b Fa(.)13 b(.)i(.)g(.)g(.)g(.)h(.)f(.)49 b Fs(119)598 -328 y(A.16.1)93 b(status)30 b(options)e Fa(.)15 b(.)g(.)g(.)g(.)g(.)g +b Fs(120)299 4566 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(120)299 452 y(A.17)92 b(tag|Add)31 b(a)g(sym)m(b)s(olic)d(tag)k +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(120)598 577 +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 (.)g(.)g(.)g(.)g(.)g(.)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(121)299 701 y(A.18)92 b(up)s(date|Bring)29 b(w)m(ork)h(tree)h(in)e -(sync)h(with)g(rep)s(ository)16 b Fa(.)e(.)h(.)g(.)g(.)g(.)g(.)g(.)g(.) -g(.)g(.)g(.)g(.)g(.)46 b Fs(122)598 826 y(A.18.1)93 b(up)s(date)29 -b(options)10 b Fa(.)k(.)i(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g +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(.)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(.)g(.)g(.)g(.)g(.)h(.)39 b Fs(122)598 950 y(A.18.2)93 -b(up)s(date)29 b(output)20 b Fa(.)15 b(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g -(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.) -g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)50 b Fs(124)598 -1075 y(A.18.3)93 b(up)s(date)29 b(examples)16 b Fa(.)f(.)g(.)g(.)g(.)g -(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)h(.)f(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.) -g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)g(.)46 b -Fs(125)0 1324 y Fm(App)t(endix)e(B)134 b(Quic)l(k)45 -b(reference)h(to)f(CVS)f(commands)25 b Fb(.)20 b(.)70 -b Fm(127)0 1604 y(App)t(endix)44 b(C)134 b(Reference)46 -b(man)l(ual)g(for)f(the)h(Administrativ)l(e)269 1729 -y(\014les)34 b Fb(.)20 b(.)g(.)g(.)f(.)h(.)g(.)g(.)f(.)h(.)g(.)g(.)g(.) -f(.)h(.)g(.)g(.)g(.)f(.)h(.)g(.)g(.)g(.)f(.)h(.)g(.)g(.)g(.)f(.)h(.)g -(.)g(.)f(.)h(.)g(.)g(.)g(.)f(.)h(.)g(.)g(.)g(.)f(.)h(.)g(.)78 -b Fm(137)299 1884 y Fs(C.1)91 b(The)30 b(mo)s(dules)f(\014le)14 +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 +(.)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 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 -2009 y(C.2)91 b(The)30 b(cvswrapp)s(ers)f(\014le)20 b +1017 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 2133 y(C.3)91 +g(.)h(.)f(.)g(.)g(.)g(.)g(.)49 b Fs(139)299 1142 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 2258 y(C.3.1)92 b(The)30 b(common)g(syn)m(tax)11 +b Fs(140)598 1266 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 2382 y(C.4)91 b(Commitinfo)21 b Fa(.)14 +b Fs(141)299 1391 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 2507 y(C.5)91 b(V)-8 b(erifying)29 b(log)i(messages)d +b Fs(141)299 1515 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 2631 y(C.6)91 b(Editinfo)10 +g(.)g(.)g(.)g(.)g(.)57 b Fs(142)299 1640 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 2756 y(C.6.1)92 b(Editinfo)28 b(example)13 +g(.)40 b Fs(143)598 1764 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 2880 y(C.7)91 b(Loginfo)23 b Fa(.)15 +(.)g(.)43 b Fs(144)299 1889 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 3005 y(C.7.1)92 b(Loginfo)30 b(example)25 +b Fs(145)598 2013 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 3130 y(C.7.2)92 b(Keeping)29 +g(.)g(.)56 b Fs(147)598 2138 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 3254 y(C.8)91 b(Rcsinfo)25 b +g(.)g(.)44 b Fs(147)299 2262 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 3379 y(C.9)91 b(Ignoring)30 b(\014les)f(via)h +(.)g(.)55 b Fs(148)299 2387 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 3503 y(C.10)92 b(The)29 +g(.)g(.)h(.)f(.)58 b Fs(148)299 2511 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 3628 y(C.11)92 b(Expansions)28 b(in)h(administrativ)m(e)g +b Fs(149)299 2636 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 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 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 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 -4281 y(App)t(endix)44 b(E)134 b(T)-11 b(roublesho)t(oting)27 +3290 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 4437 y Fs(E.1)91 +(.)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 4686 y Fm(App)t(endix)44 b(F)134 -b(GNU)45 b(GENERAL)g(PUBLIC)g(LICENSE)304 4811 y Fb(.)20 +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 4966 y Fs(Pream)m(ble)13 b Fa(.)h(.)h(.)g(.)g(.)g(.)g(.)g +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 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 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 -5340 y(Ho)m(w)31 b(to)g(Apply)e(These)h(T)-8 b(erms)30 +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)p -eop +(.)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)0 366 y Fm(Index)i Fb(.)19 -b(.)h(.)g(.)g(.)g(.)f(.)h(.)g(.)g(.)g(.)f(.)h(.)g(.)g(.)g(.)f(.)h(.)g -(.)g(.)f(.)h(.)g(.)g(.)g(.)f(.)h(.)g(.)g(.)g(.)f(.)h(.)g(.)g(.)g(.)f(.) -h(.)g(.)g(.)g(.)f(.)h(.)g(.)g(.)f(.)h(.)g(.)g(.)76 b -Fm(165)p eop +b(V)-8 b(ersions)30 b(System)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 15f08b22fde..494d19a6579 100644 --- a/gnu/usr.bin/cvs/doc/cvsclient.aux +++ b/gnu/usr.bin/cvs/doc/cvsclient.aux @@ -32,7 +32,7 @@ 'xrdef {Responses-pg}{13} 'xrdef {Responses-snt}{Section'tie5.5} 'xrdef {Example-title}{Example} -'xrdef {Example-pg}{16} +'xrdef {Example-pg}{17} 'xrdef {Example-snt}{Section'tie5.6} 'xrdef {Requirements-title}{Required versus optional parts of the protocol} 'xrdef {Requirements-pg}{19} diff --git a/gnu/usr.bin/cvs/doc/cvsclient.info b/gnu/usr.bin/cvs/doc/cvsclient.info index db2065dda9e..79771c281f7 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.4 of the protocol +regular CVS manual for that. This is version 1.9.6 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.4 of the protocol specification. This version + This is version 1.9.6 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 @@ -425,11 +425,20 @@ compressed form) ends with a newline. `Case \n' Response expected: no. Tell the server that filenames should be - matched against ignore patterns in a case-insensitive fashion. - Note that this does not apply to other comparisons--for example - the filenames given in `Entry' and `Modified' requests for the - same file must match in case regardless of whether the `Case' - request is sent. + matched in a case-insensitive fashion. Note that this is not the + primary mechanism for achieving case-insensitivity; for the most + part the client keeps track of the case which the server wants to + use and takes care to always use that case regardless of what the + user specifies. For example the filenames given in `Entry' and + `Modified' requests for the same file must match in case + regardless of whether the `Case' request is sent. The latter + mechanism is more general (it could also be used for 8.3 + filenames, VMS filenames with more than one `.', and any other + situation in which there is a predictable mapping between + filenames in the working directory and filenames in the protocol), + but there are some situations it cannot handle (ignore patterns, or + situations where the user specifies a filename and the client does + not know about that file). `Argument TEXT \n' Response expected: no. Save argument for use in a subsequent @@ -713,9 +722,11 @@ the response is over. Additional data: TAGSPEC \n. Tell the client to set a sticky tag or date, which should be supplied with the `Sticky' request for future operations. PATHNAME ends in a slash; its purpose is to - specify a directory, not a file within a directory. The first - character of TAGSPEC is `T' for a tag, or `D' for a date. The - remainder of TAGSPEC contains the actual tag or date. + specify a directory, not a file within a directory. The client + should store TAGSPEC and pass it back to the server as-is, to + allow for future expansion. The first character of TAGSPEC is `T' + for a tag, `D' for a date, or something else for future expansion. + The remainder of TAGSPEC contains the actual tag or date. `Clear-sticky PATHNAME \n' Clear any sticky tag or date set by `Set-sticky'. @@ -940,9 +951,9 @@ Node: Entries Lines10159 Node: Modes10867 Node: Filenames12390 Node: Requests13141 -Node: Responses27266 -Node: Example36257 -Node: Requirements40184 -Node: Obsolete41092 +Node: Responses27895 +Node: Example37034 +Node: Requirements40961 +Node: Obsolete41869 End Tag Table diff --git a/gnu/usr.bin/cvs/doc/cvsclient.ps b/gnu/usr.bin/cvs/doc/cvsclient.ps index 5af6cc92cc3..734d96453c0 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: 19 +%%Pages: 20 %%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.16:1621 +%DVIPSSource: TeX output 1997.03.25:1329 %%BeginProcSet: texc.pro /TeXDict 250 dict def TeXDict begin /N{def}def /B{bind def}N /S{exch}N /X{S N}B /TR{translate}N /isls false N /vsize 11 72 mul N /hsize 8.5 72 @@ -952,7 +952,7 @@ y Ff(This)k(do)s(cumen)m(t)h(describ)s(es)g(the)h(clien)m(t/serv)m(er)g (proto)s(col)g(used)f(b)m(y)h(CVS.)f(It)h(do)s(es)g(not)g(describ)s(e)e (ho)m(w)i(to)0 865 y(use)h(or)h(administer)d(clien)m(t/serv)m(er)j (CVS;)f(see)h(the)g(regular)e(CVS)h(man)m(ual)g(for)g(that.)60 -b(This)35 b(is)g(v)m(ersion)h(1.9.4)0 989 y(of)c(the)g(proto)s(col)g +b(This)35 b(is)g(v)m(ersion)h(1.9.6)0 989 y(of)c(the)g(proto)s(col)g (sp)s(eci\014cation|See)f(Chapter)g(1)h([In)m(tro)s(duction],)g(page)g (2,)h(for)e(more)h(on)g(what)g(this)e(v)m(ersion)0 1114 y(n)m(um)m(b)s(er)f(means.)p eop @@ -1003,7 +1003,7 @@ b(as)h(CVS,)g(is)e(a)m(v)-5 b(ailable)30 b(under)e(the)i(GNU)g(Public)e (cumen)m(t,)h(`)p Fd(cvsclient.texi)p Ff(',)d(can)i(b)s(e)g(found)f(at) i(the)f(usual)f(GNU)i(FTP)f(sites,)h(with)0 3405 y(a)k(\014lename)e (suc)m(h)h(as)h(`)p Fd(cvs-)p Fe(v)m(ersion)p Fd(.tar.gz)p -Ff('.)125 3679 y(This)f(is)i(v)m(ersion)g(1.9.4)j(of)d(the)h(proto)s +Ff('.)125 3679 y(This)f(is)i(v)m(ersion)g(1.9.6)j(of)d(the)h(proto)s (col)g(sp)s(eci\014cation.)46 b(This)31 b(v)m(ersion)h(n)m(um)m(b)s(er) f(is)h(in)m(tended)g(only)f(to)j(aid)0 3804 y(in)40 b(distinguishing)e (di\013eren)m(t)j(v)m(ersions)g(of)h(this)e(sp)s(eci\014cation.)74 @@ -1440,586 +1440,603 @@ Fe(w)m(orking-dir)39 b Ff(is)34 b(the)g(pathname)g(of)h(the)g(w)m b Fe(w)m(atc)m(hes)36 b Ff(are)c(the)f(temp)s(orary)f(w)m(atc)m(hes)j (to)f(set;)g(if)e(it)g(is)g(follo)m(w)m(ed)h(b)m(y)g Fd(\\)p Ff(t)480 491 y(then)f(the)h(tab)f(and)g(the)h(rest)f(of)h(the)f -(line)f(are)i(ignored.)0 686 y Fd(Questionable)c Fe(\014lename)35 -b Fd(\\n)480 810 y Ff(Resp)s(onse)25 b(exp)s(ected:)39 +(line)f(are)i(ignored.)0 697 y Fd(Questionable)c Fe(\014lename)35 +b Fd(\\n)480 822 y Ff(Resp)s(onse)25 b(exp)s(ected:)39 b(no.)g(Additional)24 b(data:)39 b(no.)g(T)-8 b(ell)25 b(the)h(serv)m(er)g(to)h(c)m(hec)m(k)g(whether)f Fe(\014lename)480 -935 y Ff(should)43 b(b)s(e)i(ignored,)k(and)44 b(if)h(not,)k(next)d +946 y Ff(should)43 b(b)s(e)i(ignored,)k(and)44 b(if)h(not,)k(next)d (time)f(the)g(serv)m(er)h(sends)e(resp)s(onses,)49 b(send)44 -b(\(in)h(a)g Fd(M)480 1059 y Ff(resp)s(onse\))31 b(`)p +b(\(in)h(a)g Fd(M)480 1071 y Ff(resp)s(onse\))31 b(`)p Fd(?)p Ff(')g(follo)m(w)m(ed)g(b)m(y)g(the)g(directory)g(and)f (\014lename.)42 b Fe(\014lename)36 b Ff(m)m(ust)31 b(not)g(con)m(tain)g -(`)p Fd(/)p Ff(';)h(it)480 1184 y(needs)e(to)h(b)s(e)f(a)h(\014le)e(in) +(`)p Fd(/)p Ff(';)h(it)480 1195 y(needs)e(to)h(b)s(e)f(a)h(\014le)e(in) g(the)i(directory)f(named)f(b)m(y)i(the)f(most)h(recen)m(t)g -Fd(Directory)d Ff(request.)0 1378 y Fd(Case)h(\\n)163 -b Ff(Resp)s(onse)44 b(exp)s(ected:)68 b(no.)82 b(T)-8 -b(ell)43 b(the)i(serv)m(er)f(that)h(\014lenames)e(should)f(b)s(e)i -(matc)m(hed)h(against)480 1503 y(ignore)36 b(patterns)h(in)f(a)h -(case-insensitiv)m(e)f(fashion.)59 b(Note)39 b(that)e(this)f(do)s(es)g -(not)i(apply)d(to)j(other)480 1627 y(comparisons|for)27 -b(example)h(the)h(\014lenames)e(giv)m(en)i(in)e Fd(Entry)f -Ff(and)i Fd(Modified)e Ff(requests)j(for)f(the)480 1752 -y(same)j(\014le)e(m)m(ust)h(matc)m(h)i(in)d(case)i(regardless)f(of)g -(whether)g(the)h Fd(Case)e Ff(request)h(is)g(sen)m(t.)0 -1946 y Fd(Argument)e Fe(text)33 b Fd(\\n)480 2071 y Ff(Resp)s(onse)43 -b(exp)s(ected:)66 b(no.)80 b(Sa)m(v)m(e)44 b(argumen)m(t)g(for)f(use)g -(in)f(a)h(subsequen)m(t)g(command.)79 b(Argu-)480 2196 -y(men)m(ts)30 b(accum)m(ulate)g(un)m(til)e(an)h(argumen)m(t-using)g -(command)g(is)f(giv)m(en,)i(at)g(whic)m(h)f(p)s(oin)m(t)f(they)i(are) -480 2320 y(forgotten.)0 2515 y Fd(Argumentx)e Fe(text)33 -b Fd(\\n)480 2639 y Ff(Resp)s(onse)k(exp)s(ected:)54 +Fd(Directory)d Ff(request.)0 1402 y Fd(Case)h(\\n)163 +b Ff(Resp)s(onse)36 b(exp)s(ected:)54 b(no.)60 b(T)-8 +b(ell)35 b(the)i(serv)m(er)g(that)h(\014lenames)e(should)e(b)s(e)i +(matc)m(hed)i(in)d(a)j(case-)480 1526 y(insensitiv)m(e)c(fashion.)58 +b(Note)38 b(that)f(this)e(is)h(not)g(the)h(primary)e(mec)m(hanism)g +(for)i(ac)m(hieving)f(case-)480 1651 y(insensitivit)m(y;)25 +b(for)g(the)h(most)g(part)g(the)g(clien)m(t)g(k)m(eeps)g(trac)m(k)h(of) +f(the)g(case)h(whic)m(h)d(the)i(serv)m(er)g(w)m(an)m(ts)480 +1775 y(to)k(use)f(and)f(tak)m(es)j(care)f(to)f(alw)m(a)m(ys)h(use)f +(that)h(case)g(regardless)e(of)h(what)h(the)f(user)f(sp)s(eci\014es.)39 +b(F)-8 b(or)480 1900 y(example)37 b(the)h(\014lenames)f(giv)m(en)h(in)e +Fd(Entry)g Ff(and)h Fd(Modified)e Ff(requests)j(for)f(the)h(same)g +(\014le)f(m)m(ust)480 2024 y(matc)m(h)31 b(in)e(case)j(regardless)d(of) +i(whether)e(the)i Fd(Case)e Ff(request)h(is)g(sen)m(t.)41 +b(The)30 b(latter)g(mec)m(hanism)g(is)480 2149 y(more)23 +b(general)f(\(it)g(could)g(also)g(b)s(e)g(used)f(for)h(8.3)i +(\014lenames,)f(VMS)f(\014lenames)g(with)f(more)i(than)f(one)480 +2273 y(`)p Fd(.)p Ff(',)29 b(and)f(an)m(y)h(other)g(situation)e(in)g +(whic)m(h)h(there)g(is)g(a)h(predictable)e(mapping)g(b)s(et)m(w)m(een)i +(\014lenames)480 2398 y(in)h(the)i(w)m(orking)e(directory)h(and)g +(\014lenames)f(in)g(the)i(proto)s(col\),)g(but)e(there)i(are)f(some)h +(situations)480 2522 y(it)c(cannot)h(handle)e(\(ignore)h(patterns,)h +(or)f(situations)f(where)h(the)h(user)e(sp)s(eci\014es)g(a)i +(\014lename)f(and)480 2647 y(the)j(clien)m(t)f(do)s(es)g(not)g(kno)m(w) +h(ab)s(out)f(that)h(\014le\).)0 2853 y Fd(Argument)d +Fe(text)33 b Fd(\\n)480 2978 y Ff(Resp)s(onse)43 b(exp)s(ected:)66 +b(no.)80 b(Sa)m(v)m(e)44 b(argumen)m(t)g(for)f(use)g(in)f(a)h +(subsequen)m(t)g(command.)79 b(Argu-)480 3102 y(men)m(ts)30 +b(accum)m(ulate)g(un)m(til)e(an)h(argumen)m(t-using)g(command)g(is)f +(giv)m(en,)i(at)g(whic)m(h)f(p)s(oin)m(t)f(they)i(are)480 +3227 y(forgotten.)0 3433 y Fd(Argumentx)e Fe(text)33 +b Fd(\\n)480 3558 y Ff(Resp)s(onse)k(exp)s(ected:)54 b(no.)61 b(App)s(end)35 b Fd(\\)p Ff(n)i(follo)m(w)m(ed)f(b)m(y)h(text) i(to)e(the)h(curren)m(t)f(argumen)m(t)g(b)s(eing)480 -2764 y(sa)m(v)m(ed.)0 2958 y Fd(Global_option)27 b Fe(option)j -Fd(\\n)480 3083 y Ff(Resp)s(onse)c(exp)s(ected:)39 b(no.)g(T)-8 +3682 y(sa)m(v)m(ed.)0 3888 y Fd(Global_option)27 b Fe(option)j +Fd(\\n)480 4013 y Ff(Resp)s(onse)c(exp)s(ected:)39 b(no.)g(T)-8 b(ransmit)25 b(one)i(of)f(the)h(global)e(options)h(`)p Fd(-q)p Ff(',)h(`)p Fd(-Q)p Ff(',)g(`)p Fd(-l)p Ff(',)g(`)p -Fd(-t)p Ff(',)h(`)p Fd(-r)p Ff(',)f(or)480 3207 y(`)p +Fd(-t)p Ff(',)h(`)p Fd(-r)p Ff(',)f(or)480 4137 y(`)p Fd(-n)p Ff('.)40 b Fe(option)29 b Ff(m)m(ust)h(b)s(e)f(one)h(of)f (those)h(strings,)f(no)h(v)-5 b(ariations)28 b(\(suc)m(h)i(as)g(com)m -(bining)e(of)h(options\))480 3332 y(are)34 b(allo)m(w)m(ed.)52 +(bining)e(of)h(options\))480 4262 y(are)34 b(allo)m(w)m(ed.)52 b(F)-8 b(or)35 b(graceful)e(handling)f(of)i Fd(valid-requests)p Ff(,)d(it)j(is)f(probably)f(b)s(etter)i(to)h(mak)m(e)480 -3456 y(new)30 b(global)g(options)f(separate)j(requests,)e(rather)g +4387 y(new)30 b(global)g(options)f(separate)j(requests,)e(rather)g (than)g(trying)g(to)h(add)f(them)g(to)h(this)f(request.)0 -3651 y Fd(Gzip-stream)d Fe(lev)m(el)34 b Fd(\\n)480 3776 +4593 y Fd(Gzip-stream)d Fe(lev)m(el)34 b Fd(\\n)480 4717 y Ff(Resp)s(onse)25 b(exp)s(ected:)39 b(no.)g(Use)26 b(zlib)e(\(RF)m(C)j(1950/1951\))j(compression)25 b(to)h(compress)g(all) -e(further)480 3900 y(comm)m(unication)j(b)s(et)m(w)m(een)g(the)h(clien) +e(further)480 4842 y(comm)m(unication)j(b)s(et)m(w)m(een)g(the)h(clien) m(t)f(and)f(the)i(serv)m(er.)40 b(After)27 b(this)f(request)h(is)g(sen) -m(t,)h(all)e(further)480 4025 y(comm)m(unication)g(m)m(ust)f(b)s(e)h +m(t,)h(all)e(further)480 4966 y(comm)m(unication)g(m)m(ust)f(b)s(e)h (compressed.)39 b(All)25 b(further)f(data)j(receiv)m(ed)f(from)g(the)g -(serv)m(er)h(will)c(also)480 4149 y(b)s(e)i(compressed.)39 +(serv)m(er)h(will)c(also)480 5091 y(b)s(e)i(compressed.)39 b(The)25 b Fe(lev)m(el)30 b Ff(argumen)m(t)c(suggests)g(to)h(the)f (serv)m(er)g(the)g(lev)m(el)g(of)g(compression)e(that)480 -4274 y(it)39 b(should)f(apply;)43 b(it)d(should)d(b)s(e)j(an)f(in)m +5215 y(it)39 b(should)f(apply;)43 b(it)d(should)d(b)s(e)j(an)f(in)m (teger)h(b)s(et)m(w)m(een)h(1)f(and)f(9,)k(inclusiv)m(e,)d(where)f(a)h -(higher)480 4398 y(n)m(um)m(b)s(er)29 b(indicates)g(more)i -(compression.)0 4593 y Fd(Kerberos-encrypt)26 b(\\n)480 -4717 y Ff(Resp)s(onse)e(exp)s(ected:)39 b(no.)g(Use)25 -b(Kerb)s(eros)f(encryption)g(to)i(encrypt)f(all)f(further)f(comm)m -(unication)480 4842 y(b)s(et)m(w)m(een)41 b(the)f(clien)m(t)f(and)g -(the)i(serv)m(er.)69 b(This)38 b(will)g(only)h(w)m(ork)h(if)e(the)j -(connection)f(w)m(as)g(made)480 4966 y(o)m(v)m(er)32 -b(Kerb)s(eros)e(in)f(the)i(\014rst)f(place.)42 b(If)31 -b(b)s(oth)f(the)h Fd(Gzip-stream)c Ff(and)j(the)h Fd(Kerberos-encrypt) -480 5091 y Ff(requests)e(are)h(used,)f(the)g Fd(Kerberos-encrypt)c -Ff(request)k(should)e(b)s(e)i(used)f(\014rst.)40 b(This)27 -b(will)g(mak)m(e)480 5215 y(the)44 b(clien)m(t)f(and)h(serv)m(er)g -(encrypt)f(the)h(compressed)g(data,)k(as)c(opp)s(osed)f(to)i -(compressing)e(the)480 5340 y(encrypted)30 b(data.)41 -b(Encrypted)30 b(data)h(is)e(generally)h(incompressible.)p -eop +(higher)480 5340 y(n)m(um)m(b)s(er)29 b(indicates)g(more)i +(compression.)p eop %%Page: 11 11 -11 10 bop 0 366 a Fd(Set)29 b Fe(v)-5 b(ariable)5 b Fd(=)p -Fe(v)-5 b(alue)34 b Fd(\\n)480 491 y Ff(Resp)s(onse)c(exp)s(ected:)41 +11 10 bop 0 366 a Fd(Kerberos-encrypt)26 b(\\n)480 491 +y Ff(Resp)s(onse)e(exp)s(ected:)39 b(no.)g(Use)25 b(Kerb)s(eros)f +(encryption)g(to)i(encrypt)f(all)f(further)f(comm)m(unication)480 +616 y(b)s(et)m(w)m(een)41 b(the)f(clien)m(t)f(and)g(the)i(serv)m(er.)69 +b(This)38 b(will)g(only)h(w)m(ork)h(if)e(the)j(connection)f(w)m(as)g +(made)480 740 y(o)m(v)m(er)32 b(Kerb)s(eros)e(in)f(the)i(\014rst)f +(place.)42 b(If)31 b(b)s(oth)f(the)h Fd(Gzip-stream)c +Ff(and)j(the)h Fd(Kerberos-encrypt)480 865 y Ff(requests)e(are)h(used,) +f(the)g Fd(Kerberos-encrypt)c Ff(request)k(should)e(b)s(e)i(used)f +(\014rst.)40 b(This)27 b(will)g(mak)m(e)480 989 y(the)44 +b(clien)m(t)f(and)h(serv)m(er)g(encrypt)f(the)h(compressed)g(data,)k +(as)c(opp)s(osed)f(to)i(compressing)e(the)480 1114 y(encrypted)30 +b(data.)41 b(Encrypted)30 b(data)h(is)e(generally)h(incompressible.)0 +1568 y Fd(Set)f Fe(v)-5 b(ariable)5 b Fd(=)p Fe(v)-5 +b(alue)34 b Fd(\\n)480 1692 y Ff(Resp)s(onse)c(exp)s(ected:)41 b(no.)f(Set)31 b(a)g(user)e(v)-5 b(ariable)30 b Fe(v)-5 -b(ariable)34 b Ff(to)d Fe(v)-5 b(alue)p Ff(.)0 676 y -Fd(expand-modules)26 b(\\n)480 800 y Ff(Resp)s(onse)36 +b(ariable)34 b Ff(to)d Fe(v)-5 b(alue)p Ff(.)0 2146 y +Fd(expand-modules)26 b(\\n)480 2271 y Ff(Resp)s(onse)36 b(exp)s(ected:)54 b(y)m(es.)61 b(Expand)36 b(the)h(mo)s(dules)e(whic)m (h)g(are)j(sp)s(eci\014ed)d(in)g(the)i(argumen)m(ts.)480 -925 y(Returns)f(the)h(data)h(in)d Fd(Module-expansion)e +2395 y(Returns)f(the)h(data)h(in)d Fd(Module-expansion)e Ff(resp)s(onses.)59 b(Note)38 b(that)g(the)f(serv)m(er)g(can)g(assume) -480 1049 y(that)c(this)f(is)g(c)m(hec)m(k)m(out)j(or)e(exp)s(ort,)g +480 2520 y(that)c(this)f(is)g(c)m(hec)m(k)m(out)j(or)e(exp)s(ort,)g (not)g(rtag)h(or)e(rdi\013;)h(the)g(latter)g(do)g(not)g(access)h(the)f -(w)m(orking)480 1174 y(directory)d(and)g(th)m(us)g(ha)m(v)m(e)h(no)f +(w)m(orking)480 2644 y(directory)d(and)g(th)m(us)g(ha)m(v)m(e)h(no)f (need)h(to)g(expand)e(mo)s(dules)g(on)h(the)h(clien)m(t)f(side.)0 -1359 y Fd(co)g(\\n)0 1483 y(ci)g(\\n)0 1608 y(diff)f(\\n)0 -1732 y(tag)g(\\n)0 1857 y(status)g(\\n)0 1982 y(log)g(\\n)0 -2106 y(add)g(\\n)0 2231 y(remove)g(\\n)0 2355 y(rdiff)g(\\n)0 -2480 y(rtag)g(\\n)0 2604 y(admin)g(\\n)0 2729 y(export)g(\\n)0 -2853 y(history)f(\\n)0 2978 y(watchers)g(\\n)0 3102 y(editors)g(\\n)0 -3227 y(annotate)g(\\n)480 3351 y Ff(Resp)s(onse)20 b(exp)s(ected:)37 +3098 y Fd(co)g(\\n)0 3223 y(ci)g(\\n)0 3347 y(diff)f(\\n)0 +3472 y(tag)g(\\n)0 3597 y(status)g(\\n)0 3721 y(log)g(\\n)0 +3846 y(add)g(\\n)0 3970 y(remove)g(\\n)0 4095 y(rdiff)g(\\n)0 +4219 y(rtag)g(\\n)0 4344 y(admin)g(\\n)0 4468 y(export)g(\\n)0 +4593 y(history)f(\\n)0 4717 y(watchers)g(\\n)0 4842 y(editors)g(\\n)0 +4966 y(annotate)g(\\n)480 5091 y Ff(Resp)s(onse)20 b(exp)s(ected:)37 b(y)m(es.)h(Actually)20 b(do)h(a)g(cvs)g(command.)38 b(This)19 b(uses)h(an)m(y)i(previous)d Fd(Argument)p -Ff(,)480 3476 y Fd(Directory)p Ff(,)29 b Fd(Entry)p Ff(,)i(or)g +Ff(,)480 5215 y Fd(Directory)p Ff(,)29 b Fd(Entry)p Ff(,)i(or)g Fd(Modified)e Ff(requests,)j(if)e(they)h(ha)m(v)m(e)i(b)s(een)d(sen)m -(t.)45 b(The)30 b(last)h Fd(Directory)480 3600 y Ff(sen)m(t)e(sp)s +(t.)45 b(The)30 b(last)h Fd(Directory)480 5340 y Ff(sen)m(t)e(sp)s (eci\014es)e(the)i(w)m(orking)f(directory)g(at)i(the)f(time)f(of)h(the) -g(op)s(eration.)39 b(No)29 b(pro)m(vision)e(is)h(made)480 -3725 y(for)34 b(an)m(y)g(input)e(from)h(the)h(user.)51 +g(op)s(eration.)39 b(No)29 b(pro)m(vision)e(is)h(made)p +eop +%%Page: 12 12 +12 11 bop 480 366 a Ff(for)34 b(an)m(y)g(input)e(from)h(the)h(user.)51 b(This)32 b(means)h(that)i Fd(ci)e Ff(m)m(ust)h(use)f(a)i -Fd(-m)e Ff(argumen)m(t)h(if)f(it)g(w)m(an)m(ts)480 3850 -y(to)e(sp)s(ecify)e(a)i(log)f(message.)0 4004 y Fd(init)f -Fe(ro)s(ot-name)36 b Fd(\\n)480 4129 y Ff(Resp)s(onse)27 +Fd(-m)e Ff(argumen)m(t)h(if)f(it)g(w)m(an)m(ts)480 491 +y(to)e(sp)s(ecify)e(a)i(log)f(message.)0 642 y Fd(init)f +Fe(ro)s(ot-name)36 b Fd(\\n)480 766 y Ff(Resp)s(onse)27 b(exp)s(ected:)40 b(y)m(es.)h(If)27 b(it)g(do)s(esn't)h(already)f (exist,)i(create)g(a)f Fb(cvs)f Ff(rep)s(ository)g Fe(ro)s(ot-name)p -Ff(.)480 4253 y(Note)40 b(that)e Fe(ro)s(ot-name)45 b +Ff(.)480 891 y(Note)40 b(that)e Fe(ro)s(ot-name)45 b Ff(is)37 b(a)i(lo)s(cal)e(directory)h(and)f Fe(not)k Ff(a)e(fully)d(quali\014ed)g Fd(CVSROOT)g Ff(v)-5 b(ariable.)480 -4378 y(The)30 b Fd(Root)f Ff(request)h(need)h(not)f(ha)m(v)m(e)i(b)s -(een)d(previously)g(sen)m(t.)0 4532 y Fd(update)g(\\n)67 +1015 y(The)30 b Fd(Root)f Ff(request)h(need)h(not)f(ha)m(v)m(e)i(b)s +(een)d(previously)g(sen)m(t.)0 1166 y Fd(update)g(\\n)67 b Ff(Resp)s(onse)30 b(exp)s(ected:)42 b(y)m(es.)g(Actually)30 b(do)h(a)g Fd(cvs)f(update)f Ff(command.)41 b(This)29 -b(uses)h(an)m(y)h(previous)480 4657 y Fd(Argument)p Ff(,)g +b(uses)h(an)m(y)h(previous)480 1290 y Fd(Argument)p Ff(,)g Fd(Directory)p Ff(,)g Fd(Entry)p Ff(,)i(or)f Fd(Modified)f Ff(requests,)j(if)d(they)i(ha)m(v)m(e)h(b)s(een)e(sen)m(t.)49 -b(The)32 b(last)480 4782 y Fd(Directory)h Ff(sen)m(t)i(sp)s(eci\014es)f +b(The)32 b(last)480 1415 y Fd(Directory)h Ff(sen)m(t)i(sp)s(eci\014es)f (the)h(w)m(orking)g(directory)g(at)g(the)h(time)f(of)g(the)g(op)s -(eration.)55 b(The)35 b Fd(-I)480 4906 y Ff(option)24 +(eration.)55 b(The)35 b Fd(-I)480 1540 y Ff(option)24 b(is)f(not)i(used{\014les)e(whic)m(h)g(the)h(clien)m(t)g(can)h(decide)e (whether)h(to)h(ignore)f(are)h(not)f(men)m(tioned)480 -5031 y(and)30 b(the)g(clien)m(t)g(sends)g(the)g Fd(Questionable)d -Ff(request)k(for)f(others.)0 5215 y Fd(import)f(\\n)67 +1664 y(and)30 b(the)g(clien)m(t)g(sends)g(the)g Fd(Questionable)d +Ff(request)k(for)f(others.)0 1841 y Fd(import)f(\\n)67 b Ff(Resp)s(onse)30 b(exp)s(ected:)42 b(y)m(es.)g(Actually)30 b(do)h(a)g Fd(cvs)f(import)f Ff(command.)41 b(This)29 -b(uses)h(an)m(y)h(previous)480 5340 y Fd(Argument)p Ff(,)g +b(uses)h(an)m(y)h(previous)480 1965 y Fd(Argument)p Ff(,)g Fd(Directory)p Ff(,)g Fd(Entry)p Ff(,)i(or)f Fd(Modified)f Ff(requests,)j(if)d(they)i(ha)m(v)m(e)h(b)s(een)e(sen)m(t.)49 -b(The)32 b(last)p eop -%%Page: 12 12 -12 11 bop 480 366 a Fd(Directory)29 b Ff(sen)m(t)j(sp)s(eci\014es)e +b(The)32 b(last)480 2090 y Fd(Directory)d Ff(sen)m(t)j(sp)s(eci\014es)e (the)h(w)m(orking)g(directory)g(at)h(the)g(time)f(of)g(the)h(op)s -(eration.)43 b(The)31 b(\014les)480 491 y(to)j(b)s(e)g(imp)s(orted)e +(eration.)43 b(The)31 b(\014les)480 2214 y(to)j(b)s(e)g(imp)s(orted)e (are)i(sen)m(t)g(in)e Fd(Modified)g Ff(requests)i(\(\014les)f(whic)m(h) -f(the)i(clien)m(t)f(kno)m(ws)h(should)e(b)s(e)480 616 +f(the)i(clien)m(t)f(kno)m(ws)h(should)e(b)s(e)480 2339 y(ignored)c(are)i(not)g(sen)m(t;)g(the)g(serv)m(er)g(m)m(ust)f(still)e (pro)s(cess)i(the)h(CVSR)m(OOT/cvsignore)e(\014le)h(unless)480 -740 y(-I)h(!)h(is)e(sen)m(t\).)42 b(A)30 b(log)h(message)g(m)m(ust)g +2464 y(-I)h(!)h(is)e(sen)m(t\).)42 b(A)30 b(log)h(message)g(m)m(ust)g (ha)m(v)m(e)g(b)s(een)f(sp)s(eci\014ed)f(with)g(a)h Fd(-m)g -Ff(argumen)m(t.)0 899 y Fd(watch-on)e(\\n)0 1024 y(watch-off)g(\\n)0 -1148 y(watch-add)g(\\n)0 1273 y(watch-remove)f(\\n)480 -1397 y Ff(Resp)s(onse)40 b(exp)s(ected:)63 b(y)m(es.)73 +Ff(argumen)m(t.)0 2640 y Fd(watch-on)e(\\n)0 2765 y(watch-off)g(\\n)0 +2889 y(watch-add)g(\\n)0 3014 y(watch-remove)f(\\n)480 +3138 y Ff(Resp)s(onse)40 b(exp)s(ected:)63 b(y)m(es.)73 b(Actually)40 b(do)h(the)g Fd(cvs)29 b(watch)g(on)p Ff(,)44 b Fd(cvs)29 b(watch)g(off)p Ff(,)43 b Fd(cvs)29 b(watch)480 -1522 y(add)p Ff(,)24 b(and)f Fd(cvs)30 b(watch)f(remove)21 +3263 y(add)p Ff(,)24 b(and)f Fd(cvs)30 b(watch)f(remove)21 b Ff(commands,)k(resp)s(ectiv)m(ely)-8 b(.)38 b(This)22 -b(uses)h(an)m(y)h(previous)e Fd(Argument)p Ff(,)480 1646 +b(uses)h(an)m(y)h(previous)e Fd(Argument)p Ff(,)480 3388 y Fd(Directory)p Ff(,)29 b Fd(Entry)p Ff(,)i(or)g Fd(Modified)e Ff(requests,)j(if)e(they)h(ha)m(v)m(e)i(b)s(een)d(sen)m(t.)45 -b(The)30 b(last)h Fd(Directory)480 1771 y Ff(sen)m(t)g(sp)s(eci\014es)e +b(The)30 b(last)h Fd(Directory)480 3512 y Ff(sen)m(t)g(sp)s(eci\014es)e (the)h(w)m(orking)g(directory)g(at)h(the)g(time)f(of)g(the)h(op)s -(eration.)0 1930 y Fd(release)d(\\n)480 2054 y Ff(Resp)s(onse)43 +(eration.)0 3689 y Fd(release)d(\\n)480 3813 y Ff(Resp)s(onse)43 b(exp)s(ected:)68 b(y)m(es.)81 b(Note)45 b(that)g(a)f Fd(cvs)29 b(release)42 b Ff(command)i(has)f(tak)m(en)i(place)f(and)480 -2179 y(up)s(date)30 b(the)g(history)f(\014le)h(accordingly)-8 -b(.)0 2338 y Fd(noop)29 b(\\n)163 b Ff(Resp)s(onse)34 +3938 y(up)s(date)30 b(the)g(history)f(\014le)h(accordingly)-8 +b(.)0 4115 y Fd(noop)29 b(\\n)163 b Ff(Resp)s(onse)34 b(exp)s(ected:)48 b(y)m(es.)53 b(This)33 b(request)h(is)f(a)i(n)m(ull)d (command)i(in)f(the)h(sense)h(that)f(it)g(do)s(esn't)480 -2462 y(do)c(an)m(ything,)g(but)g(merely)f(\(as)i(with)e(an)m(y)i(other) +4239 y(do)c(an)m(ything,)g(but)g(merely)f(\(as)i(with)e(an)m(y)i(other) f(requests)h(exp)s(ecting)e(a)i(resp)s(onse\))f(sends)f(bac)m(k)480 -2587 y(an)m(y)i(resp)s(onses)e(p)s(ertaining)f(to)j(p)s(ending)d +4364 y(an)m(y)i(resp)s(onses)e(p)s(ertaining)f(to)j(p)s(ending)d (errors,)i(p)s(ending)e Fd(Notified)g Ff(resp)s(onses,)i(etc.)0 -2746 y Fd(update-patches)c(\\n)480 2870 y Ff(Resp)s(onse)34 +4541 y Fd(update-patches)c(\\n)480 4665 y Ff(Resp)s(onse)34 b(exp)s(ected:)51 b(y)m(es.)k(This)33 b(request)i(do)s(es)g(not)g (actually)g(do)g(an)m(ything.)54 b(It)35 b(is)f(used)g(as)i(a)480 -2995 y(signal)31 b(that)i(the)g(serv)m(er)g(is)e(able)h(to)i(generate)g +4790 y(signal)31 b(that)i(the)g(serv)m(er)g(is)e(able)h(to)i(generate)g (patc)m(hes)f(when)f(giv)m(en)g(an)g Fd(update)f Ff(request.)47 -b(The)480 3120 y(clien)m(t)30 b(m)m(ust)g(issue)f(the)i +b(The)480 4914 y(clien)m(t)30 b(m)m(ust)g(issue)f(the)i Fd(-u)f Ff(argumen)m(t)h(to)g Fd(update)d Ff(in)h(order)h(to)h(receiv)m -(e)h(patc)m(hes.)0 3279 y Fd(gzip-file-contents)25 b -Fe(lev)m(el)34 b Fd(\\n)480 3403 y Ff(Resp)s(onse)26 +(e)h(patc)m(hes.)0 5091 y Fd(gzip-file-contents)25 b +Fe(lev)m(el)34 b Fd(\\n)480 5215 y Ff(Resp)s(onse)26 b(exp)s(ected:)39 b(no.)g(Note)28 b(that)f(this)f(request)g(do)s(es)g (not)h(follo)m(w)f(the)g(resp)s(onse)g(con)m(v)m(en)m(tion)480 -3528 y(stated)39 b(ab)s(o)m(v)m(e.)66 b Fd(Gzip-stream)35 +5340 y(stated)39 b(ab)s(o)m(v)m(e.)66 b Fd(Gzip-stream)35 b Ff(is)j(suggested)h(instead)e(of)i Fd(gzip-file-contents)33 -b Ff(as)39 b(it)f(giv)m(es)480 3652 y(b)s(etter)31 b(compression;)f -(the)h(only)f(reason)g(to)i(implemen)m(t)d(the)i(latter)g(is)f(to)h -(pro)m(vide)f(compression)480 3777 y(with)22 b Fb(cvs)g -Ff(1.8)i(and)e(earlier.)37 b(The)22 b Fd(gzip-file-contents)c -Ff(request)23 b(asks)g(the)g(serv)m(er)h(to)f(compress)480 -3901 y(\014les)j(it)h(sends)g(to)h(the)f(clien)m(t)g(using)f -Fd(gzip)g Ff(\(RF)m(C1952/1951\))33 b(compression,)27 -b(using)f(the)i(sp)s(eci\014ed)480 4026 y(lev)m(el)i(of)h(compression.) +b Ff(as)39 b(it)f(giv)m(es)p eop +%%Page: 13 13 +13 12 bop 480 366 a Ff(b)s(etter)31 b(compression;)f(the)h(only)f +(reason)g(to)i(implemen)m(t)d(the)i(latter)g(is)f(to)h(pro)m(vide)f +(compression)480 491 y(with)22 b Fb(cvs)g Ff(1.8)i(and)e(earlier.)37 +b(The)22 b Fd(gzip-file-contents)c Ff(request)23 b(asks)g(the)g(serv)m +(er)h(to)f(compress)480 616 y(\014les)j(it)h(sends)g(to)h(the)f(clien)m +(t)g(using)f Fd(gzip)g Ff(\(RF)m(C1952/1951\))33 b(compression,)27 +b(using)f(the)i(sp)s(eci\014ed)480 740 y(lev)m(el)i(of)h(compression.) 39 b(If)30 b(this)g(request)g(is)f(not)i(made,)g(the)f(serv)m(er)h(m)m -(ust)f(not)h(compress)f(\014les.)480 4168 y(This)h(is)h(only)h(a)g(hin) -m(t)f(to)i(the)f(serv)m(er.)50 b(It)33 b(ma)m(y)h(still)d(decide)h +(ust)f(not)h(compress)f(\014les.)480 914 y(This)h(is)h(only)h(a)g(hin)m +(t)f(to)i(the)f(serv)m(er.)50 b(It)33 b(ma)m(y)h(still)d(decide)h (\(for)h(example,)h(in)e(the)h(case)h(of)g(v)m(ery)480 -4292 y(small)e(\014les,)i(or)g(\014les)f(that)h(already)g(app)s(ear)f +1038 y(small)e(\014les,)i(or)g(\014les)f(that)h(already)g(app)s(ear)f (to)h(b)s(e)g(compressed\))f(not)h(to)h(do)f(the)g(compression.)480 -4417 y(Compression)29 b(is)g(indicated)g(b)m(y)h(a)h(`)p +1163 y(Compression)29 b(is)g(indicated)g(b)m(y)h(a)h(`)p Fd(z)p Ff(')g(preceding)e(the)h(\014le)g(length.)480 -4558 y(Av)-5 b(ailabilit)m(y)33 b(of)i(this)g(request)g(in)f(the)i +1336 y(Av)-5 b(ailabilit)m(y)33 b(of)i(this)g(request)g(in)f(the)i (serv)m(er)f(indicates)g(to)h(the)f(clien)m(t)g(that)h(it)f(ma)m(y)h -(compress)480 4683 y(\014les)29 b(sen)m(t)i(to)g(the)g(serv)m(er,)g +(compress)480 1461 y(\014les)29 b(sen)m(t)i(to)g(the)g(serv)m(er,)g (regardless)e(of)i(whether)f(the)g(clien)m(t)g(actually)g(uses)g(this)f -(request.)0 4842 y Fe(other-request)k(text)g Fd(\\n)480 -4966 y Ff(Resp)s(onse)h(exp)s(ected:)49 b(y)m(es.)54 +(request.)0 1683 y Fe(other-request)k(text)g Fd(\\n)480 +1808 y Ff(Resp)s(onse)h(exp)s(ected:)49 b(y)m(es.)54 b(An)m(y)34 b(unrecognized)g(request)g(exp)s(ects)h(a)g(resp)s(onse,)g -(and)f(do)s(es)g(not)480 5091 y(con)m(tain)43 b(an)m(y)g(additional)d +(and)f(do)s(es)g(not)480 1932 y(con)m(tain)43 b(an)m(y)g(additional)d (data.)79 b(The)42 b(resp)s(onse)f(will)f(normally)h(b)s(e)h(something) -g(lik)m(e)g(`)p Fd(error)480 5215 y(unrecognized)27 b(request)p +g(lik)m(e)g(`)p Fd(error)480 2057 y(unrecognized)27 b(request)p Ff(',)f(but)g(it)g(could)g(b)s(e)g(a)h(di\013eren)m(t)f(error)g(if)g(a) -h(previous)e(command)h(whic)m(h)480 5340 y(do)s(esn't)k(exp)s(ect)h(a)g -(resp)s(onse)e(pro)s(duced)g(an)h(error.)p eop -%%Page: 13 13 -13 12 bop 125 366 a Ff(When)30 b(the)g(clien)m(t)g(is)g(done,)g(it)g -(drops)f(the)i(connection.)0 883 y Fa(5.5)68 b(Resp)t(onses)125 -1164 y Ff(After)39 b(a)g(command)g(whic)m(h)e(exp)s(ects)j(a)f(resp)s -(onse,)h(the)g(serv)m(er)f(sends)f(ho)m(w)m(ev)m(er)i(man)m(y)f(of)g -(the)g(follo)m(wing)0 1289 y(resp)s(onses)29 b(are)h(appropriate.)39 -b(The)29 b(serv)m(er)h(should)e(not)i(send)e(data)j(at)f(other)g(times) -f(\(the)h(curren)m(t)g(implemen-)0 1413 y(tation)25 b(ma)m(y)f(violate) -h(this)e(principle)e(in)i(a)h(few)g(minor)f(places,)j(where)d(the)i -(serv)m(er)f(is)g(prin)m(ting)e(an)i(error)g(message)0 -1538 y(and)30 b(exiting|this)e(should)h(b)s(e)g(in)m(v)m(estigated)i -(further\).)125 1819 y(In)25 b(the)h(follo)m(wing,)g -Fe(pathname)31 b Ff(actually)25 b(indicates)g(a)h(pair)f(of)h -(pathnames.)39 b(First,)27 b(a)f(lo)s(cal)f(directory)h(name)0 -1944 y(relativ)m(e)42 b(to)g(the)g(directory)f(in)g(whic)m(h)f(the)i -(command)g(w)m(as)g(giv)m(en)g(\(i.e.)75 b(the)42 b(last)f -Fd(Directory)e Ff(b)s(efore)j(the)0 2068 y(command\).)f(Then)28 -b(a)i(newline)e(and)h(a)h(rep)s(ository)f(name.)40 b(Then)29 -b(a)h(slash)e(and)h(the)h(\014lename)f(\(without)g(a)h(`)p -Fd(,v)p Ff(')0 2193 y(ending\).)41 b(F)-8 b(or)32 b(example,)f(for)g(a) -g(\014le)f(`)p Fd(i386.mh)p Ff(')g(whic)m(h)f(is)h(in)g(the)h(lo)s(cal) -f(directory)h(`)p Fd(gas.clean/config)p Ff(')c(and)0 -2317 y(for)j(whic)m(h)f(the)i(rep)s(ository)e(is)h(`)p -Fd(/rel/cvsfiles/devo/gas/)o(conf)o(ig)p Ff(':)240 2578 -y Fd(gas.clean/config/)240 2682 y(/rel/cvsfiles/devo/gas/c)o(onfi)o -(g/i3)o(86.)o(mh)125 2963 y Ff(An)m(y)g(resp)s(onse)f(alw)m(a)m(ys)i +h(previous)e(command)h(whic)m(h)480 2181 y(do)s(esn't)k(exp)s(ect)h(a)g +(resp)s(onse)e(pro)s(duced)g(an)h(error.)125 2528 y(When)g(the)g(clien) +m(t)g(is)g(done,)g(it)g(drops)f(the)i(connection.)0 3193 +y Fa(5.5)68 b(Resp)t(onses)125 3491 y Ff(After)39 b(a)g(command)g(whic) +m(h)e(exp)s(ects)j(a)f(resp)s(onse,)h(the)g(serv)m(er)f(sends)f(ho)m(w) +m(ev)m(er)i(man)m(y)f(of)g(the)g(follo)m(wing)0 3616 +y(resp)s(onses)29 b(are)h(appropriate.)39 b(The)29 b(serv)m(er)h +(should)e(not)i(send)e(data)j(at)f(other)g(times)f(\(the)h(curren)m(t)g +(implemen-)0 3740 y(tation)25 b(ma)m(y)f(violate)h(this)e(principle)e +(in)i(a)h(few)g(minor)f(places,)j(where)d(the)i(serv)m(er)f(is)g(prin)m +(ting)e(an)i(error)g(message)0 3865 y(and)30 b(exiting|this)e(should)h +(b)s(e)g(in)m(v)m(estigated)i(further\).)125 4163 y(In)25 +b(the)h(follo)m(wing,)g Fe(pathname)31 b Ff(actually)25 +b(indicates)g(a)h(pair)f(of)h(pathnames.)39 b(First,)27 +b(a)f(lo)s(cal)f(directory)h(name)0 4287 y(relativ)m(e)42 +b(to)g(the)g(directory)f(in)g(whic)m(h)f(the)i(command)g(w)m(as)g(giv)m +(en)g(\(i.e.)75 b(the)42 b(last)f Fd(Directory)e Ff(b)s(efore)j(the)0 +4412 y(command\).)f(Then)28 b(a)i(newline)e(and)h(a)h(rep)s(ository)f +(name.)40 b(Then)29 b(a)h(slash)e(and)h(the)h(\014lename)f(\(without)g +(a)h(`)p Fd(,v)p Ff(')0 4536 y(ending\).)41 b(F)-8 b(or)32 +b(example,)f(for)g(a)g(\014le)f(`)p Fd(i386.mh)p Ff(')g(whic)m(h)f(is)h +(in)g(the)h(lo)s(cal)f(directory)h(`)p Fd(gas.clean/config)p +Ff(')c(and)0 4661 y(for)j(whic)m(h)f(the)i(rep)s(ository)e(is)h(`)p +Fd(/rel/cvsfiles/devo/gas/)o(conf)o(ig)p Ff(':)240 4938 +y Fd(gas.clean/config/)240 5042 y(/rel/cvsfiles/devo/gas/c)o(onfi)o +(g/i3)o(86.)o(mh)125 5340 y Ff(An)m(y)g(resp)s(onse)f(alw)m(a)m(ys)i (ends)f(with)f(`)p Fd(error)p Ff(')g(or)i(`)p Fd(ok)p Ff('.)40 b(This)29 b(indicates)g(that)i(the)g(resp)s(onse)e(is)h(o)m(v) -m(er.)0 3277 y Fd(Valid-requests)c Fe(request-list)32 -b Fd(\\n)480 3402 y Ff(Indicate)i(what)h(requests)f(the)h(serv)m(er)g +m(er.)p eop +%%Page: 14 14 +14 13 bop 0 366 a Fd(Valid-requests)26 b Fe(request-list)32 +b Fd(\\n)480 491 y Ff(Indicate)i(what)h(requests)f(the)h(serv)m(er)g (will)d(accept.)55 b Fe(request-list)36 b Ff(is)d(a)i(space)g -(separated)g(list)f(of)480 3526 y(tok)m(ens.)40 b(If)27 +(separated)g(list)f(of)480 616 y(tok)m(ens.)40 b(If)27 b(the)g(serv)m(er)g(supp)s(orts)e(sending)g(patc)m(hes,)j(it)f(will)d (include)g(`)p Fd(update-patches)p Ff(')g(in)h(this)480 -3651 y(list.)39 b(The)30 b(`)p Fd(update-patches)p Ff(')d(request)k(do) -s(es)f(not)g(actually)g(do)h(an)m(ything.)0 3840 y Fd(Checked-in)d -Fe(pathname)35 b Fd(\\n)480 3965 y Ff(Additional)29 b(data:)45 +740 y(list.)39 b(The)30 b(`)p Fd(update-patches)p Ff(')d(request)k(do)s +(es)f(not)g(actually)g(do)h(an)m(ything.)0 917 y Fd(Checked-in)d +Fe(pathname)35 b Fd(\\n)480 1041 y Ff(Additional)29 b(data:)45 b(New)32 b(En)m(tries)f(line,)g Fd(\\)p Ff(n.)44 b(This)30 b(means)i(a)g(\014le)f Fe(pathname)37 b Ff(has)31 b(b)s(een)g(success-) -480 4089 y(fully)26 b(op)s(erated)j(on)f(\(c)m(hec)m(k)m(ed)j(in,)d +480 1166 y(fully)26 b(op)s(erated)j(on)f(\(c)m(hec)m(k)m(ed)j(in,)d (added,)g(etc.\).)42 b(name)29 b(in)e(the)h(En)m(tries)g(line)f(is)g -(the)i(same)g(as)g(the)480 4214 y(last)h(comp)s(onen)m(t)h(of)f -Fe(pathname)p Ff(.)0 4403 y Fd(New-entry)e Fe(pathname)35 -b Fd(\\n)480 4528 y Ff(Additional)25 b(data:)39 b(New)27 +(the)i(same)g(as)g(the)480 1290 y(last)h(comp)s(onen)m(t)h(of)f +Fe(pathname)p Ff(.)0 1467 y Fd(New-entry)e Fe(pathname)35 +b Fd(\\n)480 1592 y Ff(Additional)25 b(data:)39 b(New)27 b(En)m(tries)g(line,)f Fd(\\)p Ff(n.)39 b(Lik)m(e)27 b Fd(Checked-in)p Ff(,)e(but)h(the)h(\014le)f(is)g(not)h(up)f(to)i -(date.)0 4717 y Fd(Updated)g Fe(pathname)36 b Fd(\\n)480 -4842 y Ff(Additional)28 b(data:)41 b(New)30 b(En)m(tries)g(line,)f +(date.)0 1769 y Fd(Updated)g Fe(pathname)36 b Fd(\\n)480 +1893 y Ff(Additional)28 b(data:)41 b(New)30 b(En)m(tries)g(line,)f Fd(\\)p Ff(n,)g(mo)s(de,)h Fd(\\)p Ff(n,)g(\014le)f(transmission.)39 -b(A)30 b(new)f(cop)m(y)i(of)g(the)480 4966 y(\014le)24 +b(A)30 b(new)f(cop)m(y)i(of)g(the)480 2018 y(\014le)24 b(is)g(enclosed.)39 b(This)23 b(is)h(used)h(for)g(a)g(new)g(revision)e (of)i(an)g(existing)f(\014le,)i(or)f(for)g(a)g(new)g(\014le,)g(or)g -(for)480 5091 y(an)m(y)j(other)f(case)i(in)d(whic)m(h)g(the)i(lo)s(cal) +(for)480 2142 y(an)m(y)j(other)f(case)i(in)d(whic)m(h)g(the)i(lo)s(cal) f(\(clien)m(t-side\))g(cop)m(y)h(of)f(the)h(\014le)f(needs)g(to)h(b)s -(e)f(up)s(dated,)g(and)480 5215 y(after)j(b)s(eing)d(up)s(dated)h(it)h +(e)f(up)s(dated,)g(and)480 2267 y(after)j(b)s(eing)d(up)s(dated)h(it)h (will)d(b)s(e)j(up)f(to)i(date.)41 b(If)29 b(an)m(y)g(directory)g(in)f -(pathname)h(do)s(es)f(not)i(exist,)480 5340 y(create)i(it.)40 +(pathname)h(do)s(es)f(not)i(exist,)480 2391 y(create)i(it.)40 b(This)29 b(resp)s(onse)g(is)h(not)g(used)g(if)f Fd(Created)g -Ff(and)g Fd(Update-existing)d Ff(are)31 b(supp)s(orted.)p -eop -%%Page: 14 14 -14 13 bop 0 366 a Fd(Created)28 b Fe(pathname)36 b Fd(\\n)480 -491 y Ff(This)f(is)i(just)f(lik)m(e)h Fd(Updated)e Ff(and)h(tak)m(es)j -(the)e(same)h(additional)d(data,)40 b(but)c(is)g(used)h(only)f(if)g(no) -480 616 y Fd(Entry)p Ff(,)k Fd(Modified)p Ff(,)f(or)g -Fd(Unchanged)d Ff(request)j(has)g(b)s(een)f(sen)m(t)h(for)g(the)g -(\014le)f(in)g(question.)65 b(The)480 740 y(distinction)35 -b(b)s(et)m(w)m(een)i Fd(Created)f Ff(and)g Fd(Update-existing)d -Ff(is)j(so)h(that)h(the)f(clien)m(t)g(can)g(giv)m(e)h(an)480 -865 y(error)j(message)h(in)e(sev)m(eral)i(cases:)63 b(\(1\))43 -b(there)e(is)g(a)g(\014le)g(in)f(the)h(w)m(orking)g(directory)-8 -b(,)44 b(but)d(not)480 989 y(one)31 b(for)f(whic)m(h)g -Fd(Entry)p Ff(,)f Fd(Modified)p Ff(,)g(or)i Fd(Unchanged)d -Ff(w)m(as)j(sen)m(t)g(\(for)g(example,)f(a)h(\014le)f(whic)m(h)g(w)m -(as)480 1114 y(ignored,)j(or)g(a)g(\014le)f(for)h(whic)m(h)e -Fd(Questionable)f Ff(w)m(as)j(sen)m(t\),)i(\(2\))f(there)f(is)f(a)h -(\014le)f(in)g(the)h(w)m(orking)480 1238 y(directory)23 +Ff(and)g Fd(Update-existing)d Ff(are)31 b(supp)s(orted.)0 +2568 y Fd(Created)d Fe(pathname)36 b Fd(\\n)480 2693 +y Ff(This)f(is)i(just)f(lik)m(e)h Fd(Updated)e Ff(and)h(tak)m(es)j(the) +e(same)h(additional)d(data,)40 b(but)c(is)g(used)h(only)f(if)g(no)480 +2817 y Fd(Entry)p Ff(,)k Fd(Modified)p Ff(,)f(or)g Fd(Unchanged)d +Ff(request)j(has)g(b)s(een)f(sen)m(t)h(for)g(the)g(\014le)f(in)g +(question.)65 b(The)480 2942 y(distinction)35 b(b)s(et)m(w)m(een)i +Fd(Created)f Ff(and)g Fd(Update-existing)d Ff(is)j(so)h(that)h(the)f +(clien)m(t)g(can)g(giv)m(e)h(an)480 3066 y(error)j(message)h(in)e(sev)m +(eral)i(cases:)63 b(\(1\))43 b(there)e(is)g(a)g(\014le)g(in)f(the)h(w)m +(orking)g(directory)-8 b(,)44 b(but)d(not)480 3191 y(one)31 +b(for)f(whic)m(h)g Fd(Entry)p Ff(,)f Fd(Modified)p Ff(,)g(or)i +Fd(Unchanged)d Ff(w)m(as)j(sen)m(t)g(\(for)g(example,)f(a)h(\014le)f +(whic)m(h)g(w)m(as)480 3315 y(ignored,)j(or)g(a)g(\014le)f(for)h(whic)m +(h)e Fd(Questionable)f Ff(w)m(as)j(sen)m(t\),)i(\(2\))f(there)f(is)f(a) +h(\014le)f(in)g(the)h(w)m(orking)480 3440 y(directory)23 b(whose)h(name)f(di\013ers)g(from)g(the)h(one)g(men)m(tioned)f(in)g Fd(Created)e Ff(in)i(w)m(a)m(ys)h(that)g(the)g(clien)m(t)480 -1363 y(is)30 b(unable)f(to)i(use)g(to)g(distinguish)c(\014les.)41 +3564 y(is)30 b(unable)f(to)i(use)g(to)g(distinguish)c(\014les.)41 b(F)-8 b(or)31 b(example,)g(the)g(clien)m(t)f(is)g(case-insensitiv)m(e) -g(and)g(the)480 1487 y(names)g(di\013er)f(only)h(in)f(case.)0 -1652 y Fd(Update-existing)d Fe(pathname)36 b Fd(\\n)480 -1777 y Ff(This)i(is)i(just)f(lik)m(e)h Fd(Updated)e Ff(and)i(tak)m(es)i +g(and)g(the)480 3689 y(names)g(di\013er)f(only)h(in)f(case.)0 +3866 y Fd(Update-existing)d Fe(pathname)36 b Fd(\\n)480 +3990 y Ff(This)i(is)i(just)f(lik)m(e)h Fd(Updated)e Ff(and)i(tak)m(es)i (the)e(same)h(additional)d(data,)44 b(but)39 b(is)g(used)h(only)f(if)h -(a)480 1901 y Fd(Entry)p Ff(,)29 b Fd(Modified)p Ff(,)g(or)h +(a)480 4115 y Fd(Entry)p Ff(,)29 b Fd(Modified)p Ff(,)g(or)h Fd(Unchanged)e Ff(request)i(has)g(b)s(een)g(sen)m(t)h(for)f(the)h -(\014le)e(in)g(question.)0 2066 y Fd(Merged)g Fe(pathname)35 -b Fd(\\n)480 2190 y Ff(This)d(is)h(just)g(lik)m(e)g Fd(Updated)f +(\014le)e(in)g(question.)0 4291 y Fd(Merged)g Fe(pathname)35 +b Fd(\\n)480 4416 y Ff(This)d(is)h(just)g(lik)m(e)g Fd(Updated)f Ff(and)h(tak)m(es)i(the)f(same)g(additional)e(data,)j(with)e(the)g(one) -h(di\013erence)480 2315 y(that)e(after)h(the)f(new)f(cop)m(y)i(of)f +h(di\013erence)480 4541 y(that)e(after)h(the)f(new)f(cop)m(y)i(of)f (the)g(\014le)f(is)g(enclosed,)h(it)f(will)e(still)h(not)i(b)s(e)f(up)g -(to)i(date.)45 b(Used)32 b(for)480 2439 y(the)f(results)e(of)h(a)h -(merge,)g(with)e(or)i(without)e(con\015icts.)0 2604 y -Fd(Patched)f Fe(pathname)36 b Fd(\\n)480 2729 y Ff(This)c(is)h(just)g +(to)i(date.)45 b(Used)32 b(for)480 4665 y(the)f(results)e(of)h(a)h +(merge,)g(with)e(or)i(without)e(con\015icts.)0 4842 y +Fd(Patched)f Fe(pathname)36 b Fd(\\n)480 4966 y Ff(This)c(is)h(just)g (lik)m(e)g Fd(Updated)f Ff(and)h(tak)m(es)i(the)f(same)g(additional)e -(data,)j(with)e(the)g(one)h(di\013erence)480 2853 y(that)j(instead)g +(data,)j(with)e(the)g(one)h(di\013erence)480 5091 y(that)j(instead)g (of)g(sending)e(a)i(new)g(cop)m(y)g(of)g(the)g(\014le,)h(the)f(serv)m (er)g(sends)f(a)h(patc)m(h.)61 b(This)35 b(patc)m(h)480 -2978 y(is)e(pro)s(duced)f(b)m(y)i(`)p Fd(diff)c(-c)p +5215 y(is)e(pro)s(duced)f(b)m(y)i(`)p Fd(diff)c(-c)p Ff(')j(for)h Fb(cvs)f Ff(1.6)i(and)e(later)h(\(see)h(POSIX.2)f(for)g(a) -g(description)e(of)i(this)480 3102 y(format\),)44 b(or)c(`)p +g(description)e(of)i(this)480 5340 y(format\),)44 b(or)c(`)p Fd(diff)30 b(-u)p Ff(')40 b(for)g(previous)f(v)m(ersions)g(of)i -Fb(cvs)p Ff(;)k(clien)m(ts)40 b(are)g(encouraged)h(to)g(accept)480 -3227 y(either)32 b(format.)47 b(The)32 b(clien)m(t)g(m)m(ust)g(apply)f -(this)h(patc)m(h)h(to)g(the)f(existing)g(\014le.)46 b(This)30 -b(will)g(only)i(b)s(e)480 3351 y(used)d(when)g(the)h(clien)m(t)f(has)h -(an)g(exact)h(cop)m(y)g(of)f(an)f(earlier)g(revision)f(of)i(a)g -(\014le.)40 b(This)28 b(resp)s(onse)h(is)480 3476 y(only)g(used)h(if)f -(the)i Fd(update)e Ff(command)h(is)f(giv)m(en)i(the)f(`)p -Fd(-u)p Ff(')g(argumen)m(t.)0 3641 y Fd(Mode)f Fe(mo)s(de)35 -b Fd(\\n)480 3765 y Ff(This)j Fe(mo)s(de)45 b Ff(applies)38 -b(to)j(the)f(next)g(\014le)f(men)m(tioned)g(in)g Fd(Checked-in)p -Ff(.)67 b(It)40 b(do)s(es)f(not)i(apply)d(to)480 3890 -y(an)m(y)i(request)g(whic)m(h)e(follo)m(ws)h(a)h Fd(Checked-in)p -Ff(,)g Fd(New-entry)p Ff(,)f Fd(Updated)p Ff(,)i Fd(Merged)p -Ff(,)f(or)g Fd(Patched)480 4014 y Ff(resp)s(onse.)0 4179 -y Fd(Checksum)28 b Fe(c)m(hec)m(ksum)p Fd(\\n)480 4304 -y Ff(The)33 b Fe(c)m(hec)m(ksum)g Ff(applies)f(to)h(the)h(next)f -(\014le)f(sen)m(t)i(o)m(v)m(er)g(via)f Fd(Updated)p Ff(,)f -Fd(Merged)p Ff(,)g(or)h Fd(Patched)p Ff(.)47 b(In)480 -4428 y(the)35 b(case)h(of)f Fd(Patched)p Ff(,)g(the)g(c)m(hec)m(ksum)h +Fb(cvs)p Ff(;)k(clien)m(ts)40 b(are)g(encouraged)h(to)g(accept)p +eop +%%Page: 15 15 +15 14 bop 480 366 a Ff(either)32 b(format.)47 b(The)32 +b(clien)m(t)g(m)m(ust)g(apply)f(this)h(patc)m(h)h(to)g(the)f(existing)g +(\014le.)46 b(This)30 b(will)g(only)i(b)s(e)480 491 y(used)d(when)g +(the)h(clien)m(t)f(has)h(an)g(exact)h(cop)m(y)g(of)f(an)f(earlier)g +(revision)f(of)i(a)g(\014le.)40 b(This)28 b(resp)s(onse)h(is)480 +616 y(only)g(used)h(if)f(the)i Fd(update)e Ff(command)h(is)f(giv)m(en)i +(the)f(`)p Fd(-u)p Ff(')g(argumen)m(t.)0 786 y Fd(Mode)f +Fe(mo)s(de)35 b Fd(\\n)480 910 y Ff(This)j Fe(mo)s(de)45 +b Ff(applies)38 b(to)j(the)f(next)g(\014le)f(men)m(tioned)g(in)g +Fd(Checked-in)p Ff(.)67 b(It)40 b(do)s(es)f(not)i(apply)d(to)480 +1035 y(an)m(y)i(request)g(whic)m(h)e(follo)m(ws)h(a)h +Fd(Checked-in)p Ff(,)g Fd(New-entry)p Ff(,)f Fd(Updated)p +Ff(,)i Fd(Merged)p Ff(,)f(or)g Fd(Patched)480 1159 y +Ff(resp)s(onse.)0 1330 y Fd(Checksum)28 b Fe(c)m(hec)m(ksum)p +Fd(\\n)480 1454 y Ff(The)33 b Fe(c)m(hec)m(ksum)g Ff(applies)f(to)h +(the)h(next)f(\014le)f(sen)m(t)i(o)m(v)m(er)g(via)f Fd(Updated)p +Ff(,)f Fd(Merged)p Ff(,)g(or)h Fd(Patched)p Ff(.)47 b(In)480 +1579 y(the)35 b(case)h(of)f Fd(Patched)p Ff(,)g(the)g(c)m(hec)m(ksum)h (applies)d(to)j(the)f(\014le)f(after)h(b)s(eing)f(patc)m(hed,)j(not)e -(to)h(the)480 4553 y(patc)m(h)d(itself.)47 b(The)32 b(clien)m(t)h +(to)h(the)480 1703 y(patc)m(h)d(itself.)47 b(The)32 b(clien)m(t)h (should)d(compute)j(the)g(c)m(hec)m(ksum)h(itself,)e(after)h(receiving) -f(the)h(\014le)f(or)480 4677 y(patc)m(h,)39 b(and)c(signal)g(an)h +f(the)h(\014le)f(or)480 1828 y(patc)m(h,)39 b(and)c(signal)g(an)h (error)g(if)f(the)i(c)m(hec)m(ksums)g(do)f(not)g(matc)m(h.)59 -b(The)36 b(c)m(hec)m(ksum)h(is)e(the)i(128)480 4802 y(bit)29 +b(The)36 b(c)m(hec)m(ksum)h(is)e(the)i(128)480 1952 y(bit)29 b(MD5)i(c)m(hec)m(ksum)f(represen)m(ted)g(as)g(32)g(hex)g(digits.)39 b(This)28 b(resp)s(onse)h(is)g(optional,)g(and)g(is)g(only)480 -4926 y(used)h(if)f(the)h(clien)m(t)g(supp)s(orts)f(it)h(\(as)h(judged)e +2077 y(used)h(if)f(the)h(clien)m(t)g(supp)s(orts)f(it)h(\(as)h(judged)e (b)m(y)h(the)h Fd(Valid-responses)26 b Ff(request\).)0 -5091 y Fd(Copy-file)i Fe(pathname)35 b Fd(\\n)480 5215 +2247 y Fd(Copy-file)i Fe(pathname)35 b Fd(\\n)480 2372 y Ff(Additional)26 b(data:)41 b Fe(newname)33 b Fd(\\)p Ff(n.)40 b(Cop)m(y)29 b(\014le)e Fe(pathname)34 b Ff(to)c -Fe(newname)j Ff(in)27 b(the)i(same)g(directory)480 5340 +Fe(newname)j Ff(in)27 b(the)i(same)g(directory)480 2496 y(where)h(it)g(already)g(is.)40 b(This)28 b(do)s(es)i(not)h(a\013ect)h -Fd(CVS/Entries)p Ff(.)p eop -%%Page: 15 15 -15 14 bop 0 366 a Fd(Removed)28 b Fe(pathname)36 b Fd(\\n)480 -491 y Ff(The)30 b(\014le)f(has)h(b)s(een)g(remo)m(v)m(ed)h(from)f(the)h -(rep)s(ository)e(\(this)g(is)h(the)g(case)i(where)e(cvs)g(prin)m(ts)f -(`)p Fd(file)480 616 y(foobar.c)f(is)i(no)g(longer)e(pertinent)p -Ff('\).)0 795 y Fd(Remove-entry)f Fe(pathname)35 b Fd(\\n)480 -919 y Ff(The)d(\014le)g(needs)g(its)g(en)m(try)h(remo)m(v)m(ed)h(from)e -Fd(CVS/Entries)p Ff(,)f(but)h(the)h(\014le)f(itself)f(is)h(already)g -(gone)480 1044 y(\(this)f(happ)s(ens)f(in)g(resp)s(onse)h(to)h(a)g -Fd(ci)f Ff(request)h(whic)m(h)e(in)m(v)m(olv)m(es)i(committing)f(the)h -(remo)m(v)-5 b(al)32 b(of)g(a)480 1168 y(\014le\).)0 -1347 y Fd(Set-static-directory)25 b Fe(pathname)35 b -Fd(\\n)480 1472 y Ff(This)i(instructs)g(the)h(clien)m(t)g(to)i(set)f -(the)f Fd(Entries.Static)d Ff(\015ag,)41 b(whic)m(h)c(it)h(should)f -(then)h(send)480 1596 y(bac)m(k)31 b(to)h(the)f(serv)m(er)g(in)e(a)i -Fd(Static-directory)c Ff(request)j(whenev)m(er)h(the)g(directory)f(is)g -(op)s(erated)480 1721 y(on.)45 b Fe(pathname)36 b Ff(ends)31 -b(in)g(a)h(slash;)f(its)g(purp)s(ose)g(is)f(to)j(sp)s(ecify)d(a)i -(directory)-8 b(,)32 b(not)g(a)h(\014le)d(within)g(a)480 -1845 y(directory)-8 b(.)0 2024 y Fd(Clear-static-directory)24 -b Fe(pathname)36 b Fd(\\n)480 2149 y Ff(Lik)m(e)30 b -Fd(Set-static-directory)p Ff(,)25 b(but)30 b(clear,)h(not)f(set,)h(the) -g(\015ag.)0 2328 y Fd(Set-sticky)d Fe(pathname)35 b Fd(\\n)480 -2452 y Ff(Additional)c(data:)46 b Fe(tagsp)s(ec)39 b -Fd(\\)p Ff(n.)48 b(T)-8 b(ell)32 b(the)h(clien)m(t)f(to)i(set)f(a)h -(stic)m(ky)f(tag)h(or)f(date,)h(whic)m(h)e(should)480 -2577 y(b)s(e)f(supplied)d(with)i(the)i Fd(Sticky)d Ff(request)j(for)f -(future)g(op)s(erations.)43 b Fe(pathname)36 b Ff(ends)31 -b(in)f(a)i(slash;)480 2701 y(its)c(purp)s(ose)e(is)h(to)i(sp)s(ecify)e -(a)h(directory)-8 b(,)29 b(not)f(a)h(\014le)e(within)f(a)i(directory)-8 -b(.)40 b(The)28 b(\014rst)f(c)m(haracter)j(of)480 2826 -y Fe(tagsp)s(ec)35 b Ff(is)28 b(`)p Fd(T)p Ff(')g(for)h(a)g(tag,)h(or)f -(`)p Fd(D)p Ff(')g(for)f(a)h(date.)41 b(The)28 b(remainder)f(of)i -Fe(tagsp)s(ec)35 b Ff(con)m(tains)29 b(the)g(actual)480 -2951 y(tag)j(or)e(date.)0 3130 y Fd(Clear-sticky)d Fe(pathname)35 -b Fd(\\n)480 3254 y Ff(Clear)30 b(an)m(y)g(stic)m(ky)h(tag)h(or)e(date) -h(set)g(b)m(y)f Fd(Set-sticky)p Ff(.)0 3433 y Fd(Template)e -Fe(pathname)35 b Fd(\\n)480 3558 y Ff(Additional)i(data:)60 +Fd(CVS/Entries)p Ff(.)0 2666 y Fd(Removed)c Fe(pathname)36 +b Fd(\\n)480 2791 y Ff(The)30 b(\014le)f(has)h(b)s(een)g(remo)m(v)m(ed) +h(from)f(the)h(rep)s(ository)e(\(this)g(is)h(the)g(case)i(where)e(cvs)g +(prin)m(ts)f(`)p Fd(file)480 2916 y(foobar.c)f(is)i(no)g(longer)e +(pertinent)p Ff('\).)0 3086 y Fd(Remove-entry)f Fe(pathname)35 +b Fd(\\n)480 3210 y Ff(The)d(\014le)g(needs)g(its)g(en)m(try)h(remo)m +(v)m(ed)h(from)e Fd(CVS/Entries)p Ff(,)f(but)h(the)h(\014le)f(itself)f +(is)h(already)g(gone)480 3335 y(\(this)f(happ)s(ens)f(in)g(resp)s(onse) +h(to)h(a)g Fd(ci)f Ff(request)h(whic)m(h)e(in)m(v)m(olv)m(es)i +(committing)f(the)h(remo)m(v)-5 b(al)32 b(of)g(a)480 +3459 y(\014le\).)0 3630 y Fd(Set-static-directory)25 +b Fe(pathname)35 b Fd(\\n)480 3754 y Ff(This)i(instructs)g(the)h(clien) +m(t)g(to)i(set)f(the)f Fd(Entries.Static)d Ff(\015ag,)41 +b(whic)m(h)c(it)h(should)f(then)h(send)480 3879 y(bac)m(k)31 +b(to)h(the)f(serv)m(er)g(in)e(a)i Fd(Static-directory)c +Ff(request)j(whenev)m(er)h(the)g(directory)f(is)g(op)s(erated)480 +4003 y(on.)45 b Fe(pathname)36 b Ff(ends)31 b(in)g(a)h(slash;)f(its)g +(purp)s(ose)g(is)f(to)j(sp)s(ecify)d(a)i(directory)-8 +b(,)32 b(not)g(a)h(\014le)d(within)g(a)480 4128 y(directory)-8 +b(.)0 4298 y Fd(Clear-static-directory)24 b Fe(pathname)36 +b Fd(\\n)480 4423 y Ff(Lik)m(e)30 b Fd(Set-static-directory)p +Ff(,)25 b(but)30 b(clear,)h(not)f(set,)h(the)g(\015ag.)0 +4593 y Fd(Set-sticky)d Fe(pathname)35 b Fd(\\n)480 4717 +y Ff(Additional)c(data:)46 b Fe(tagsp)s(ec)39 b Fd(\\)p +Ff(n.)48 b(T)-8 b(ell)32 b(the)h(clien)m(t)f(to)i(set)f(a)h(stic)m(ky)f +(tag)h(or)f(date,)h(whic)m(h)e(should)480 4842 y(b)s(e)f(supplied)d +(with)i(the)i Fd(Sticky)d Ff(request)j(for)f(future)g(op)s(erations.)43 +b Fe(pathname)36 b Ff(ends)31 b(in)f(a)i(slash;)480 4966 +y(its)37 b(purp)s(ose)e(is)i(to)h(sp)s(ecify)e(a)i(directory)-8 +b(,)39 b(not)f(a)f(\014le)g(within)e(a)i(directory)-8 +b(.)62 b(The)37 b(clien)m(t)g(should)480 5091 y(store)d +Fe(tagsp)s(ec)41 b Ff(and)33 b(pass)g(it)g(bac)m(k)i(to)f(the)g(serv)m +(er)g(as-is,)h(to)f(allo)m(w)f(for)h(future)f(expansion.)49 +b(The)480 5215 y(\014rst)36 b(c)m(haracter)j(of)e Fe(tagsp)s(ec)43 +b Ff(is)36 b(`)p Fd(T)p Ff(')h(for)g(a)g(tag,)j(`)p Fd(D)p +Ff(')d(for)g(a)h(date,)h(or)e(something)f(else)h(for)g(future)480 +5340 y(expansion.)j(The)29 b(remainder)g(of)i Fe(tagsp)s(ec)37 +b Ff(con)m(tains)30 b(the)h(actual)f(tag)i(or)e(date.)p +eop +%%Page: 16 16 +16 15 bop 0 366 a Fd(Clear-sticky)27 b Fe(pathname)35 +b Fd(\\n)480 491 y Ff(Clear)30 b(an)m(y)g(stic)m(ky)h(tag)h(or)e(date)h +(set)g(b)m(y)f Fd(Set-sticky)p Ff(.)0 663 y Fd(Template)e +Fe(pathname)35 b Fd(\\n)480 787 y Ff(Additional)i(data:)60 b(\014le)38 b(transmission)f(\(note:)60 b(compressed)39 -b(\014le)f(transmissions)f(are)j(not)g(sup-)480 3682 -y(p)s(orted\).)72 b Fe(pathname)46 b Ff(ends)40 b(in)f(a)i(slash;)k -(its)c(purp)s(ose)e(is)h(to)h(sp)s(ecify)f(a)h(directory)-8 -b(,)44 b(not)d(a)g(\014le)480 3807 y(within)36 b(a)k(directory)-8 -b(.)67 b(T)-8 b(ell)38 b(the)h(clien)m(t)f(to)i(store)g(the)f(\014le)f -(transmission)f(as)i(the)g(template)h(log)480 3931 y(message,)34 -b(and)e(then)h(use)f(that)h(template)g(in)e(the)i(future)f(when)f -(prompting)g(the)i(user)f(for)g(a)h(log)480 4056 y(message.)0 -4235 y Fd(Set-checkin-prog)26 b Fe(dir)35 b Fd(\\n)480 -4359 y Ff(Additional)e(data:)51 b Fe(prog)43 b Fd(\\)p -Ff(n.)55 b(T)-8 b(ell)34 b(the)i(clien)m(t)e(to)j(set)e(a)h(c)m(hec)m -(kin)g(program,)g(whic)m(h)e(should)g(b)s(e)480 4484 -y(supplied)27 b(with)i(the)i Fd(Checkin-prog)c Ff(request)j(for)g -(future)g(op)s(erations.)0 4663 y Fd(Set-update-prog)c -Fe(dir)35 b Fd(\\n)480 4787 y Ff(Additional)c(data:)47 +b(\014le)f(transmissions)f(are)j(not)g(sup-)480 912 y(p)s(orted\).)72 +b Fe(pathname)46 b Ff(ends)40 b(in)f(a)i(slash;)k(its)c(purp)s(ose)e +(is)h(to)h(sp)s(ecify)f(a)h(directory)-8 b(,)44 b(not)d(a)g(\014le)480 +1036 y(within)36 b(a)k(directory)-8 b(.)67 b(T)-8 b(ell)38 +b(the)h(clien)m(t)f(to)i(store)g(the)f(\014le)f(transmission)f(as)i +(the)g(template)h(log)480 1161 y(message,)34 b(and)e(then)h(use)f(that) +h(template)g(in)e(the)i(future)f(when)f(prompting)g(the)i(user)f(for)g +(a)h(log)480 1285 y(message.)0 1457 y Fd(Set-checkin-prog)26 +b Fe(dir)35 b Fd(\\n)480 1582 y Ff(Additional)e(data:)51 +b Fe(prog)43 b Fd(\\)p Ff(n.)55 b(T)-8 b(ell)34 b(the)i(clien)m(t)e(to) +j(set)e(a)h(c)m(hec)m(kin)g(program,)g(whic)m(h)e(should)g(b)s(e)480 +1706 y(supplied)27 b(with)i(the)i Fd(Checkin-prog)c Ff(request)j(for)g +(future)g(op)s(erations.)0 1878 y Fd(Set-update-prog)c +Fe(dir)35 b Fd(\\n)480 2003 y Ff(Additional)c(data:)47 b Fe(prog)41 b Fd(\\)p Ff(n.)49 b(T)-8 b(ell)32 b(the)h(clien)m(t)g(to) h(set)g(an)f(up)s(date)f(program,)i(whic)m(h)e(should)g(b)s(e)480 -4912 y(supplied)27 b(with)i(the)i Fd(Update-prog)c Ff(request)j(for)h -(future)e(op)s(erations.)0 5091 y Fd(Notified)f Fe(pathname)35 -b Fd(\\n)480 5215 y Ff(Indicate)30 b(to)i(the)f(clien)m(t)f(that)h(the) +2127 y(supplied)27 b(with)i(the)i Fd(Update-prog)c Ff(request)j(for)h +(future)e(op)s(erations.)0 2299 y Fd(Notified)f Fe(pathname)35 +b Fd(\\n)480 2424 y Ff(Indicate)30 b(to)i(the)f(clien)m(t)f(that)h(the) g(noti\014cation)f(for)g Fe(pathname)36 b Ff(has)30 b(b)s(een)g(done.) -42 b(There)30 b(should)480 5340 y(b)s(e)38 b(one)h(suc)m(h)g(resp)s +42 b(There)30 b(should)480 2548 y(b)s(e)38 b(one)h(suc)m(h)g(resp)s (onse)f(for)g(ev)m(ery)i Fd(Notify)d Ff(request;)44 b(if)37 -b(there)i(are)h(sev)m(eral)f Fd(Notify)e Ff(requests)p -eop -%%Page: 16 16 -16 15 bop 480 366 a Ff(for)29 b(a)h(single)e(\014le,)i(the)f(requests)h -(should)d(b)s(e)i(pro)s(cessed)g(in)f(order;)i(the)g(\014rst)f -Fd(Notified)e Ff(resp)s(onse)480 491 y(p)s(ertains)i(to)i(the)f -(\014rst)g Fd(Notify)f Ff(request,)h(etc.)0 690 y Fd(Module-expansion)c +b(there)i(are)h(sev)m(eral)f Fd(Notify)e Ff(requests)480 +2673 y(for)29 b(a)h(single)e(\014le,)i(the)f(requests)h(should)d(b)s(e) +i(pro)s(cessed)g(in)f(order;)i(the)g(\014rst)f Fd(Notified)e +Ff(resp)s(onse)480 2797 y(p)s(ertains)i(to)i(the)f(\014rst)g +Fd(Notify)f Ff(request,)h(etc.)0 2969 y Fd(Module-expansion)c Fe(pathname)35 b Fd(\\n)30 b(Return)f(a)h(file)f(or)h(directory)480 -814 y Ff(whic)m(h)e(is)g(included)f(in)h(a)i(particular)e(mo)s(dule.)38 -b Fe(pathname)d Ff(is)28 b(relativ)m(e)h(to)i(cvsro)s(ot,)f(unlik)m(e)e -(most)480 939 y(pathnames)35 b(in)f(resp)s(onses.)55 +3093 y Ff(whic)m(h)e(is)g(included)f(in)h(a)i(particular)e(mo)s(dule.) +38 b Fe(pathname)d Ff(is)28 b(relativ)m(e)h(to)i(cvsro)s(ot,)f(unlik)m +(e)e(most)480 3218 y(pathnames)35 b(in)f(resp)s(onses.)55 b Fe(pathname)41 b Ff(should)33 b(b)s(e)i(used)g(to)h(lo)s(ok)f(and)g -(see)h(whether)f(some)h(or)480 1063 y(all)c(of)i(the)g(mo)s(dule)d +(see)h(whether)f(some)h(or)480 3343 y(all)c(of)i(the)g(mo)s(dule)d (exists)i(on)h(the)f(clien)m(t)g(side;)i(it)e(is)f(not)i(necessarily)e -(suitable)g(for)h(passing)g(as)480 1188 y(an)d(argumen)m(t)g(to)h(a)f +(suitable)g(for)h(passing)g(as)480 3467 y(an)d(argumen)m(t)g(to)h(a)f Fd(co)f Ff(request)h(\(for)g(example,)g(if)e(the)j(mo)s(dules)d(\014le) g(con)m(tains)i(the)h(`)p Fd(-d)p Ff(')e(option,)480 -1312 y(it)h(will)e(b)s(e)h(the)i(directory)f(sp)s(eci\014ed)e(with)i(`) +3592 y(it)h(will)e(b)s(e)h(the)i(directory)f(sp)s(eci\014ed)e(with)i(`) p Fd(-d)p Ff(',)g(not)h(the)f(name)h(of)f(the)h(mo)s(dule\).)0 -1511 y Fd(M)f Fe(text)j Fd(\\n)115 b Ff(A)30 b(one-line)g(message)h -(for)g(the)f(user.)0 1709 y Fd(E)g Fe(text)j Fd(\\n)115 +3763 y Fd(M)f Fe(text)j Fd(\\n)115 b Ff(A)30 b(one-line)g(message)h +(for)g(the)f(user.)0 3935 y Fd(E)g Fe(text)j Fd(\\n)115 b Ff(Same)30 b(as)h Fd(M)f Ff(but)g(send)f(to)i(stderr)f(not)h(stdout.) -0 1908 y Fd(F)f(\\n)306 b Ff(Flush)35 b(stderr.)57 b(That)36 +0 4107 y Fd(F)f(\\n)306 b Ff(Flush)35 b(stderr.)57 b(That)36 b(is,)h(mak)m(e)g(it)f(p)s(ossible)d(for)j(the)h(user)e(to)i(see)g -(what)f(has)g(b)s(een)f(written)g(to)480 2033 y(stderr)29 +(what)f(has)g(b)s(een)f(written)g(to)480 4232 y(stderr)29 b(\(it)h(is)f(up)g(to)i(the)g(implemen)m(tation)d(to)j(decide)f (exactly)g(ho)m(w)g(far)g(it)g(should)e(go)j(to)g(ensure)480 -2157 y(this\).)0 2356 y Fd(error)e Fe(errno-co)s(de)36 -b Fd(`)47 b(')30 b Fe(text)j Fd(\\n)480 2480 y Ff(The)44 +4356 y(this\).)0 4528 y Fd(error)e Fe(errno-co)s(de)36 +b Fd(`)47 b(')30 b Fe(text)j Fd(\\n)480 4652 y Ff(The)44 b(command)f(completed)i(with)d(an)i(error.)82 b Fe(errno-co)s(de)49 b Ff(is)43 b(a)i(sym)m(b)s(olic)d(error)i(co)s(de)g(\(e.g.)480 -2605 y Fd(ENOENT)p Ff(\);)39 b(if)c(the)i(serv)m(er)g(do)s(esn't)g +4777 y Fd(ENOENT)p Ff(\);)39 b(if)c(the)i(serv)m(er)g(do)s(esn't)g (supp)s(ort)e(this)g(feature,)k(or)e(if)f(it's)g(not)h(appropriate)f -(for)g(this)480 2729 y(particular)25 b(message,)k(it)e(just)f(omits)h +(for)g(this)480 4901 y(particular)25 b(message,)k(it)e(just)f(omits)h (the)g(errno-co)s(de)g(\(in)f(that)h(case)h(there)f(are)h(t)m(w)m(o)g -(spaces)f(after)480 2854 y(`)p Fd(error)p Ff('\).)58 +(spaces)f(after)480 5026 y(`)p Fd(error)p Ff('\).)58 b(T)-8 b(ext)37 b(is)f(an)g(error)g(message)h(suc)m(h)f(as)h(that)g (pro)m(vided)e(b)m(y)h(strerror\(\),)j(or)d(an)m(y)h(other)480 -2978 y(message)31 b(the)g(serv)m(er)g(w)m(an)m(ts)g(to)g(use.)0 -3177 y Fd(ok)f(\\n)258 b Ff(The)30 b(command)g(completed)g -(successfully)-8 b(.)0 3734 y Fa(5.6)68 b(Example)125 -4021 y Ff(Here)41 b(is)g(an)g(example;)47 b(lines)40 -b(are)h(pre\014xed)g(b)m(y)g(`)p Fd(C:)30 b Ff(')41 b(to)i(indicate)d -(the)i(clien)m(t)e(sends)h(them)g(or)h(`)p Fd(S:)30 b -Ff(')41 b(to)0 4145 y(indicate)29 b(the)i(serv)m(er)g(sends)e(them.)125 -4431 y(The)i(clien)m(t)h(starts)h(b)m(y)f(connecting,)i(sending)c(the)j -(ro)s(ot,)g(and)f(completing)g(the)g(proto)s(col)h(negotiation.)47 -b(In)0 4556 y(actual)31 b(practice)f(the)h(lists)e(of)h(v)-5 -b(alid)29 b(resp)s(onses)g(and)h(requests)g(w)m(ould)g(b)s(e)f(longer.) -240 4821 y Fd(C:)47 b(Root)g(/home/kingdon/testing/cv)o(sro)o(ot)240 -4925 y(C:)g(Valid-responses)d(ok)j(error)f(Checked-in)f(M)j(E)240 -5029 y(C:)f(valid-requests)240 5132 y(S:)g(Valid-requests)d(Root)j -(Directory)e(Entry)h(Modified)g(Argument)f(Argumentx)h(ci)h(co)240 -5236 y(S:)g(ok)240 5340 y(C:)g(UseUnchanged)p eop +5151 y(message)31 b(the)g(serv)m(er)g(w)m(an)m(ts)g(to)g(use.)0 +5322 y Fd(ok)f(\\n)258 b Ff(The)30 b(command)g(completed)g +(successfully)-8 b(.)p eop %%Page: 17 17 -17 16 bop 125 366 a Ff(The)23 b(clien)m(t)h(w)m(an)m(ts)g(to)h(c)m(hec) -m(k)g(out)g(the)f Fd(supermunger)d Ff(mo)s(dule)h(in)m(to)i(a)g(fresh)f -(w)m(orking)h(directory)-8 b(.)38 b(Therefore)0 491 y(it)27 -b(\014rst)g(expands)f(the)i Fd(supermunger)c Ff(mo)s(dule;)j(this)f -(step)h(w)m(ould)g(b)s(e)f(omitted)i(if)e(the)i(clien)m(t)f(w)m(as)g -(op)s(erating)g(on)0 616 y(a)k(directory)f(rather)g(than)g(a)h(mo)s -(dule.)240 878 y Fd(C:)47 b(Argument)f(supermunger)240 -982 y(C:)h(Directory)e(.)240 1086 y(C:)i(/home/kingdon/testing/cvs)o -(root)240 1190 y(C:)g(expand-modules)125 1473 y Ff(The)37 -b(serv)m(er)h(replies)e(that)i(the)g Fd(supermunger)d -Ff(mo)s(dule)h(expands)h(to)h(the)g(directory)g Fd(supermunger)c -Ff(\(the)0 1598 y(simplest)29 b(case\):)240 1861 y Fd(S:)47 -b(Module-expansion)d(supermunger)240 1964 y(S:)j(ok)125 -2248 y Ff(The)e(clien)m(t)g(then)h(pro)s(ceeds)g(to)g(c)m(hec)m(k)i -(out)e(the)g(directory)-8 b(.)88 b(The)45 b(fact)i(that)f(it)g(sends)f -(only)g(a)h(single)0 2372 y Fd(Directory)30 b Ff(request)i(whic)m(h)f -(sp)s(eci\014es)g(`)p Fd(.)p Ff(')i(for)f(the)g(w)m(orking)g(directory) -g(means)g(that)h(there)g(is)e(not)i(already)f(a)0 2497 -y Fd(supermunger)27 b Ff(directory)j(on)g(the)h(clien)m(t.)240 -2760 y Fd(C:)47 b(Argument)f(-N)240 2863 y(C:)h(Argument)f(supermunger) -240 2967 y(C:)h(Directory)e(.)240 3071 y(C:)i -(/home/kingdon/testing/cvs)o(root)240 3175 y(C:)g(co)125 -3458 y Ff(The)23 b(serv)m(er)h(replies)e(with)h(the)h(requested)g -(\014les.)38 b(In)23 b(this)g(example,)i(there)f(is)f(only)g(one,)j(`)p -Fd(mungeall.c)p Ff('.)36 b(The)0 3583 y Fd(Clear-sticky)23 +17 16 bop 0 366 a Fa(5.6)68 b(Example)125 682 y Ff(Here)41 +b(is)g(an)g(example;)47 b(lines)40 b(are)h(pre\014xed)g(b)m(y)g(`)p +Fd(C:)30 b Ff(')41 b(to)i(indicate)d(the)i(clien)m(t)e(sends)h(them)g +(or)h(`)p Fd(S:)30 b Ff(')41 b(to)0 806 y(indicate)29 +b(the)i(serv)m(er)g(sends)e(them.)125 1121 y(The)i(clien)m(t)h(starts)h +(b)m(y)f(connecting,)i(sending)c(the)j(ro)s(ot,)g(and)f(completing)g +(the)g(proto)s(col)h(negotiation.)47 b(In)0 1246 y(actual)31 +b(practice)f(the)h(lists)e(of)h(v)-5 b(alid)29 b(resp)s(onses)g(and)h +(requests)g(w)m(ould)g(b)s(e)f(longer.)240 1540 y Fd(C:)47 +b(Root)g(/home/kingdon/testing/cv)o(sro)o(ot)240 1644 +y(C:)g(Valid-responses)d(ok)j(error)f(Checked-in)f(M)j(E)240 +1748 y(C:)f(valid-requests)240 1851 y(S:)g(Valid-requests)d(Root)j +(Directory)e(Entry)h(Modified)g(Argument)f(Argumentx)h(ci)h(co)240 +1955 y(S:)g(ok)240 2059 y(C:)g(UseUnchanged)125 2374 +y Ff(The)23 b(clien)m(t)h(w)m(an)m(ts)g(to)h(c)m(hec)m(k)g(out)g(the)f +Fd(supermunger)d Ff(mo)s(dule)h(in)m(to)i(a)g(fresh)f(w)m(orking)h +(directory)-8 b(.)38 b(Therefore)0 2499 y(it)27 b(\014rst)g(expands)f +(the)i Fd(supermunger)c Ff(mo)s(dule;)j(this)f(step)h(w)m(ould)g(b)s(e) +f(omitted)i(if)e(the)i(clien)m(t)f(w)m(as)g(op)s(erating)g(on)0 +2623 y(a)k(directory)f(rather)g(than)g(a)h(mo)s(dule.)240 +2917 y Fd(C:)47 b(Argument)f(supermunger)240 3021 y(C:)h(Directory)e(.) +240 3125 y(C:)i(/home/kingdon/testing/cvs)o(root)240 +3229 y(C:)g(expand-modules)125 3544 y Ff(The)37 b(serv)m(er)h(replies)e +(that)i(the)g Fd(supermunger)d Ff(mo)s(dule)h(expands)h(to)h(the)g +(directory)g Fd(supermunger)c Ff(\(the)0 3668 y(simplest)29 +b(case\):)240 3963 y Fd(S:)47 b(Module-expansion)d(supermunger)240 +4066 y(S:)j(ok)125 4381 y Ff(The)e(clien)m(t)g(then)h(pro)s(ceeds)g(to) +g(c)m(hec)m(k)i(out)e(the)g(directory)-8 b(.)88 b(The)45 +b(fact)i(that)f(it)g(sends)f(only)g(a)h(single)0 4506 +y Fd(Directory)30 b Ff(request)i(whic)m(h)f(sp)s(eci\014es)g(`)p +Fd(.)p Ff(')i(for)f(the)g(w)m(orking)g(directory)g(means)g(that)h +(there)g(is)e(not)i(already)f(a)0 4631 y Fd(supermunger)27 +b Ff(directory)j(on)g(the)h(clien)m(t.)240 4925 y Fd(C:)47 +b(Argument)f(-N)240 5029 y(C:)h(Argument)f(supermunger)240 +5132 y(C:)h(Directory)e(.)240 5236 y(C:)i(/home/kingdon/testing/cvs)o +(root)240 5340 y(C:)g(co)p eop +%%Page: 18 18 +18 17 bop 125 366 a Ff(The)23 b(serv)m(er)h(replies)e(with)h(the)h +(requested)g(\014les.)38 b(In)23 b(this)g(example,)i(there)f(is)f(only) +g(one,)j(`)p Fd(mungeall.c)p Ff('.)36 b(The)0 491 y Fd(Clear-sticky)23 b Ff(and)j Fd(Clear-static-directory)21 b Ff(requests)26 b(are)h(sen)m(t)g(b)m(y)f(the)h(curren)m(t)f(implemen)m(tation)g(but)0 -3707 y(they)33 b(ha)m(v)m(e)h(no)f(e\013ect)h(b)s(ecause)f(the)g +616 y(they)33 b(ha)m(v)m(e)h(no)f(e\013ect)h(b)s(ecause)f(the)g (default)f(is)g(for)h(those)g(settings)g(to)h(b)s(e)e(clear)h(when)f(a) -h(directory)f(is)g(newly)0 3832 y(created.)240 4095 y -Fd(S:)47 b(Clear-sticky)e(supermunger/)240 4198 y(S:)i +h(directory)f(is)g(newly)0 740 y(created.)240 1009 y +Fd(S:)47 b(Clear-sticky)e(supermunger/)240 1112 y(S:)i (/home/kingdon/testing/cvs)o(root)o(/su)o(perm)o(unge)o(r/)240 -4302 y(S:)g(Clear-static-directory)42 b(supermunger/)240 -4406 y(S:)47 b(/home/kingdon/testing/cvs)o(root)o(/su)o(perm)o(unge)o -(r/)240 4510 y(S:)g(E)h(cvs)f(server:)e(Updating)h(supermunger)240 -4614 y(S:)h(M)h(U)f(supermunger/mungeall.c)240 4717 y(S:)g(Created)f -(supermunger/)240 4821 y(S:)h(/home/kingdon/testing/cvs)o(root)o(/su)o -(perm)o(unge)o(r/m)o(unge)o(all.)o(c)240 4925 y(S:)g -(/mungeall.c/1.1///)240 5029 y(S:)g(u=rw,g=r,o=r)240 -5132 y(S:)g(26)240 5236 y(S:)g(int)g(mein)g(\(\))g({)g(abort)g(\(\);)g -(})240 5340 y(S:)g(ok)p eop -%%Page: 18 18 -18 17 bop 125 366 a Ff(The)26 b(curren)m(t)g(clien)m(t)h(implemen)m -(tation)e(w)m(ould)h(break)h(the)g(connection)g(here)f(and)g(mak)m(e)i -(a)f(new)g(connection)0 491 y(for)j(the)h(next)f(command.)41 +1216 y(S:)g(Clear-static-directory)42 b(supermunger/)240 +1320 y(S:)47 b(/home/kingdon/testing/cvs)o(root)o(/su)o(perm)o(unge)o +(r/)240 1424 y(S:)g(E)h(cvs)f(server:)e(Updating)h(supermunger)240 +1527 y(S:)h(M)h(U)f(supermunger/mungeall.c)240 1631 y(S:)g(Created)f +(supermunger/)240 1735 y(S:)h(/home/kingdon/testing/cvs)o(root)o(/su)o +(perm)o(unge)o(r/m)o(unge)o(all.)o(c)240 1839 y(S:)g +(/mungeall.c/1.1///)240 1943 y(S:)g(u=rw,g=r,o=r)240 +2046 y(S:)g(26)240 2150 y(S:)g(int)g(mein)g(\(\))g({)g(abort)g(\(\);)g +(})240 2254 y(S:)g(ok)125 2543 y Ff(The)26 b(curren)m(t)g(clien)m(t)h +(implemen)m(tation)e(w)m(ould)h(break)h(the)g(connection)g(here)f(and)g +(mak)m(e)i(a)f(new)g(connection)0 2668 y(for)j(the)h(next)f(command.)41 b(Ho)m(w)m(ev)m(er,)32 b(the)f(proto)s(col)f(allo)m(ws)g(it)g(to)h(k)m (eep)g(the)f(connection)h(op)s(en)f(and)f(con)m(tin)m(ue,)0 -616 y(whic)m(h)g(is)h(what)g(w)m(e)h(sho)m(w)f(here.)125 -934 y(After)37 b(the)g(user)g(mo)s(di\014es)e(the)j(\014le)e(and)h +2792 y(whic)m(h)g(is)h(what)g(w)m(e)h(sho)m(w)f(here.)125 +3082 y(After)37 b(the)g(user)g(mo)s(di\014es)e(the)j(\014le)e(and)h (instructs)f(the)h(clien)m(t)g(to)h(c)m(hec)m(k)h(it)d(bac)m(k)i(in.)60 -b(The)37 b(clien)m(t)g(sends)0 1058 y(argumen)m(ts)31 +b(The)37 b(clien)m(t)g(sends)0 3206 y(argumen)m(ts)31 b(to)g(sp)s(ecify)e(the)h(log)h(message)g(and)f(\014le)g(to)h(c)m(hec)m -(k)h(in:)240 1356 y Fd(C:)47 b(Argument)f(-m)240 1459 +(k)h(in:)240 3475 y Fd(C:)47 b(Argument)f(-m)240 3578 y(C:)h(Argument)f(Well,)g(you)h(see,)g(it)g(took)f(me)i(hours)e(and)h -(hours)f(to)h(find)g(this)g(typo)f(and)h(I)240 1563 y(C:)g(Argumentx)e +(hours)f(to)h(find)g(this)g(typo)f(and)h(I)240 3682 y(C:)g(Argumentx)e (searched)h(and)h(searched)e(and)i(eventually)e(had)i(to)g(ask)g(John)g -(for)g(help.)240 1667 y(C:)g(Argument)f(mungeall.c)125 -1985 y Ff(It)23 b(also)h(sends)f(information)f(ab)s(out)h(the)h(con)m +(for)g(help.)240 3786 y(C:)g(Argument)f(mungeall.c)125 +4075 y Ff(It)23 b(also)h(sends)f(information)f(ab)s(out)h(the)h(con)m (ten)m(ts)i(of)e(the)g(w)m(orking)f(directory)-8 b(,)25 -b(including)20 b(the)k(new)f(con)m(ten)m(ts)0 2110 y(of)45 +b(including)20 b(the)k(new)f(con)m(ten)m(ts)0 4200 y(of)45 b(the)g(mo)s(di\014ed)e(\014le.)83 b(Note)46 b(that)g(the)f(user)f(has) g(c)m(hanged)i(in)m(to)f(the)g(`)p Fd(supermunger)p Ff(')d(directory)i -(b)s(efore)0 2234 y(executing)29 b(this)e(command;)j(the)e(top)h(lev)m +(b)s(efore)0 4324 y(executing)29 b(this)e(command;)j(the)e(top)h(lev)m (el)g(directory)f(is)f(a)i(user-visible)d(concept)k(b)s(ecause)e(the)h -(serv)m(er)g(should)0 2359 y(prin)m(t)g(\014lenames)g(in)h +(serv)m(er)g(should)0 4449 y(prin)m(t)g(\014lenames)g(in)h Fd(M)g Ff(and)f Fd(E)h Ff(resp)s(onses)g(relativ)m(e)g(to)h(that)g -(directory)-8 b(.)240 2656 y Fd(C:)47 b(Directory)e(.)240 -2760 y(C:)i(/home/kingdon/testing/cvs)o(root)o(/su)o(perm)o(unge)o(r) -240 2864 y(C:)g(Entry)g(/mungeall.c/1.1///)240 2967 y(C:)g(Modified)f -(mungeall.c)240 3071 y(C:)h(u=rw,g=r,o=r)240 3175 y(C:)g(26)240 -3279 y(C:)g(int)g(main)g(\(\))g({)g(abort)g(\(\);)g(})125 -3597 y Ff(And)29 b(\014nally)-8 b(,)29 b(the)i(clien)m(t)e(issues)h -(the)g(c)m(hec)m(kin)h(command)f(\(whic)m(h)f(mak)m(es)j(use)e(of)g -(the)h(data)g(just)f(sen)m(t\):)240 3894 y Fd(C:)47 b(ci)125 -4212 y Ff(And)29 b(the)i(serv)m(er)f(tells)g(the)g(clien)m(t)g(that)h -(the)g(c)m(hec)m(kin)f(succeeded:)240 4510 y Fd(S:)47 -b(M)h(Checking)d(in)i(mungeall.c;)240 4614 y(S:)g(E)h +(directory)-8 b(.)240 4717 y Fd(C:)47 b(Directory)e(.)240 +4821 y(C:)i(/home/kingdon/testing/cvs)o(root)o(/su)o(perm)o(unge)o(r) +240 4925 y(C:)g(Entry)g(/mungeall.c/1.1///)240 5029 y(C:)g(Modified)f +(mungeall.c)240 5132 y(C:)h(u=rw,g=r,o=r)240 5236 y(C:)g(26)240 +5340 y(C:)g(int)g(main)g(\(\))g({)g(abort)g(\(\);)g(})p +eop +%%Page: 19 19 +19 18 bop 125 366 a Ff(And)29 b(\014nally)-8 b(,)29 b(the)i(clien)m(t)e +(issues)h(the)g(c)m(hec)m(kin)h(command)f(\(whic)m(h)f(mak)m(es)j(use)e +(of)g(the)h(data)g(just)f(sen)m(t\):)240 620 y Fd(C:)47 +b(ci)125 894 y Ff(And)29 b(the)i(serv)m(er)f(tells)g(the)g(clien)m(t)g +(that)h(the)g(c)m(hec)m(kin)f(succeeded:)240 1147 y Fd(S:)47 +b(M)h(Checking)d(in)i(mungeall.c;)240 1251 y(S:)g(E)h (/home/kingdon/testing/c)o(vsro)o(ot/)o(supe)o(rmun)o(ger)o(/mun)o -(geal)o(l.c)o(,v)89 b(<--)95 b(mungeall.c)240 4717 y(S:)47 +(geal)o(l.c)o(,v)89 b(<--)95 b(mungeall.c)240 1354 y(S:)47 b(E)h(new)f(revision:)e(1.2;)h(previous)g(revision:)f(1.1)240 -4821 y(S:)i(E)h(done)240 4925 y(S:)f(Mode)g(u=rw,g=r,o=r)240 -5029 y(S:)g(Checked-in)e(./)240 5132 y(S:)i(/home/kingdon/testing/cvs)o +1458 y(S:)i(E)h(done)240 1562 y(S:)f(Mode)g(u=rw,g=r,o=r)240 +1666 y(S:)g(Checked-in)e(./)240 1770 y(S:)i(/home/kingdon/testing/cvs)o (root)o(/su)o(perm)o(unge)o(r/m)o(unge)o(all.)o(c)240 -5236 y(S:)g(/mungeall.c/1.2///)240 5340 y(S:)g(ok)p eop -%%Page: 19 19 -19 18 bop 0 366 a Fa(5.7)68 b(Required)31 b(v)l(ersus)g(optional)g -(parts)g(of)g(the)f(proto)t(col)125 640 y Ff(The)22 b(follo)m(wing)f -(are)i(part)f(of)h(ev)m(ery)g(kno)m(wn)f(implemen)m(tation)f(of)i(the)g -(CVS)f(proto)s(col)g(\(except)i(obsolete,)h(pre-)0 765 -y(1.5,)31 b(v)m(ersions)d(of)h(CVS\))g(and)f(it)h(is)f(considered)f -(reasonable)i(b)s(eha)m(vior)f(to)i(completely)f(fail)e(to)j(w)m(ork)f -(if)f(y)m(ou)i(are)0 890 y(connected)j(with)d(an)i(implemen)m(tation)e -(whic)m(h)g(attempts)j(to)f(not)g(supp)s(ort)e(them.)45 -b(Requests:)f Fd(Root)p Ff(,)31 b Fd(Valid-)0 1014 y(responses)p -Ff(,)42 b Fd(valid-requests)p Ff(,)f Fd(Directory)p Ff(,)h -Fd(Entry)p Ff(,)h Fd(Modified)p Ff(,)f Fd(Unchanged)p -Ff(,)g Fd(Argument)p Ff(,)g Fd(Argumentx)p Ff(,)0 1139 -y Fd(ci)p Ff(,)28 b Fd(co)p Ff(,)g Fd(update)p Ff(.)39 -b(Resp)s(onses:)f Fd(ok)p Ff(,)29 b Fd(error)p Ff(,)e -Fd(Valid-requests)p Ff(,)e Fd(Checked-in)p Ff(,)h Fd(Updated)p -Ff(,)h Fd(Merged)p Ff(,)g Fd(Removed)p Ff(,)0 1263 y -Fd(M)p Ff(,)j Fd(E)p Ff(.)125 1537 y(A)23 b(serv)m(er)h(need)f(not)h -(implemen)m(t)e Fd(Repository)p Ff(,)h(but)g(in)f(order)h(to)h(in)m -(terop)s(erate)g(with)e(CVS)h(1.5)i(through)e(1.9)0 1662 -y(it)30 b(m)m(ust)f(claim)h(to)g(implemen)m(t)f(it)h(\(in)f +1873 y(S:)g(/mungeall.c/1.2///)240 1977 y(S:)g(ok)0 2413 +y Fa(5.7)68 b(Required)31 b(v)l(ersus)g(optional)g(parts)g(of)g(the)f +(proto)t(col)125 2687 y Ff(The)22 b(follo)m(wing)f(are)i(part)f(of)h +(ev)m(ery)g(kno)m(wn)f(implemen)m(tation)f(of)i(the)g(CVS)f(proto)s +(col)g(\(except)i(obsolete,)h(pre-)0 2812 y(1.5,)31 b(v)m(ersions)d(of) +h(CVS\))g(and)f(it)h(is)f(considered)f(reasonable)i(b)s(eha)m(vior)f +(to)i(completely)f(fail)e(to)j(w)m(ork)f(if)f(y)m(ou)i(are)0 +2936 y(connected)j(with)d(an)i(implemen)m(tation)e(whic)m(h)g(attempts) +j(to)f(not)g(supp)s(ort)e(them.)45 b(Requests:)f Fd(Root)p +Ff(,)31 b Fd(Valid-)0 3061 y(responses)p Ff(,)42 b Fd(valid-requests)p +Ff(,)f Fd(Directory)p Ff(,)h Fd(Entry)p Ff(,)h Fd(Modified)p +Ff(,)f Fd(Unchanged)p Ff(,)g Fd(Argument)p Ff(,)g Fd(Argumentx)p +Ff(,)0 3185 y Fd(ci)p Ff(,)28 b Fd(co)p Ff(,)g Fd(update)p +Ff(.)39 b(Resp)s(onses:)f Fd(ok)p Ff(,)29 b Fd(error)p +Ff(,)e Fd(Valid-requests)p Ff(,)e Fd(Checked-in)p Ff(,)h +Fd(Updated)p Ff(,)h Fd(Merged)p Ff(,)g Fd(Removed)p Ff(,)0 +3310 y Fd(M)p Ff(,)j Fd(E)p Ff(.)125 3584 y(A)23 b(serv)m(er)h(need)f +(not)h(implemen)m(t)e Fd(Repository)p Ff(,)h(but)g(in)f(order)h(to)h +(in)m(terop)s(erate)g(with)e(CVS)h(1.5)i(through)e(1.9)0 +3708 y(it)30 b(m)m(ust)f(claim)h(to)g(implemen)m(t)f(it)h(\(in)f Fd(Valid-requests)p Ff(\).)37 b(The)29 b(clien)m(t)h(will)d(not)k -(actually)e(send)g(the)i(request.)0 2110 y Fa(5.8)68 -b(Obsolete)32 b(proto)t(col)f(elemen)l(ts)125 2384 y +(actually)e(send)g(the)i(request.)0 4144 y Fa(5.8)68 +b(Obsolete)32 b(proto)t(col)f(elemen)l(ts)125 4418 y Ff(This)39 b(section)i(brie\015y)f(describ)s(es)f(proto)s(col)i(elemen) m(ts)h(whic)m(h)e(are)h(obsolete.)74 b(There)41 b(is)f(no)h(attempt)h -(to)0 2508 y(do)s(cumen)m(t)30 b(them)h(in)e(full)f(detail.)125 -2782 y(There)i(w)m(as)g(a)h Fd(Repository)d Ff(request)j(whic)m(h)e(w)m +(to)0 4543 y(do)s(cumen)m(t)30 b(them)h(in)e(full)f(detail.)125 +4817 y(There)i(w)m(as)g(a)h Fd(Repository)d Ff(request)j(whic)m(h)e(w)m (as)i(lik)m(e)e Fd(Directory)f Ff(except)k(it)e(only)g(pro)m(vided)f -Fe(rep)s(ository)p Ff(,)0 2907 y(and)h(the)g(lo)s(cal)g(directory)g(w)m -(as)h(assumed)e(to)i(b)s(e)f(similarly)d(named.)125 3181 +Fe(rep)s(ository)p Ff(,)0 4941 y(and)h(the)g(lo)s(cal)g(directory)g(w)m +(as)h(assumed)e(to)i(b)s(e)f(similarly)d(named.)125 5215 y(If)i(the)g Fd(UseUnchanged)e Ff(request)i(w)m(as)h(not)g(sen)m(t,)h (there)e(w)m(as)h(a)g Fd(Lost)f Ff(request)g(whic)m(h)g(w)m(as)g(sen)m -(t)i(to)f(indicate)0 3305 y(that)c(a)f(\014le)g(did)e(not)j(exist)f(in) +(t)i(to)f(indicate)0 5340 y(that)c(a)f(\014le)g(did)e(not)j(exist)f(in) f(the)h(w)m(orking)g(directory)-8 b(,)26 b(and)f(the)g(meaning)g(of)g -(sending)f Fd(Entries)f Ff(without)h Fd(Lost)0 3430 y -Ff(or)32 b Fd(Modified)d Ff(w)m(as)j(di\013eren)m(t.)44 -b(All)30 b(curren)m(t)i(clien)m(ts)f(\(CVS)g(1.5)i(and)e(later\))h -(will)d(send)i Fd(UseUnchanged)d Ff(if)j(it)g(is)0 3555 +(sending)f Fd(Entries)f Ff(without)h Fd(Lost)p eop +%%Page: 20 20 +20 19 bop 0 366 a Ff(or)32 b Fd(Modified)d Ff(w)m(as)j(di\013eren)m(t.) +44 b(All)30 b(curren)m(t)i(clien)m(ts)f(\(CVS)g(1.5)i(and)e(later\))h +(will)d(send)i Fd(UseUnchanged)d Ff(if)j(it)g(is)0 491 y(supp)s(orted.)p eop %%Trailer end |