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_8_1P1_GSSAPI_20040713
59 - new base: OPENSSH_3_9P1_GSSAPI_20040818
62 Include pathnames.o in LIBSSH_OBJS.
64 Set _PATH_SSH_KEY_SIGN to be an extern char pointer (instead of #defined).
68 Update to new package version information.
73 - occurred on: GPT branch
74 - orig base: OPENSSH_3_8_1P1_GSSAPI_20040629
75 - new base: OPENSSH_3_8_1P1_GSSAPI_20040713
81 - occurred on: GPT branch
82 - orig base: OPENSSH_3_8P1_GSSAPI_20040422
83 - new base: OPENSSH_3_8_1P1_GSSAPI_20040629
86 Old log entries were trimmed in the 3.8.1p1 release.
87 Not sure why this generated a conflict.
89 Copyright statement added to head of configure.ac, which
90 generated a conflict due to nearby $Id$ evil.
92 We do child_set_env("GLOBUS_LOCATION") on the branch, and
93 this conflicted with the child_set_env("LIBPATH") changes
94 on the trunk. Merged in child_set_env("GLOBUS_LOCATION")
97 Should always get a conflict here on version changes.
98 Bumped version to OpenSSH_3.8.1P1 NCSA_GSSAPI_GPT_3.3.
103 - occurred on: GPT branch
104 - orig base: OPENSSH_3_8P1_GSSAPI_20040305
105 - new base: OPENSSH_3_8P1_GSSAPI_20040422
111 - occurred on: GPT branch
112 - orig base: OPENSSH_3_8P1_GSSAPI_20040304
113 - new base: OPENSSH_3_8P1_GSSAPI_20040305
119 - occurred on: GPT branch
120 - orig base: OPENSSH_3_7_1P2_GSSAPI_20040123
121 - new base: OPENSSH_3_8P1_GSSAPI_20040304
124 acss.o added to LIBSSH_OBJS in OpenSSH release.
125 conflicted because of nearby comment about LIBSSH_OBJS on
128 bugfix on trunk ('==' should be '=') in globus-static
129 section conflicted because earlier line differs between
130 trunk and gpt-branch.
131 code to add -lcrypto to $LIBS conflicted because base
132 OpenSSH change moved -lcrypto before $LIBS and trunk and
133 gpt-branch differed on whitespace. accepted trunk version
134 with same whitespace to avoid future conflicts.
135 OpenSSH base pid-dir code changed, causing conflict
136 because we drop this code on gpt-branch, as we want
137 pid-dir set at run-time based on $GL, not configure time.
139 OpenSSH base version changed and patch version spec
140 conflicts with GPT version spec. accepted OpenSSH base
141 version change and incremented GPT version spec to 3.1.
142 this will probably conflict every time from now on.
147 - occurred on: GPT branch
148 - orig base: OPENSSH_3_7_1P2_GSSAPI_20040119
149 - new base: OPENSSH_3_7_1P2_GSSAPI_20040123
155 - occurred on: GPT branch
156 - orig base: OPENSSH_3_6_1P2_GSSAPI_20030721
157 - new base: OPENSSH_3_7_1P2_GSSAPI_20040119
163 - occurred on: GPT branch
164 - orig base: OPENSSH_3_6_1P2_GSSAPI_20030505
165 - new base: OPENSSH_3_6_1P2_GSSAPI_20030721
171 - occurred on: GPT branch
172 - orig base: OPENSSH_3_6_1P1_GSSAPI_20030425
173 - new base: OPENSSH_3_6_1P2_GSSAPI_20030505
179 - occurred on: GPT branch
180 - orig base: OPENSSH_3_6_1P1_GSSAPI_20030408
181 - new base: OPENSSH_3_6_1P1_GSSAPI_20030425
183 - Makefile.in, configure.ac
184 caused by base changes to file
189 - occurred on: GPT branch
190 - orig base: OPENSSH_3_5P1_GSI_20030317
191 - new base: OPENSSH_3_6_1P1_GSSAPI_20030408
194 caused by base changes to file
196 pathname changes on this branch
201 - occurred on: GPT branch (OPENSSH_3_1P1_GSSAPI_GPT-branch)
202 - original base: OPENSSH_3_5P1_GSI_20030227
203 - new base: OPENSSH_3_5P1_GSI_20030317
209 - occurred on: GPT branch (OPENSSH_3_1P1_GSSAPI_GPT-branch)
210 - original base: OPENSSH_3_5P1_GSI_20021018
211 - new base: OPENSSH_3_5P1_GSI_20030227
214 cvs choked on my changes to the globus additions. wasn't a "real" conflict.
218 Action: Tag GPT branch as new release
219 - occurred on: GPT branch (OPENSSH_3_1P1_GSSAPI_GPT-branch)
224 - occurred on: GPT branch (OPENSSH_3_1P1_GSSAPI_GPT-branch)
225 - original base: OPENSSH_3_4P1_GSI_20021008
226 - new base: OPENSSH_3_5P1_GSI_20021018
229 resolved by removing check-user and adding check-config.
234 - occurred on: GPT branch (OPENSSH_3_1P1_GSSAPI_GPT-branch)
235 - original base: OPENSSH_3_4P1_GSI_20020926
236 - new base: OPENSSH_3_4P1_GSI_20021008
242 - occurred on: GPT branch (OPENSSH_3_1P1_GSSAPI_GPT-branch)
243 - original base: OPENSSH_3_4P1_GSI_20020924
244 - new base: OPENSSH_3_4P1_GSI_20020926
250 - occurred on: GPT branch (OPENSSH_3_1P1_GSSAPI_GPT-branch)
251 - original base: OPENSSH_3_4P1_GSI_20020923
252 - new base: OPENSSH_3_4P1_GSI_20020924
258 - occurred on: GPT branch (OPENSSH_3_1P1_GSSAPI_GPT-branch)
259 - original base: OPENSSH_3_4P1_GSI_20020701
260 - new base: OPENSSH_3_4P1_GSI_20020923
263 resolved by ignoring mainline changes and keeping the text that was
264 originally in the file on this branch. (We require a specified flavor type
265 where the trunk can compensate in that case.)