]>
Commit | Line | Data |
---|---|---|
765d3ebb | 1 | CVSNOTES |
2 | ======== | |
3 | ||
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. | |
6 | ||
7 | [ Generic Tag Merging ] | |
8 | ||
e5a93c2b | 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". | |
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 | |
17 | 2. Commit any locally-modified files and tag the repository before the merge. | |
18 | ||
baa1fc53 | 19 | $ cvs update |
765d3ebb | 20 | $ cvs commit |
21 | $ cvs tag <tagName>-premerge | |
22 | ||
23 | 2. Merge the changes from your original base merge point to your new base merge | |
24 | point. | |
25 | ||
e5a93c2b | 26 | $ cvs update -kk -jOPENSSH_GSI_GPT_BASE -j<newBase> |
765d3ebb | 27 | |
28 | 3. Retrieve a list of any conflicts that were discovered as a result of the | |
29 | merge. | |
30 | ||
31 | $ cvs -n update | grep C | |
32 | ||
33 | 4. Resolve all of the conflicts in each of the listed files. | |
34 | ||
35 | 5. Commit all of the files in your working directory to the repository and tag | |
36 | the repository. | |
37 | ||
38 | $ cvs commit | |
e5a93c2b | 39 | $ cvs rtag -F -r <newBase> OPENSSH_GSI_GPT_BASE openssh |
765d3ebb | 40 | |
e34b3eaf | 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. | |
44 | ||
45 | 7. Commit your change to this file to the repository and tag the working directory | |
46 | as merged. | |
47 | ||
48 | $ cvs commit | |
49 | $ cvs tag <tagName>-merged | |
e5a93c2b | 50 | |
765d3ebb | 51 | [ History ] |
52 | ||
2c487398 | 53 | 2003/05/05 |
54 | ---------- | |
55 | Action: Merge | |
56 | - occurred on: GPT branch | |
57 | - orig base: OPENSSH_3_6_1P1_GSSAPI_20030408 | |
58 | - new base: OPENSSH_3_6_1P1_GSSAPI_20030425 | |
59 | Conflicts: 2 | |
60 | - Makefile.in, configure.ac | |
61 | caused by base changes to file | |
62 | ||
5f7ffc39 | 63 | 2003/04/10 |
64 | ---------- | |
65 | Action: Merge | |
66 | - occurred on: GPT branch | |
67 | - orig base: OPENSSH_3_5P1_GSI_20030317 | |
68 | - new base: OPENSSH_3_6_1P1_GSSAPI_20030408 | |
69 | Conflicts: 2 | |
70 | - Makefile.in | |
71 | caused by base changes to file | |
72 | - ssh-agent.c | |
73 | pathname changes on this branch | |
74 | ||
e210225b | 75 | 2003/03/17 |
76 | ---------- | |
77 | Action: Merge | |
78 | - occurred on: GPT branch (OPENSSH_3_1P1_GSSAPI_GPT-branch) | |
79 | - original base: OPENSSH_3_5P1_GSI_20030227 | |
80 | - new base: OPENSSH_3_5P1_GSI_20030317 | |
81 | Conflicts: 0 | |
82 | ||
3acf552c | 83 | 2003/03/07 |
765d3ebb | 84 | ---------- |
85 | Action: Merge | |
86 | - occurred on: GPT branch (OPENSSH_3_1P1_GSSAPI_GPT-branch) | |
3acf552c | 87 | - original base: OPENSSH_3_5P1_GSI_20021018 |
88 | - new base: OPENSSH_3_5P1_GSI_20030227 | |
765d3ebb | 89 | Conflicts: 1 |
90 | - configure.ac | |
3acf552c | 91 | cvs choked on my changes to the globus additions. wasn't a "real" conflict. |
45357086 | 92 | |
3acf552c | 93 | 2003/02/06 |
45357086 | 94 | ---------- |
3acf552c | 95 | Action: Tag GPT branch as new release |
45357086 | 96 | - occurred on: GPT branch (OPENSSH_3_1P1_GSSAPI_GPT-branch) |
4d7caed2 | 97 | |
3acf552c | 98 | 2002/10/18 |
4d7caed2 | 99 | ---------- |
100 | Action: Merge | |
101 | - occurred on: GPT branch (OPENSSH_3_1P1_GSSAPI_GPT-branch) | |
3acf552c | 102 | - original base: OPENSSH_3_4P1_GSI_20021008 |
103 | - new base: OPENSSH_3_5P1_GSI_20021018 | |
104 | Conflicts: 1 | |
105 | - Makefile.in | |
106 | resolved by removing check-user and adding check-config. | |
fdc22535 | 107 | |
108 | 2002/10/08 | |
109 | ---------- | |
110 | Action: Merge | |
111 | - occurred on: GPT branch (OPENSSH_3_1P1_GSSAPI_GPT-branch) | |
112 | - original base: OPENSSH_3_4P1_GSI_20020926 | |
113 | - new base: OPENSSH_3_4P1_GSI_20021008 | |
114 | Conflicts: 0 | |
a052f36f | 115 | |
3acf552c | 116 | 2002/09/26 |
a052f36f | 117 | ---------- |
118 | Action: Merge | |
119 | - occurred on: GPT branch (OPENSSH_3_1P1_GSSAPI_GPT-branch) | |
3acf552c | 120 | - original base: OPENSSH_3_4P1_GSI_20020924 |
121 | - new base: OPENSSH_3_4P1_GSI_20020926 | |
122 | Conflicts: 0 | |
dcbe50f6 | 123 | |
3acf552c | 124 | 2002/09/24 |
dcbe50f6 | 125 | ---------- |
3acf552c | 126 | Action: Merge |
dcbe50f6 | 127 | - occurred on: GPT branch (OPENSSH_3_1P1_GSSAPI_GPT-branch) |
3acf552c | 128 | - original base: OPENSSH_3_4P1_GSI_20020923 |
129 | - new base: OPENSSH_3_4P1_GSI_20020924 | |
130 | Conflicts: 0 | |
09701134 | 131 | |
3acf552c | 132 | 2002/09/23 |
09701134 | 133 | ---------- |
134 | Action: Merge | |
135 | - occurred on: GPT branch (OPENSSH_3_1P1_GSSAPI_GPT-branch) | |
3acf552c | 136 | - original base: OPENSSH_3_4P1_GSI_20020701 |
137 | - new base: OPENSSH_3_4P1_GSI_20020923 | |
09701134 | 138 | Conflicts: 1 |
139 | - configure.ac | |
3acf552c | 140 | resolved by ignoring mainline changes and keeping the text that was |
141 | originally in the file on this branch. (We require a specified flavor type | |
142 | where the trunk can compensate in that case.) |