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_7_1P2_GSSAPI_20040119
59 - new base: OPENSSH_3_7_1P2_GSSAPI_20040123
65 - occurred on: GPT branch
66 - orig base: OPENSSH_3_6_1P2_GSSAPI_20030721
67 - new base: OPENSSH_3_7_1P2_GSSAPI_20040119
73 - occurred on: GPT branch
74 - orig base: OPENSSH_3_6_1P2_GSSAPI_20030505
75 - new base: OPENSSH_3_6_1P2_GSSAPI_20030721
81 - occurred on: GPT branch
82 - orig base: OPENSSH_3_6_1P1_GSSAPI_20030425
83 - new base: OPENSSH_3_6_1P2_GSSAPI_20030505
89 - occurred on: GPT branch
90 - orig base: OPENSSH_3_6_1P1_GSSAPI_20030408
91 - new base: OPENSSH_3_6_1P1_GSSAPI_20030425
93 - Makefile.in, configure.ac
94 caused by base changes to file
99 - occurred on: GPT branch
100 - orig base: OPENSSH_3_5P1_GSI_20030317
101 - new base: OPENSSH_3_6_1P1_GSSAPI_20030408
104 caused by base changes to file
106 pathname changes on this branch
111 - occurred on: GPT branch (OPENSSH_3_1P1_GSSAPI_GPT-branch)
112 - original base: OPENSSH_3_5P1_GSI_20030227
113 - new base: OPENSSH_3_5P1_GSI_20030317
119 - occurred on: GPT branch (OPENSSH_3_1P1_GSSAPI_GPT-branch)
120 - original base: OPENSSH_3_5P1_GSI_20021018
121 - new base: OPENSSH_3_5P1_GSI_20030227
124 cvs choked on my changes to the globus additions. wasn't a "real" conflict.
128 Action: Tag GPT branch as new release
129 - occurred on: GPT branch (OPENSSH_3_1P1_GSSAPI_GPT-branch)
134 - occurred on: GPT branch (OPENSSH_3_1P1_GSSAPI_GPT-branch)
135 - original base: OPENSSH_3_4P1_GSI_20021008
136 - new base: OPENSSH_3_5P1_GSI_20021018
139 resolved by removing check-user and adding check-config.
144 - occurred on: GPT branch (OPENSSH_3_1P1_GSSAPI_GPT-branch)
145 - original base: OPENSSH_3_4P1_GSI_20020926
146 - new base: OPENSSH_3_4P1_GSI_20021008
152 - occurred on: GPT branch (OPENSSH_3_1P1_GSSAPI_GPT-branch)
153 - original base: OPENSSH_3_4P1_GSI_20020924
154 - new base: OPENSSH_3_4P1_GSI_20020926
160 - occurred on: GPT branch (OPENSSH_3_1P1_GSSAPI_GPT-branch)
161 - original base: OPENSSH_3_4P1_GSI_20020923
162 - new base: OPENSSH_3_4P1_GSI_20020924
168 - occurred on: GPT branch (OPENSSH_3_1P1_GSSAPI_GPT-branch)
169 - original base: OPENSSH_3_4P1_GSI_20020701
170 - new base: OPENSSH_3_4P1_GSI_20020923
173 resolved by ignoring mainline changes and keeping the text that was
174 originally in the file on this branch. (We require a specified flavor type
175 where the trunk can compensate in that case.)