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_3P2_20060726
67 - new base: OPENSSH_4_5P1_20070215
72 PAM checks moved and updated. Merged by hand.
76 UsePam description changed, and we default to yes.
78 NCSA_VERSION constant added on trunk.
83 - occurred on: GPT branch
84 - orig base: OPENSSH_4_2P1_GSSAPI_20051220
85 - new base: OPENSSH_4_3P2_20060726
88 OpenSSH change was near GSI change. No real conflict.
90 New sGsiAllowLimitedProxy config option.
92 OpenSSH change near init_pathnames().
94 OpenSSH change near init_pathnames().
96 OpenSSH change near ForwardX11 yes
98 Update to new package version information.
103 - occurred on: GPT branch
104 - orig base: OPENSSH_3_9P1_GSSAPI_20040818
105 - new base: OPENSSH_4_2P1_GSSAPI_20051220
108 kexgssc.o moved in Simon's patch
109 new install-sysconf target from OpenSSH release
111 new --with-pid-dir section from OpenSSH release
113 #include "hostfile.h" added from OpenSSH release
115 Update to new package version information.
120 - occurred on: GPT branch
121 - orig base: OPENSSH_3_8_1P1_GSSAPI_20040713
122 - new base: OPENSSH_3_9P1_GSSAPI_20040818
125 Include pathnames.o in LIBSSH_OBJS.
127 Set _PATH_SSH_KEY_SIGN to be an extern char pointer (instead of #defined).
131 Update to new package version information.
136 - occurred on: GPT branch
137 - orig base: OPENSSH_3_8_1P1_GSSAPI_20040629
138 - new base: OPENSSH_3_8_1P1_GSSAPI_20040713
144 - occurred on: GPT branch
145 - orig base: OPENSSH_3_8P1_GSSAPI_20040422
146 - new base: OPENSSH_3_8_1P1_GSSAPI_20040629
149 Old log entries were trimmed in the 3.8.1p1 release.
150 Not sure why this generated a conflict.
152 Copyright statement added to head of configure.ac, which
153 generated a conflict due to nearby $Id$ evil.
155 We do child_set_env("GLOBUS_LOCATION") on the branch, and
156 this conflicted with the child_set_env("LIBPATH") changes
157 on the trunk. Merged in child_set_env("GLOBUS_LOCATION")
160 Should always get a conflict here on version changes.
161 Bumped version to OpenSSH_3.8.1P1 NCSA_GSSAPI_GPT_3.3.
166 - occurred on: GPT branch
167 - orig base: OPENSSH_3_8P1_GSSAPI_20040305
168 - new base: OPENSSH_3_8P1_GSSAPI_20040422
174 - occurred on: GPT branch
175 - orig base: OPENSSH_3_8P1_GSSAPI_20040304
176 - new base: OPENSSH_3_8P1_GSSAPI_20040305
182 - occurred on: GPT branch
183 - orig base: OPENSSH_3_7_1P2_GSSAPI_20040123
184 - new base: OPENSSH_3_8P1_GSSAPI_20040304
187 acss.o added to LIBSSH_OBJS in OpenSSH release.
188 conflicted because of nearby comment about LIBSSH_OBJS on
191 bugfix on trunk ('==' should be '=') in globus-static
192 section conflicted because earlier line differs between
193 trunk and gpt-branch.
194 code to add -lcrypto to $LIBS conflicted because base
195 OpenSSH change moved -lcrypto before $LIBS and trunk and
196 gpt-branch differed on whitespace. accepted trunk version
197 with same whitespace to avoid future conflicts.
198 OpenSSH base pid-dir code changed, causing conflict
199 because we drop this code on gpt-branch, as we want
200 pid-dir set at run-time based on $GL, not configure time.
202 OpenSSH base version changed and patch version spec
203 conflicts with GPT version spec. accepted OpenSSH base
204 version change and incremented GPT version spec to 3.1.
205 this will probably conflict every time from now on.
210 - occurred on: GPT branch
211 - orig base: OPENSSH_3_7_1P2_GSSAPI_20040119
212 - new base: OPENSSH_3_7_1P2_GSSAPI_20040123
218 - occurred on: GPT branch
219 - orig base: OPENSSH_3_6_1P2_GSSAPI_20030721
220 - new base: OPENSSH_3_7_1P2_GSSAPI_20040119
226 - occurred on: GPT branch
227 - orig base: OPENSSH_3_6_1P2_GSSAPI_20030505
228 - new base: OPENSSH_3_6_1P2_GSSAPI_20030721
234 - occurred on: GPT branch
235 - orig base: OPENSSH_3_6_1P1_GSSAPI_20030425
236 - new base: OPENSSH_3_6_1P2_GSSAPI_20030505
242 - occurred on: GPT branch
243 - orig base: OPENSSH_3_6_1P1_GSSAPI_20030408
244 - new base: OPENSSH_3_6_1P1_GSSAPI_20030425
246 - Makefile.in, configure.ac
247 caused by base changes to file
252 - occurred on: GPT branch
253 - orig base: OPENSSH_3_5P1_GSI_20030317
254 - new base: OPENSSH_3_6_1P1_GSSAPI_20030408
257 caused by base changes to file
259 pathname changes on this branch
264 - occurred on: GPT branch (OPENSSH_3_1P1_GSSAPI_GPT-branch)
265 - original base: OPENSSH_3_5P1_GSI_20030227
266 - new base: OPENSSH_3_5P1_GSI_20030317
272 - occurred on: GPT branch (OPENSSH_3_1P1_GSSAPI_GPT-branch)
273 - original base: OPENSSH_3_5P1_GSI_20021018
274 - new base: OPENSSH_3_5P1_GSI_20030227
277 cvs choked on my changes to the globus additions. wasn't a "real" conflict.
281 Action: Tag GPT branch as new release
282 - occurred on: GPT branch (OPENSSH_3_1P1_GSSAPI_GPT-branch)
287 - occurred on: GPT branch (OPENSSH_3_1P1_GSSAPI_GPT-branch)
288 - original base: OPENSSH_3_4P1_GSI_20021008
289 - new base: OPENSSH_3_5P1_GSI_20021018
292 resolved by removing check-user and adding check-config.
297 - occurred on: GPT branch (OPENSSH_3_1P1_GSSAPI_GPT-branch)
298 - original base: OPENSSH_3_4P1_GSI_20020926
299 - new base: OPENSSH_3_4P1_GSI_20021008
305 - occurred on: GPT branch (OPENSSH_3_1P1_GSSAPI_GPT-branch)
306 - original base: OPENSSH_3_4P1_GSI_20020924
307 - new base: OPENSSH_3_4P1_GSI_20020926
313 - occurred on: GPT branch (OPENSSH_3_1P1_GSSAPI_GPT-branch)
314 - original base: OPENSSH_3_4P1_GSI_20020923
315 - new base: OPENSSH_3_4P1_GSI_20020924
321 - occurred on: GPT branch (OPENSSH_3_1P1_GSSAPI_GPT-branch)
322 - original base: OPENSSH_3_4P1_GSI_20020701
323 - new base: OPENSSH_3_4P1_GSI_20020923
326 resolved by ignoring mainline changes and keeping the text that was
327 originally in the file on this branch. (We require a specified flavor type
328 where the trunk can compensate in that case.)