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_8P1_GSSAPI_20040304
59 - new base: OPENSSH_3_8P1_GSSAPI_20040305
65 - occurred on: GPT branch
66 - orig base: OPENSSH_3_7_1P2_GSSAPI_20040123
67 - new base: OPENSSH_3_8P1_GSSAPI_20040304
70 acss.o added to LIBSSH_OBJS in OpenSSH release.
71 conflicted because of nearby comment about LIBSSH_OBJS on
74 bugfix on trunk ('==' should be '=') in globus-static
75 section conflicted because earlier line differs between
77 code to add -lcrypto to $LIBS conflicted because base
78 OpenSSH change moved -lcrypto before $LIBS and trunk and
79 gpt-branch differed on whitespace. accepted trunk version
80 with same whitespace to avoid future conflicts.
81 OpenSSH base pid-dir code changed, causing conflict
82 because we drop this code on gpt-branch, as we want
83 pid-dir set at run-time based on $GL, not configure time.
85 OpenSSH base version changed and patch version spec
86 conflicts with GPT version spec. accepted OpenSSH base
87 version change and incremented GPT version spec to 3.1.
88 this will probably conflict every time from now on.
93 - occurred on: GPT branch
94 - orig base: OPENSSH_3_7_1P2_GSSAPI_20040119
95 - new base: OPENSSH_3_7_1P2_GSSAPI_20040123
101 - occurred on: GPT branch
102 - orig base: OPENSSH_3_6_1P2_GSSAPI_20030721
103 - new base: OPENSSH_3_7_1P2_GSSAPI_20040119
109 - occurred on: GPT branch
110 - orig base: OPENSSH_3_6_1P2_GSSAPI_20030505
111 - new base: OPENSSH_3_6_1P2_GSSAPI_20030721
117 - occurred on: GPT branch
118 - orig base: OPENSSH_3_6_1P1_GSSAPI_20030425
119 - new base: OPENSSH_3_6_1P2_GSSAPI_20030505
125 - occurred on: GPT branch
126 - orig base: OPENSSH_3_6_1P1_GSSAPI_20030408
127 - new base: OPENSSH_3_6_1P1_GSSAPI_20030425
129 - Makefile.in, configure.ac
130 caused by base changes to file
135 - occurred on: GPT branch
136 - orig base: OPENSSH_3_5P1_GSI_20030317
137 - new base: OPENSSH_3_6_1P1_GSSAPI_20030408
140 caused by base changes to file
142 pathname changes on this branch
147 - occurred on: GPT branch (OPENSSH_3_1P1_GSSAPI_GPT-branch)
148 - original base: OPENSSH_3_5P1_GSI_20030227
149 - new base: OPENSSH_3_5P1_GSI_20030317
155 - occurred on: GPT branch (OPENSSH_3_1P1_GSSAPI_GPT-branch)
156 - original base: OPENSSH_3_5P1_GSI_20021018
157 - new base: OPENSSH_3_5P1_GSI_20030227
160 cvs choked on my changes to the globus additions. wasn't a "real" conflict.
164 Action: Tag GPT branch as new release
165 - occurred on: GPT branch (OPENSSH_3_1P1_GSSAPI_GPT-branch)
170 - occurred on: GPT branch (OPENSSH_3_1P1_GSSAPI_GPT-branch)
171 - original base: OPENSSH_3_4P1_GSI_20021008
172 - new base: OPENSSH_3_5P1_GSI_20021018
175 resolved by removing check-user and adding check-config.
180 - occurred on: GPT branch (OPENSSH_3_1P1_GSSAPI_GPT-branch)
181 - original base: OPENSSH_3_4P1_GSI_20020926
182 - new base: OPENSSH_3_4P1_GSI_20021008
188 - occurred on: GPT branch (OPENSSH_3_1P1_GSSAPI_GPT-branch)
189 - original base: OPENSSH_3_4P1_GSI_20020924
190 - new base: OPENSSH_3_4P1_GSI_20020926
196 - occurred on: GPT branch (OPENSSH_3_1P1_GSSAPI_GPT-branch)
197 - original base: OPENSSH_3_4P1_GSI_20020923
198 - new base: OPENSSH_3_4P1_GSI_20020924
204 - occurred on: GPT branch (OPENSSH_3_1P1_GSSAPI_GPT-branch)
205 - original base: OPENSSH_3_4P1_GSI_20020701
206 - new base: OPENSSH_3_4P1_GSI_20020923
209 resolved by ignoring mainline changes and keeping the text that was
210 originally in the file on this branch. (We require a specified flavor type
211 where the trunk can compensate in that case.)