CVSNOTES
========
-This file contains notes regarding the files stored in the openssh CVS module that
-contains the GSI-OpenSSH code. Consider it a living document.
+This file contains notes regarding the files stored in the openssh CVS
+module that contains the GSI-OpenSSH code. Consider it a living document.
[ Generic Tag Merging ]
- <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".
+ <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).
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
- point.
+ 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
- merge.
+ 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
- the repository.
+ 7. 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.
- $ cvs commit
- $ cvs rtag -F -r <newBase> OPENSSH_GSI_GPT_BASE openssh
+ 8. Move OPENSSH_GSI_GPT_BASE.
- 6. 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.
+ $ cvs rtag -F -r <newBase> OPENSSH_GSI_GPT_BASE openssh
- 7. Commit your change to this file to the repository and tag the working directory
- as merged.
+ 9. Commit all of the files in your working directory to the
+ repository and tag the working directory as merged.
$ cvs commit
- $ cvs tag <tagName>-merged
+ $ cvs tag <newBase>_GPT-merged
[ History ]
+ 2004/03/05
+ ----------
+ Action: Merge
+ - occurred on: GPT branch
+ - orig base: OPENSSH_3_8P1_GSSAPI_20040304
+ - new base: OPENSSH_3_8P1_GSSAPI_20040305
+ Conflicts: 0
+
+ 2004/03/04
+ ----------
+ Action: Merge
+ - occurred on: GPT branch
+ - orig base: OPENSSH_3_7_1P2_GSSAPI_20040123
+ - new base: OPENSSH_3_8P1_GSSAPI_20040304
+ Conflicts: 3
+ - Makefile.in
+ acss.o added to LIBSSH_OBJS in OpenSSH release.
+ conflicted because of nearby comment about LIBSSH_OBJS on
+ gpt-branch.
+ - configure.ac
+ bugfix on trunk ('==' should be '=') in globus-static
+ section conflicted because earlier line differs between
+ trunk and gpt-branch.
+ code to add -lcrypto to $LIBS conflicted because base
+ OpenSSH change moved -lcrypto before $LIBS and trunk and
+ gpt-branch differed on whitespace. accepted trunk version
+ with same whitespace to avoid future conflicts.
+ OpenSSH base pid-dir code changed, causing conflict
+ because we drop this code on gpt-branch, as we want
+ pid-dir set at run-time based on $GL, not configure time.
+ - version.h
+ OpenSSH base version changed and patch version spec
+ conflicts with GPT version spec. accepted OpenSSH base
+ version change and incremented GPT version spec to 3.1.
+ this will probably conflict every time from now on.
+
+ 2004/01/23
+ ----------
+ Action: Merge
+ - occurred on: GPT branch
+ - orig base: OPENSSH_3_7_1P2_GSSAPI_20040119
+ - new base: OPENSSH_3_7_1P2_GSSAPI_20040123
+ Conflicts: 0
+
+ 2004/01/19
+ ----------
+ Action: Merge
+ - occurred on: GPT branch
+ - orig base: OPENSSH_3_6_1P2_GSSAPI_20030721
+ - new base: OPENSSH_3_7_1P2_GSSAPI_20040119
+ Conflicts: many
+
+ 2003/07/25
+ ----------
+ Action: Merge
+ - occurred on: GPT branch
+ - orig base: OPENSSH_3_6_1P2_GSSAPI_20030505
+ - new base: OPENSSH_3_6_1P2_GSSAPI_20030721
+ Conflicts: 0
+
2003/05/05
----------
Action: Merge