]>
Commit | Line | Data |
---|---|---|
765d3ebb | 1 | CVSNOTES |
2 | ======== | |
3 | ||
efb1f2d6 | 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. | |
765d3ebb | 6 | |
7 | [ Generic Tag Merging ] | |
8 | ||
efb1f2d6 | 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). | |
e5a93c2b | 12 | |
765d3ebb | 13 | 1. Set up your environment to point to the correct CVS repository. |
14 | ||
eb5015fb | 15 | $ export CVSROOT="<username>@cvs.ncsa.uiuc.edu:/CVS/gssapi-openssh" |
765d3ebb | 16 | |
07e33619 | 17 | 2. Commit any locally-modified files. |
765d3ebb | 18 | |
baa1fc53 | 19 | $ cvs update |
765d3ebb | 20 | $ cvs commit |
765d3ebb | 21 | |
07e33619 | 22 | 3. Tag the repository before the merge. |
23 | ||
24 | $ cvs tag <newBase>_GPT-premerge | |
25 | ||
efb1f2d6 | 26 | 4. Merge the changes from your original base merge point to your new |
27 | base merge point. | |
765d3ebb | 28 | |
e5a93c2b | 29 | $ cvs update -kk -jOPENSSH_GSI_GPT_BASE -j<newBase> |
765d3ebb | 30 | |
efb1f2d6 | 31 | 5. Retrieve a list of any conflicts that were discovered as a result |
32 | of the merge. | |
765d3ebb | 33 | |
34 | $ cvs -n update | grep C | |
35 | ||
07e33619 | 36 | 6. Resolve all of the conflicts in each of the listed files. |
765d3ebb | 37 | |
efb1f2d6 | 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. | |
e34b3eaf | 41 | |
1b82043c | 42 | 8. Move OPENSSH_GSI_GPT_BASE. |
43 | ||
44 | $ cvs rtag -F -r <newBase> OPENSSH_GSI_GPT_BASE openssh | |
45 | ||
efb1f2d6 | 46 | 9. Commit all of the files in your working directory to the |
47 | repository and tag the working directory as merged. | |
e34b3eaf | 48 | |
49 | $ cvs commit | |
07e33619 | 50 | $ cvs tag <newBase>_GPT-merged |
e5a93c2b | 51 | |
765d3ebb | 52 | [ History ] |
53 | ||
2a304a95 | 54 | 2004/06/29 |
55 | ---------- | |
56 | Action: Merge | |
57 | - occurred on: GPT branch | |
58 | - orig base: OPENSSH_3_8P1_GSSAPI_20040422 | |
59 | - new base: OPENSSH_3_8_P1_GSSAPI_20040629 | |
60 | Conflicts: 4 | |
61 | - ChangeLog | |
62 | Old log entries were trimmed in the 3.8.1p1 release. | |
63 | Not sure why this generated a conflict. | |
64 | - configure.ac | |
65 | Copyright statement added to head of configure.ac, which | |
66 | generated a conflict due to nearby $Id$ evil. | |
67 | - session.c | |
68 | We do child_set_env("GLOBUS_LOCATION") on the branch, and | |
69 | this conflicted with the child_set_env("LIBPATH") changes | |
70 | on the trunk. Merged in child_set_env("GLOBUS_LOCATION") | |
71 | with the new code. | |
72 | - version.h | |
73 | Should always get a conflict here on version changes. | |
74 | Bumped version to OpenSSH_3.8.1P1 NCSA_GSSAPI_GPT_3.3. | |
75 | ||
47923452 | 76 | 2004/04/22 |
77 | ---------- | |
78 | Action: Merge | |
79 | - occurred on: GPT branch | |
80 | - orig base: OPENSSH_3_8P1_GSSAPI_20040305 | |
81 | - new base: OPENSSH_3_8P1_GSSAPI_20040422 | |
82 | Conflicts: 0 | |
83 | ||
55fe48cf | 84 | 2004/03/05 |
85 | ---------- | |
86 | Action: Merge | |
87 | - occurred on: GPT branch | |
88 | - orig base: OPENSSH_3_8P1_GSSAPI_20040304 | |
89 | - new base: OPENSSH_3_8P1_GSSAPI_20040305 | |
90 | Conflicts: 0 | |
91 | ||
416fd2a8 | 92 | 2004/03/04 |
93 | ---------- | |
94 | Action: Merge | |
95 | - occurred on: GPT branch | |
96 | - orig base: OPENSSH_3_7_1P2_GSSAPI_20040123 | |
97 | - new base: OPENSSH_3_8P1_GSSAPI_20040304 | |
98 | Conflicts: 3 | |
99 | - Makefile.in | |
100 | acss.o added to LIBSSH_OBJS in OpenSSH release. | |
101 | conflicted because of nearby comment about LIBSSH_OBJS on | |
102 | gpt-branch. | |
103 | - configure.ac | |
104 | bugfix on trunk ('==' should be '=') in globus-static | |
105 | section conflicted because earlier line differs between | |
106 | trunk and gpt-branch. | |
107 | code to add -lcrypto to $LIBS conflicted because base | |
108 | OpenSSH change moved -lcrypto before $LIBS and trunk and | |
109 | gpt-branch differed on whitespace. accepted trunk version | |
110 | with same whitespace to avoid future conflicts. | |
111 | OpenSSH base pid-dir code changed, causing conflict | |
112 | because we drop this code on gpt-branch, as we want | |
113 | pid-dir set at run-time based on $GL, not configure time. | |
114 | - version.h | |
115 | OpenSSH base version changed and patch version spec | |
116 | conflicts with GPT version spec. accepted OpenSSH base | |
117 | version change and incremented GPT version spec to 3.1. | |
118 | this will probably conflict every time from now on. | |
119 | ||
70b0961c | 120 | 2004/01/23 |
121 | ---------- | |
122 | Action: Merge | |
123 | - occurred on: GPT branch | |
124 | - orig base: OPENSSH_3_7_1P2_GSSAPI_20040119 | |
125 | - new base: OPENSSH_3_7_1P2_GSSAPI_20040123 | |
126 | Conflicts: 0 | |
127 | ||
70791e56 | 128 | 2004/01/19 |
129 | ---------- | |
130 | Action: Merge | |
131 | - occurred on: GPT branch | |
ea572efa | 132 | - orig base: OPENSSH_3_6_1P2_GSSAPI_20030721 |
70791e56 | 133 | - new base: OPENSSH_3_7_1P2_GSSAPI_20040119 |
134 | Conflicts: many | |
135 | ||
cb1e288f | 136 | 2003/07/25 |
137 | ---------- | |
138 | Action: Merge | |
139 | - occurred on: GPT branch | |
140 | - orig base: OPENSSH_3_6_1P2_GSSAPI_20030505 | |
141 | - new base: OPENSSH_3_6_1P2_GSSAPI_20030721 | |
142 | Conflicts: 0 | |
143 | ||
4c38dc09 | 144 | 2003/05/05 |
145 | ---------- | |
146 | Action: Merge | |
147 | - occurred on: GPT branch | |
148 | - orig base: OPENSSH_3_6_1P1_GSSAPI_20030425 | |
149 | - new base: OPENSSH_3_6_1P2_GSSAPI_20030505 | |
150 | Conflicts: 0 | |
151 | ||
2c487398 | 152 | 2003/05/05 |
153 | ---------- | |
154 | Action: Merge | |
155 | - occurred on: GPT branch | |
156 | - orig base: OPENSSH_3_6_1P1_GSSAPI_20030408 | |
157 | - new base: OPENSSH_3_6_1P1_GSSAPI_20030425 | |
158 | Conflicts: 2 | |
159 | - Makefile.in, configure.ac | |
160 | caused by base changes to file | |
161 | ||
5f7ffc39 | 162 | 2003/04/10 |
163 | ---------- | |
164 | Action: Merge | |
165 | - occurred on: GPT branch | |
166 | - orig base: OPENSSH_3_5P1_GSI_20030317 | |
167 | - new base: OPENSSH_3_6_1P1_GSSAPI_20030408 | |
168 | Conflicts: 2 | |
169 | - Makefile.in | |
170 | caused by base changes to file | |
171 | - ssh-agent.c | |
172 | pathname changes on this branch | |
173 | ||
e210225b | 174 | 2003/03/17 |
175 | ---------- | |
176 | Action: Merge | |
177 | - occurred on: GPT branch (OPENSSH_3_1P1_GSSAPI_GPT-branch) | |
178 | - original base: OPENSSH_3_5P1_GSI_20030227 | |
179 | - new base: OPENSSH_3_5P1_GSI_20030317 | |
180 | Conflicts: 0 | |
181 | ||
3acf552c | 182 | 2003/03/07 |
765d3ebb | 183 | ---------- |
184 | Action: Merge | |
185 | - occurred on: GPT branch (OPENSSH_3_1P1_GSSAPI_GPT-branch) | |
3acf552c | 186 | - original base: OPENSSH_3_5P1_GSI_20021018 |
187 | - new base: OPENSSH_3_5P1_GSI_20030227 | |
765d3ebb | 188 | Conflicts: 1 |
189 | - configure.ac | |
3acf552c | 190 | cvs choked on my changes to the globus additions. wasn't a "real" conflict. |
45357086 | 191 | |
3acf552c | 192 | 2003/02/06 |
45357086 | 193 | ---------- |
3acf552c | 194 | Action: Tag GPT branch as new release |
45357086 | 195 | - occurred on: GPT branch (OPENSSH_3_1P1_GSSAPI_GPT-branch) |
4d7caed2 | 196 | |
3acf552c | 197 | 2002/10/18 |
4d7caed2 | 198 | ---------- |
199 | Action: Merge | |
200 | - occurred on: GPT branch (OPENSSH_3_1P1_GSSAPI_GPT-branch) | |
3acf552c | 201 | - original base: OPENSSH_3_4P1_GSI_20021008 |
202 | - new base: OPENSSH_3_5P1_GSI_20021018 | |
203 | Conflicts: 1 | |
204 | - Makefile.in | |
205 | resolved by removing check-user and adding check-config. | |
fdc22535 | 206 | |
207 | 2002/10/08 | |
208 | ---------- | |
209 | Action: Merge | |
210 | - occurred on: GPT branch (OPENSSH_3_1P1_GSSAPI_GPT-branch) | |
211 | - original base: OPENSSH_3_4P1_GSI_20020926 | |
212 | - new base: OPENSSH_3_4P1_GSI_20021008 | |
213 | Conflicts: 0 | |
a052f36f | 214 | |
3acf552c | 215 | 2002/09/26 |
a052f36f | 216 | ---------- |
217 | Action: Merge | |
218 | - occurred on: GPT branch (OPENSSH_3_1P1_GSSAPI_GPT-branch) | |
3acf552c | 219 | - original base: OPENSSH_3_4P1_GSI_20020924 |
220 | - new base: OPENSSH_3_4P1_GSI_20020926 | |
221 | Conflicts: 0 | |
dcbe50f6 | 222 | |
3acf552c | 223 | 2002/09/24 |
dcbe50f6 | 224 | ---------- |
3acf552c | 225 | Action: Merge |
dcbe50f6 | 226 | - occurred on: GPT branch (OPENSSH_3_1P1_GSSAPI_GPT-branch) |
3acf552c | 227 | - original base: OPENSSH_3_4P1_GSI_20020923 |
228 | - new base: OPENSSH_3_4P1_GSI_20020924 | |
229 | Conflicts: 0 | |
09701134 | 230 | |
3acf552c | 231 | 2002/09/23 |
09701134 | 232 | ---------- |
233 | Action: Merge | |
234 | - occurred on: GPT branch (OPENSSH_3_1P1_GSSAPI_GPT-branch) | |
3acf552c | 235 | - original base: OPENSSH_3_4P1_GSI_20020701 |
236 | - new base: OPENSSH_3_4P1_GSI_20020923 | |
09701134 | 237 | Conflicts: 1 |
238 | - configure.ac | |
3acf552c | 239 | resolved by ignoring mainline changes and keeping the text that was |
240 | originally in the file on this branch. (We require a specified flavor type | |
241 | where the trunk can compensate in that case.) |