]>
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 | ||
55fe48cf | 54 | 2004/03/05 |
55 | ---------- | |
56 | Action: Merge | |
57 | - occurred on: GPT branch | |
58 | - orig base: OPENSSH_3_8P1_GSSAPI_20040304 | |
59 | - new base: OPENSSH_3_8P1_GSSAPI_20040305 | |
60 | Conflicts: 0 | |
61 | ||
416fd2a8 | 62 | 2004/03/04 |
63 | ---------- | |
64 | Action: Merge | |
65 | - occurred on: GPT branch | |
66 | - orig base: OPENSSH_3_7_1P2_GSSAPI_20040123 | |
67 | - new base: OPENSSH_3_8P1_GSSAPI_20040304 | |
68 | Conflicts: 3 | |
69 | - Makefile.in | |
70 | acss.o added to LIBSSH_OBJS in OpenSSH release. | |
71 | conflicted because of nearby comment about LIBSSH_OBJS on | |
72 | gpt-branch. | |
73 | - configure.ac | |
74 | bugfix on trunk ('==' should be '=') in globus-static | |
75 | section conflicted because earlier line differs between | |
76 | trunk and gpt-branch. | |
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. | |
84 | - version.h | |
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. | |
89 | ||
70b0961c | 90 | 2004/01/23 |
91 | ---------- | |
92 | Action: Merge | |
93 | - occurred on: GPT branch | |
94 | - orig base: OPENSSH_3_7_1P2_GSSAPI_20040119 | |
95 | - new base: OPENSSH_3_7_1P2_GSSAPI_20040123 | |
96 | Conflicts: 0 | |
97 | ||
70791e56 | 98 | 2004/01/19 |
99 | ---------- | |
100 | Action: Merge | |
101 | - occurred on: GPT branch | |
ea572efa | 102 | - orig base: OPENSSH_3_6_1P2_GSSAPI_20030721 |
70791e56 | 103 | - new base: OPENSSH_3_7_1P2_GSSAPI_20040119 |
104 | Conflicts: many | |
105 | ||
cb1e288f | 106 | 2003/07/25 |
107 | ---------- | |
108 | Action: Merge | |
109 | - occurred on: GPT branch | |
110 | - orig base: OPENSSH_3_6_1P2_GSSAPI_20030505 | |
111 | - new base: OPENSSH_3_6_1P2_GSSAPI_20030721 | |
112 | Conflicts: 0 | |
113 | ||
4c38dc09 | 114 | 2003/05/05 |
115 | ---------- | |
116 | Action: Merge | |
117 | - occurred on: GPT branch | |
118 | - orig base: OPENSSH_3_6_1P1_GSSAPI_20030425 | |
119 | - new base: OPENSSH_3_6_1P2_GSSAPI_20030505 | |
120 | Conflicts: 0 | |
121 | ||
2c487398 | 122 | 2003/05/05 |
123 | ---------- | |
124 | Action: Merge | |
125 | - occurred on: GPT branch | |
126 | - orig base: OPENSSH_3_6_1P1_GSSAPI_20030408 | |
127 | - new base: OPENSSH_3_6_1P1_GSSAPI_20030425 | |
128 | Conflicts: 2 | |
129 | - Makefile.in, configure.ac | |
130 | caused by base changes to file | |
131 | ||
5f7ffc39 | 132 | 2003/04/10 |
133 | ---------- | |
134 | Action: Merge | |
135 | - occurred on: GPT branch | |
136 | - orig base: OPENSSH_3_5P1_GSI_20030317 | |
137 | - new base: OPENSSH_3_6_1P1_GSSAPI_20030408 | |
138 | Conflicts: 2 | |
139 | - Makefile.in | |
140 | caused by base changes to file | |
141 | - ssh-agent.c | |
142 | pathname changes on this branch | |
143 | ||
e210225b | 144 | 2003/03/17 |
145 | ---------- | |
146 | Action: Merge | |
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 | |
150 | Conflicts: 0 | |
151 | ||
3acf552c | 152 | 2003/03/07 |
765d3ebb | 153 | ---------- |
154 | Action: Merge | |
155 | - occurred on: GPT branch (OPENSSH_3_1P1_GSSAPI_GPT-branch) | |
3acf552c | 156 | - original base: OPENSSH_3_5P1_GSI_20021018 |
157 | - new base: OPENSSH_3_5P1_GSI_20030227 | |
765d3ebb | 158 | Conflicts: 1 |
159 | - configure.ac | |
3acf552c | 160 | cvs choked on my changes to the globus additions. wasn't a "real" conflict. |
45357086 | 161 | |
3acf552c | 162 | 2003/02/06 |
45357086 | 163 | ---------- |
3acf552c | 164 | Action: Tag GPT branch as new release |
45357086 | 165 | - occurred on: GPT branch (OPENSSH_3_1P1_GSSAPI_GPT-branch) |
4d7caed2 | 166 | |
3acf552c | 167 | 2002/10/18 |
4d7caed2 | 168 | ---------- |
169 | Action: Merge | |
170 | - occurred on: GPT branch (OPENSSH_3_1P1_GSSAPI_GPT-branch) | |
3acf552c | 171 | - original base: OPENSSH_3_4P1_GSI_20021008 |
172 | - new base: OPENSSH_3_5P1_GSI_20021018 | |
173 | Conflicts: 1 | |
174 | - Makefile.in | |
175 | resolved by removing check-user and adding check-config. | |
fdc22535 | 176 | |
177 | 2002/10/08 | |
178 | ---------- | |
179 | Action: Merge | |
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 | |
183 | Conflicts: 0 | |
a052f36f | 184 | |
3acf552c | 185 | 2002/09/26 |
a052f36f | 186 | ---------- |
187 | Action: Merge | |
188 | - occurred on: GPT branch (OPENSSH_3_1P1_GSSAPI_GPT-branch) | |
3acf552c | 189 | - original base: OPENSSH_3_4P1_GSI_20020924 |
190 | - new base: OPENSSH_3_4P1_GSI_20020926 | |
191 | Conflicts: 0 | |
dcbe50f6 | 192 | |
3acf552c | 193 | 2002/09/24 |
dcbe50f6 | 194 | ---------- |
3acf552c | 195 | Action: Merge |
dcbe50f6 | 196 | - occurred on: GPT branch (OPENSSH_3_1P1_GSSAPI_GPT-branch) |
3acf552c | 197 | - original base: OPENSSH_3_4P1_GSI_20020923 |
198 | - new base: OPENSSH_3_4P1_GSI_20020924 | |
199 | Conflicts: 0 | |
09701134 | 200 | |
3acf552c | 201 | 2002/09/23 |
09701134 | 202 | ---------- |
203 | Action: Merge | |
204 | - occurred on: GPT branch (OPENSSH_3_1P1_GSSAPI_GPT-branch) | |
3acf552c | 205 | - original base: OPENSSH_3_4P1_GSI_20020701 |
206 | - new base: OPENSSH_3_4P1_GSI_20020923 | |
09701134 | 207 | Conflicts: 1 |
208 | - configure.ac | |
3acf552c | 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.) |