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. Add any new files to the branch. Run:
33 $ cvs diff -rOPENSSH_GSI_GPT_BASE -r<newBase> > /dev/null
35 For each "tag OPENSSH_GSI_GPT_BASE is not in file", run:
37 $ cvs update -jHEAD <filename>
39 5. Retrieve a list of any conflicts that were discovered as a result
42 $ cvs -n update | grep C
44 6. Resolve all of the conflicts in each of the listed files.
46 7. Add an entry to the History section of this file detailing your
47 merge action, along with noting conflicts that occurred and any
48 interesting changes you had to make to resolve them.
50 8. Move OPENSSH_GSI_GPT_BASE.
52 $ cvs rtag -F -r <newBase> OPENSSH_GSI_GPT_BASE openssh
54 9. Commit all of the files in your working directory to the
55 repository and tag the working directory as merged.
58 $ cvs tag <newBase>_GPT-merged
65 - occurred on: GPT branch
66 - orig base: OPENSSH_4_5P1_20070215
67 - new base: OPENSSH_4_5P1_20070218
73 - occurred on: GPT branch
74 - orig base: OPENSSH_4_3P2_20060726
75 - new base: OPENSSH_4_5P1_20070215
80 PAM checks moved and updated. Merged by hand.
84 UsePam description changed, and we default to yes.
86 NCSA_VERSION constant added on trunk.
91 - occurred on: GPT branch
92 - orig base: OPENSSH_4_2P1_GSSAPI_20051220
93 - new base: OPENSSH_4_3P2_20060726
96 OpenSSH change was near GSI change. No real conflict.
98 New sGsiAllowLimitedProxy config option.
100 OpenSSH change near init_pathnames().
102 OpenSSH change near init_pathnames().
104 OpenSSH change near ForwardX11 yes
106 Update to new package version information.
111 - occurred on: GPT branch
112 - orig base: OPENSSH_3_9P1_GSSAPI_20040818
113 - new base: OPENSSH_4_2P1_GSSAPI_20051220
116 kexgssc.o moved in Simon's patch
117 new install-sysconf target from OpenSSH release
119 new --with-pid-dir section from OpenSSH release
121 #include "hostfile.h" added from OpenSSH release
123 Update to new package version information.
128 - occurred on: GPT branch
129 - orig base: OPENSSH_3_8_1P1_GSSAPI_20040713
130 - new base: OPENSSH_3_9P1_GSSAPI_20040818
133 Include pathnames.o in LIBSSH_OBJS.
135 Set _PATH_SSH_KEY_SIGN to be an extern char pointer (instead of #defined).
139 Update to new package version information.
144 - occurred on: GPT branch
145 - orig base: OPENSSH_3_8_1P1_GSSAPI_20040629
146 - new base: OPENSSH_3_8_1P1_GSSAPI_20040713
152 - occurred on: GPT branch
153 - orig base: OPENSSH_3_8P1_GSSAPI_20040422
154 - new base: OPENSSH_3_8_1P1_GSSAPI_20040629
157 Old log entries were trimmed in the 3.8.1p1 release.
158 Not sure why this generated a conflict.
160 Copyright statement added to head of configure.ac, which
161 generated a conflict due to nearby $Id$ evil.
163 We do child_set_env("GLOBUS_LOCATION") on the branch, and
164 this conflicted with the child_set_env("LIBPATH") changes
165 on the trunk. Merged in child_set_env("GLOBUS_LOCATION")
168 Should always get a conflict here on version changes.
169 Bumped version to OpenSSH_3.8.1P1 NCSA_GSSAPI_GPT_3.3.
174 - occurred on: GPT branch
175 - orig base: OPENSSH_3_8P1_GSSAPI_20040305
176 - new base: OPENSSH_3_8P1_GSSAPI_20040422
182 - occurred on: GPT branch
183 - orig base: OPENSSH_3_8P1_GSSAPI_20040304
184 - new base: OPENSSH_3_8P1_GSSAPI_20040305
190 - occurred on: GPT branch
191 - orig base: OPENSSH_3_7_1P2_GSSAPI_20040123
192 - new base: OPENSSH_3_8P1_GSSAPI_20040304
195 acss.o added to LIBSSH_OBJS in OpenSSH release.
196 conflicted because of nearby comment about LIBSSH_OBJS on
199 bugfix on trunk ('==' should be '=') in globus-static
200 section conflicted because earlier line differs between
201 trunk and gpt-branch.
202 code to add -lcrypto to $LIBS conflicted because base
203 OpenSSH change moved -lcrypto before $LIBS and trunk and
204 gpt-branch differed on whitespace. accepted trunk version
205 with same whitespace to avoid future conflicts.
206 OpenSSH base pid-dir code changed, causing conflict
207 because we drop this code on gpt-branch, as we want
208 pid-dir set at run-time based on $GL, not configure time.
210 OpenSSH base version changed and patch version spec
211 conflicts with GPT version spec. accepted OpenSSH base
212 version change and incremented GPT version spec to 3.1.
213 this will probably conflict every time from now on.
218 - occurred on: GPT branch
219 - orig base: OPENSSH_3_7_1P2_GSSAPI_20040119
220 - new base: OPENSSH_3_7_1P2_GSSAPI_20040123
226 - occurred on: GPT branch
227 - orig base: OPENSSH_3_6_1P2_GSSAPI_20030721
228 - new base: OPENSSH_3_7_1P2_GSSAPI_20040119
234 - occurred on: GPT branch
235 - orig base: OPENSSH_3_6_1P2_GSSAPI_20030505
236 - new base: OPENSSH_3_6_1P2_GSSAPI_20030721
242 - occurred on: GPT branch
243 - orig base: OPENSSH_3_6_1P1_GSSAPI_20030425
244 - new base: OPENSSH_3_6_1P2_GSSAPI_20030505
250 - occurred on: GPT branch
251 - orig base: OPENSSH_3_6_1P1_GSSAPI_20030408
252 - new base: OPENSSH_3_6_1P1_GSSAPI_20030425
254 - Makefile.in, configure.ac
255 caused by base changes to file
260 - occurred on: GPT branch
261 - orig base: OPENSSH_3_5P1_GSI_20030317
262 - new base: OPENSSH_3_6_1P1_GSSAPI_20030408
265 caused by base changes to file
267 pathname changes on this branch
272 - occurred on: GPT branch (OPENSSH_3_1P1_GSSAPI_GPT-branch)
273 - original base: OPENSSH_3_5P1_GSI_20030227
274 - new base: OPENSSH_3_5P1_GSI_20030317
280 - occurred on: GPT branch (OPENSSH_3_1P1_GSSAPI_GPT-branch)
281 - original base: OPENSSH_3_5P1_GSI_20021018
282 - new base: OPENSSH_3_5P1_GSI_20030227
285 cvs choked on my changes to the globus additions. wasn't a "real" conflict.
289 Action: Tag GPT branch as new release
290 - occurred on: GPT branch (OPENSSH_3_1P1_GSSAPI_GPT-branch)
295 - occurred on: GPT branch (OPENSSH_3_1P1_GSSAPI_GPT-branch)
296 - original base: OPENSSH_3_4P1_GSI_20021008
297 - new base: OPENSSH_3_5P1_GSI_20021018
300 resolved by removing check-user and adding check-config.
305 - occurred on: GPT branch (OPENSSH_3_1P1_GSSAPI_GPT-branch)
306 - original base: OPENSSH_3_4P1_GSI_20020926
307 - new base: OPENSSH_3_4P1_GSI_20021008
313 - occurred on: GPT branch (OPENSSH_3_1P1_GSSAPI_GPT-branch)
314 - original base: OPENSSH_3_4P1_GSI_20020924
315 - new base: OPENSSH_3_4P1_GSI_20020926
321 - occurred on: GPT branch (OPENSSH_3_1P1_GSSAPI_GPT-branch)
322 - original base: OPENSSH_3_4P1_GSI_20020923
323 - new base: OPENSSH_3_4P1_GSI_20020924
329 - occurred on: GPT branch (OPENSSH_3_1P1_GSSAPI_GPT-branch)
330 - original base: OPENSSH_3_4P1_GSI_20020701
331 - new base: OPENSSH_3_4P1_GSI_20020923
334 resolved by ignoring mainline changes and keeping the text that was
335 originally in the file on this branch. (We require a specified flavor type
336 where the trunk can compensate in that case.)