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).
+
1. Set up your environment to point to the correct CVS repository.
- $ export CVSROOT="/afs/ncsa/projects/globus/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 -j<originalBase> -j<newBase>
+ $ 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.
+
+ 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.
+
+ 8. Move OPENSSH_GSI_GPT_BASE.
- 5. Commit all of the files in your working directory to the repository and tag
- the repository.
+ $ cvs rtag -F -r <newBase> OPENSSH_GSI_GPT_BASE openssh
+
+ 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 ]
- 2002/09/23
+ 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
+ - occurred on: GPT branch
+ - orig base: OPENSSH_3_6_1P1_GSSAPI_20030425
+ - new base: OPENSSH_3_6_1P2_GSSAPI_20030505
+ Conflicts: 0
+
+ 2003/05/05
+ ----------
+ Action: Merge
+ - occurred on: GPT branch
+ - orig base: OPENSSH_3_6_1P1_GSSAPI_20030408
+ - new base: OPENSSH_3_6_1P1_GSSAPI_20030425
+ Conflicts: 2
+ - Makefile.in, configure.ac
+ caused by base changes to file
+
+ 2003/04/10
+ ----------
+ Action: Merge
+ - occurred on: GPT branch
+ - orig base: OPENSSH_3_5P1_GSI_20030317
+ - new base: OPENSSH_3_6_1P1_GSSAPI_20030408
+ Conflicts: 2
+ - Makefile.in
+ caused by base changes to file
+ - ssh-agent.c
+ pathname changes on this branch
+
+ 2003/03/17
----------
Action: Merge
- occurred on: GPT branch (OPENSSH_3_1P1_GSSAPI_GPT-branch)
- - original base: OPENSSH_3_4P1_GSI_20020701
- - new base: OPENSSH_3_4P1_GSI_20020923
+ - original base: OPENSSH_3_5P1_GSI_20030227
+ - new base: OPENSSH_3_5P1_GSI_20030317
+ Conflicts: 0
+
+ 2003/03/07
+ ----------
+ Action: Merge
+ - occurred on: GPT branch (OPENSSH_3_1P1_GSSAPI_GPT-branch)
+ - original base: OPENSSH_3_5P1_GSI_20021018
+ - new base: OPENSSH_3_5P1_GSI_20030227
Conflicts: 1
- configure.ac
- resolved by ignoring mainline changes and keeping the text that was
- originally in the file on this branch. (We require a specified flavor type
- where the trunk can compensate in that case.)
+ cvs choked on my changes to the globus additions. wasn't a "real" conflict.
+
+ 2003/02/06
+ ----------
+ Action: Tag GPT branch as new release
+ - occurred on: GPT branch (OPENSSH_3_1P1_GSSAPI_GPT-branch)
+
+ 2002/10/18
+ ----------
+ Action: Merge
+ - occurred on: GPT branch (OPENSSH_3_1P1_GSSAPI_GPT-branch)
+ - original base: OPENSSH_3_4P1_GSI_20021008
+ - new base: OPENSSH_3_5P1_GSI_20021018
+ Conflicts: 1
+ - Makefile.in
+ resolved by removing check-user and adding check-config.
+
+ 2002/10/08
+ ----------
+ Action: Merge
+ - occurred on: GPT branch (OPENSSH_3_1P1_GSSAPI_GPT-branch)
+ - original base: OPENSSH_3_4P1_GSI_20020926
+ - new base: OPENSSH_3_4P1_GSI_20021008
+ Conflicts: 0
+
+ 2002/09/26
+ ----------
+ Action: Merge
+ - occurred on: GPT branch (OPENSSH_3_1P1_GSSAPI_GPT-branch)
+ - original base: OPENSSH_3_4P1_GSI_20020924
+ - new base: OPENSSH_3_4P1_GSI_20020926
+ Conflicts: 0
2002/09/24
----------
- original base: OPENSSH_3_4P1_GSI_20020923
- new base: OPENSSH_3_4P1_GSI_20020924
Conflicts: 0
+
+ 2002/09/23
+ ----------
+ Action: Merge
+ - occurred on: GPT branch (OPENSSH_3_1P1_GSSAPI_GPT-branch)
+ - original base: OPENSSH_3_4P1_GSI_20020701
+ - new base: OPENSSH_3_4P1_GSI_20020923
+ Conflicts: 1
+ - configure.ac
+ resolved by ignoring mainline changes and keeping the text that was
+ originally in the file on this branch. (We require a specified flavor type
+ where the trunk can compensate in that case.)
andersk / gssapi-openssh.git / blobdiff