4 This file contains notes regarding the files stored in the openssh CVS module that
5 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. Supposedly, you
10 are undergoing a cvs merge because a new GSI patch has been created (along with
11 a new corresponding tag). Let <tagName> be the string "<newBase>_GPT".
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 and tag the repository before the merge.
21 $ cvs tag <tagName>-premerge
23 2. Merge the changes from your original base merge point to your new base merge
26 $ cvs update -kk -jOPENSSH_GSI_GPT_BASE -j<newBase>
28 3. Retrieve a list of any conflicts that were discovered as a result of the
31 $ cvs -n update | grep C
33 4. Resolve all of the conflicts in each of the listed files.
35 5. Commit all of the files in your working directory to the repository and tag
39 $ cvs rtag -F -r <newBase> OPENSSH_GSI_GPT_BASE openssh
41 6. Add an entry to the History section of this file detailing your merge action,
42 along with noting conflicts that occurred and any interesting changes you had
43 to make to resolve them.
45 7. Commit your change to this file to the repository and tag the working directory
49 $ cvs tag <tagName>-merged
56 - occurred on: GPT branch
57 - orig base: OPENSSH_3_6_1P1_GSSAPI_20030425
58 - new base: OPENSSH_3_6_1P2_GSSAPI_20030505
64 - occurred on: GPT branch
65 - orig base: OPENSSH_3_6_1P1_GSSAPI_20030408
66 - new base: OPENSSH_3_6_1P1_GSSAPI_20030425
68 - Makefile.in, configure.ac
69 caused by base changes to file
74 - occurred on: GPT branch
75 - orig base: OPENSSH_3_5P1_GSI_20030317
76 - new base: OPENSSH_3_6_1P1_GSSAPI_20030408
79 caused by base changes to file
81 pathname changes on this branch
86 - occurred on: GPT branch (OPENSSH_3_1P1_GSSAPI_GPT-branch)
87 - original base: OPENSSH_3_5P1_GSI_20030227
88 - new base: OPENSSH_3_5P1_GSI_20030317
94 - occurred on: GPT branch (OPENSSH_3_1P1_GSSAPI_GPT-branch)
95 - original base: OPENSSH_3_5P1_GSI_20021018
96 - new base: OPENSSH_3_5P1_GSI_20030227
99 cvs choked on my changes to the globus additions. wasn't a "real" conflict.
103 Action: Tag GPT branch as new release
104 - occurred on: GPT branch (OPENSSH_3_1P1_GSSAPI_GPT-branch)
109 - occurred on: GPT branch (OPENSSH_3_1P1_GSSAPI_GPT-branch)
110 - original base: OPENSSH_3_4P1_GSI_20021008
111 - new base: OPENSSH_3_5P1_GSI_20021018
114 resolved by removing check-user and adding check-config.
119 - occurred on: GPT branch (OPENSSH_3_1P1_GSSAPI_GPT-branch)
120 - original base: OPENSSH_3_4P1_GSI_20020926
121 - new base: OPENSSH_3_4P1_GSI_20021008
127 - occurred on: GPT branch (OPENSSH_3_1P1_GSSAPI_GPT-branch)
128 - original base: OPENSSH_3_4P1_GSI_20020924
129 - new base: OPENSSH_3_4P1_GSI_20020926
135 - occurred on: GPT branch (OPENSSH_3_1P1_GSSAPI_GPT-branch)
136 - original base: OPENSSH_3_4P1_GSI_20020923
137 - new base: OPENSSH_3_4P1_GSI_20020924
143 - occurred on: GPT branch (OPENSSH_3_1P1_GSSAPI_GPT-branch)
144 - original base: OPENSSH_3_4P1_GSI_20020701
145 - new base: OPENSSH_3_4P1_GSI_20020923
148 resolved by ignoring mainline changes and keeping the text that was
149 originally in the file on this branch. (We require a specified flavor type
150 where the trunk can compensate in that case.)