o Make the steps easier to follow and less-error prone.

diff --git a/openssh/CVSNOTES b/openssh/CVSNOTES
index 8182089d4d15f978d076846c49f2fe36f28de501..f23bcb8d7dccb6aa13e6380f02de9a1b04747baa 100644 (file)
--- a/openssh/CVSNOTES
+++ b/openssh/CVSNOTES
@@ -8,45 +8,48 @@ contains the GSI-OpenSSH code.  Consider it a living document.
 
     <newBase> refers to the new tag that lives in the repository.  Supposedly, you
     are undergoing a cvs merge because a new GSI patch has been created (along with
-    a new corresponding tag).  Let <tagName> be the string "<newBase>_GPT".
+    a new corresponding tag).
 
     1. Set up your environment to point to the correct CVS repository.
 
           $ export CVSROOT="<username>@cvs.ncsa.uiuc.edu:/CVS/gssapi-openssh"
 
-    2. Commit any locally-modified files and tag the repository before the merge.
+    2. Commit any locally-modified files.
 
           $ cvs update
           $ cvs commit
-          $ cvs tag <tagName>-premerge
 
-    2. Merge the changes from your original base merge point to your new base merge
+    3. Tag the repository before the merge.
+
+          $ cvs tag <newBase>_GPT-premerge
+
+    4. Merge the changes from your original base merge point to your new base merge
        point.
 
           $ cvs update -kk -jOPENSSH_GSI_GPT_BASE -j<newBase>
 
-    3. Retrieve a list of any conflicts that were discovered as a result of the
+    5. Retrieve a list of any conflicts that were discovered as a result of the
        merge.
 
           $ cvs -n update | grep C
 
-    4. Resolve all of the conflicts in each of the listed files.
+    6. Resolve all of the conflicts in each of the listed files.
 
-    5. Commit all of the files in your working directory to the repository and tag
+    7. Commit all of the files in your working directory to the repository and tag
        the repository.
 
           $ cvs commit
           $ cvs rtag -F -r <newBase> OPENSSH_GSI_GPT_BASE openssh
 
-    6. Add an entry to the History section of this file detailing your merge action,
+    8. Add an entry to the History section of this file detailing your merge action,
        along with noting conflicts that occurred and any interesting changes you had
        to make to resolve them.
 
-    7. Commit your change to this file to the repository and tag the working directory
+    9. Commit your change to this file to the repository and tag the working directory
        as merged.
 
           $ cvs commit
-          $ cvs tag <tagName>-merged
+          $ cvs tag <newBase>_GPT-merged
 
   [ History ]