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_20040629
59 - new base: OPENSSH_3_8_1P1_GSSAPI_20040713
65 - occurred on: GPT branch
66 - orig base: OPENSSH_3_8P1_GSSAPI_20040422
67 - new base: OPENSSH_3_8_1P1_GSSAPI_20040629
70 Old log entries were trimmed in the 3.8.1p1 release.
71 Not sure why this generated a conflict.
73 Copyright statement added to head of configure.ac, which
74 generated a conflict due to nearby $Id$ evil.
76 We do child_set_env("GLOBUS_LOCATION") on the branch, and
77 this conflicted with the child_set_env("LIBPATH") changes
78 on the trunk. Merged in child_set_env("GLOBUS_LOCATION")
81 Should always get a conflict here on version changes.
82 Bumped version to OpenSSH_3.8.1P1 NCSA_GSSAPI_GPT_3.3.
87 - occurred on: GPT branch
88 - orig base: OPENSSH_3_8P1_GSSAPI_20040305
89 - new base: OPENSSH_3_8P1_GSSAPI_20040422
95 - occurred on: GPT branch
96 - orig base: OPENSSH_3_8P1_GSSAPI_20040304
97 - new base: OPENSSH_3_8P1_GSSAPI_20040305
103 - occurred on: GPT branch
104 - orig base: OPENSSH_3_7_1P2_GSSAPI_20040123
105 - new base: OPENSSH_3_8P1_GSSAPI_20040304
108 acss.o added to LIBSSH_OBJS in OpenSSH release.
109 conflicted because of nearby comment about LIBSSH_OBJS on
112 bugfix on trunk ('==' should be '=') in globus-static
113 section conflicted because earlier line differs between
114 trunk and gpt-branch.
115 code to add -lcrypto to $LIBS conflicted because base
116 OpenSSH change moved -lcrypto before $LIBS and trunk and
117 gpt-branch differed on whitespace. accepted trunk version
118 with same whitespace to avoid future conflicts.
119 OpenSSH base pid-dir code changed, causing conflict
120 because we drop this code on gpt-branch, as we want
121 pid-dir set at run-time based on $GL, not configure time.
123 OpenSSH base version changed and patch version spec
124 conflicts with GPT version spec. accepted OpenSSH base
125 version change and incremented GPT version spec to 3.1.
126 this will probably conflict every time from now on.
131 - occurred on: GPT branch
132 - orig base: OPENSSH_3_7_1P2_GSSAPI_20040119
133 - new base: OPENSSH_3_7_1P2_GSSAPI_20040123
139 - occurred on: GPT branch
140 - orig base: OPENSSH_3_6_1P2_GSSAPI_20030721
141 - new base: OPENSSH_3_7_1P2_GSSAPI_20040119
147 - occurred on: GPT branch
148 - orig base: OPENSSH_3_6_1P2_GSSAPI_20030505
149 - new base: OPENSSH_3_6_1P2_GSSAPI_20030721
155 - occurred on: GPT branch
156 - orig base: OPENSSH_3_6_1P1_GSSAPI_20030425
157 - new base: OPENSSH_3_6_1P2_GSSAPI_20030505
163 - occurred on: GPT branch
164 - orig base: OPENSSH_3_6_1P1_GSSAPI_20030408
165 - new base: OPENSSH_3_6_1P1_GSSAPI_20030425
167 - Makefile.in, configure.ac
168 caused by base changes to file
173 - occurred on: GPT branch
174 - orig base: OPENSSH_3_5P1_GSI_20030317
175 - new base: OPENSSH_3_6_1P1_GSSAPI_20030408
178 caused by base changes to file
180 pathname changes on this branch
185 - occurred on: GPT branch (OPENSSH_3_1P1_GSSAPI_GPT-branch)
186 - original base: OPENSSH_3_5P1_GSI_20030227
187 - new base: OPENSSH_3_5P1_GSI_20030317
193 - occurred on: GPT branch (OPENSSH_3_1P1_GSSAPI_GPT-branch)
194 - original base: OPENSSH_3_5P1_GSI_20021018
195 - new base: OPENSSH_3_5P1_GSI_20030227
198 cvs choked on my changes to the globus additions. wasn't a "real" conflict.
202 Action: Tag GPT branch as new release
203 - occurred on: GPT branch (OPENSSH_3_1P1_GSSAPI_GPT-branch)
208 - occurred on: GPT branch (OPENSSH_3_1P1_GSSAPI_GPT-branch)
209 - original base: OPENSSH_3_4P1_GSI_20021008
210 - new base: OPENSSH_3_5P1_GSI_20021018
213 resolved by removing check-user and adding check-config.
218 - occurred on: GPT branch (OPENSSH_3_1P1_GSSAPI_GPT-branch)
219 - original base: OPENSSH_3_4P1_GSI_20020926
220 - new base: OPENSSH_3_4P1_GSI_20021008
226 - occurred on: GPT branch (OPENSSH_3_1P1_GSSAPI_GPT-branch)
227 - original base: OPENSSH_3_4P1_GSI_20020924
228 - new base: OPENSSH_3_4P1_GSI_20020926
234 - occurred on: GPT branch (OPENSSH_3_1P1_GSSAPI_GPT-branch)
235 - original base: OPENSSH_3_4P1_GSI_20020923
236 - new base: OPENSSH_3_4P1_GSI_20020924
242 - occurred on: GPT branch (OPENSSH_3_1P1_GSSAPI_GPT-branch)
243 - original base: OPENSSH_3_4P1_GSI_20020701
244 - new base: OPENSSH_3_4P1_GSI_20020923
247 resolved by ignoring mainline changes and keeping the text that was
248 originally in the file on this branch. (We require a specified flavor type
249 where the trunk can compensate in that case.)