4 This file contains notes regarding the files stored in the openssh CVS
5 module that contains the GSI-OpenSSH code. Consider it a living document.
7 [ Generic Tag Merging ]
9 <newBase> refers to the new tag that lives in the repository.
10 Supposedly, you are undergoing a cvs merge because a new GSI patch has
11 been created (along with a new corresponding tag).
13 1. Set up your environment to point to the correct CVS repository.
15 $ export CVSROOT="<username>@cvs.ncsa.uiuc.edu:/CVS/gssapi-openssh"
17 2. Commit any locally-modified files.
22 3. Tag the repository before the merge.
24 $ cvs tag <newBase>_GPT-premerge
26 4. Merge the changes from your original base merge point to your new
29 $ cvs update -kk -jOPENSSH_GSI_GPT_BASE -j<newBase>
31 5. Retrieve a list of any conflicts that were discovered as a result
34 $ cvs -n update | grep C
36 6. Resolve all of the conflicts in each of the listed files.
38 7. Add an entry to the History section of this file detailing your
39 merge action, along with noting conflicts that occurred and any
40 interesting changes you had to make to resolve them.
42 8. Move OPENSSH_GSI_GPT_BASE.
44 $ cvs rtag -F -r <newBase> OPENSSH_GSI_GPT_BASE openssh
46 9. Commit all of the files in your working directory to the
47 repository and tag the working directory as merged.
50 $ cvs tag <newBase>_GPT-merged
57 - occurred on: GPT branch
58 - orig base: OPENSSH_3_7_1P2_GSSAPI_20040123
59 - new base: OPENSSH_3_8P1_GSSAPI_20040304
62 acss.o added to LIBSSH_OBJS in OpenSSH release.
63 conflicted because of nearby comment about LIBSSH_OBJS on
66 bugfix on trunk ('==' should be '=') in globus-static
67 section conflicted because earlier line differs between
69 code to add -lcrypto to $LIBS conflicted because base
70 OpenSSH change moved -lcrypto before $LIBS and trunk and
71 gpt-branch differed on whitespace. accepted trunk version
72 with same whitespace to avoid future conflicts.
73 OpenSSH base pid-dir code changed, causing conflict
74 because we drop this code on gpt-branch, as we want
75 pid-dir set at run-time based on $GL, not configure time.
77 OpenSSH base version changed and patch version spec
78 conflicts with GPT version spec. accepted OpenSSH base
79 version change and incremented GPT version spec to 3.1.
80 this will probably conflict every time from now on.
85 - occurred on: GPT branch
86 - orig base: OPENSSH_3_7_1P2_GSSAPI_20040119
87 - new base: OPENSSH_3_7_1P2_GSSAPI_20040123
93 - occurred on: GPT branch
94 - orig base: OPENSSH_3_6_1P2_GSSAPI_20030721
95 - new base: OPENSSH_3_7_1P2_GSSAPI_20040119
101 - occurred on: GPT branch
102 - orig base: OPENSSH_3_6_1P2_GSSAPI_20030505
103 - new base: OPENSSH_3_6_1P2_GSSAPI_20030721
109 - occurred on: GPT branch
110 - orig base: OPENSSH_3_6_1P1_GSSAPI_20030425
111 - new base: OPENSSH_3_6_1P2_GSSAPI_20030505
117 - occurred on: GPT branch
118 - orig base: OPENSSH_3_6_1P1_GSSAPI_20030408
119 - new base: OPENSSH_3_6_1P1_GSSAPI_20030425
121 - Makefile.in, configure.ac
122 caused by base changes to file
127 - occurred on: GPT branch
128 - orig base: OPENSSH_3_5P1_GSI_20030317
129 - new base: OPENSSH_3_6_1P1_GSSAPI_20030408
132 caused by base changes to file
134 pathname changes on this branch
139 - occurred on: GPT branch (OPENSSH_3_1P1_GSSAPI_GPT-branch)
140 - original base: OPENSSH_3_5P1_GSI_20030227
141 - new base: OPENSSH_3_5P1_GSI_20030317
147 - occurred on: GPT branch (OPENSSH_3_1P1_GSSAPI_GPT-branch)
148 - original base: OPENSSH_3_5P1_GSI_20021018
149 - new base: OPENSSH_3_5P1_GSI_20030227
152 cvs choked on my changes to the globus additions. wasn't a "real" conflict.
156 Action: Tag GPT branch as new release
157 - occurred on: GPT branch (OPENSSH_3_1P1_GSSAPI_GPT-branch)
162 - occurred on: GPT branch (OPENSSH_3_1P1_GSSAPI_GPT-branch)
163 - original base: OPENSSH_3_4P1_GSI_20021008
164 - new base: OPENSSH_3_5P1_GSI_20021018
167 resolved by removing check-user and adding check-config.
172 - occurred on: GPT branch (OPENSSH_3_1P1_GSSAPI_GPT-branch)
173 - original base: OPENSSH_3_4P1_GSI_20020926
174 - new base: OPENSSH_3_4P1_GSI_20021008
180 - occurred on: GPT branch (OPENSSH_3_1P1_GSSAPI_GPT-branch)
181 - original base: OPENSSH_3_4P1_GSI_20020924
182 - new base: OPENSSH_3_4P1_GSI_20020926
188 - occurred on: GPT branch (OPENSSH_3_1P1_GSSAPI_GPT-branch)
189 - original base: OPENSSH_3_4P1_GSI_20020923
190 - new base: OPENSSH_3_4P1_GSI_20020924
196 - occurred on: GPT branch (OPENSSH_3_1P1_GSSAPI_GPT-branch)
197 - original base: OPENSSH_3_4P1_GSI_20020701
198 - new base: OPENSSH_3_4P1_GSI_20020923
201 resolved by ignoring mainline changes and keeping the text that was
202 originally in the file on this branch. (We require a specified flavor type
203 where the trunk can compensate in that case.)