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 1. Set up your environment to point to the correct CVS repository.
11 $ export CVSROOT="/afs/ncsa/projects/globus/Repository"
13 2. Commit any locally-modified files and tag the repository before the merge.
17 $ cvs tag <tagName>-premerge
19 2. Merge the changes from your original base merge point to your new base merge
22 $ cvs update -kk -j<originalBase> -j<newBase>
24 3. Retrieve a list of any conflicts that were discovered as a result of the
27 $ cvs -n update | grep C
29 4. Resolve all of the conflicts in each of the listed files.
31 5. Commit all of the files in your working directory to the repository and tag
35 $ cvs tag <tagName>-merged
42 - occurred on: GPT branch (OPENSSH_3_1P1_GSSAPI_GPT-branch)
43 - original base: OPENSSH_3_4P1_GSI_20020701
44 - new base: OPENSSH_3_4P1_GSI_20020923
47 resolved by ignoring mainline changes and keeping the text that was
48 originally in the file on this branch. (We require a specified flavor type
49 where the trunk can compensate in that case.)
54 - occurred on: GPT branch (OPENSSH_3_1P1_GSSAPI_GPT-branch)
55 - original base: OPENSSH_3_4P1_GSI_20020923
56 - new base: OPENSSH_3_4P1_GSI_20020924
62 - occurred on: GPT branch (OPENSSH_3_1P1_GSSAPI_GPT-branch)
63 - original base: OPENSSH_3_4P1_GSI_20020924
64 - new base: OPENSSH_3_4P1_GSI_20020926
70 - occurred on: GPT branch (OPENSSH_3_1P1_GSSAPI_GPT-branch)
71 - original base: OPENSSH_3_4P1_GSI_20020926
72 - new base: OPENSSH_3_4P1_GSI_20021008
78 - occurred on: GPT branch (OPENSSH_3_1P1_GSSAPI_GPT-branch)
79 - original base: OPENSSH_3_4P1_GSI_20021008
80 - new base: OPENSSH_3_5P1_GSI_20021018
83 resolved by removing check-user and adding check-config.