| 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 | |
| 45357086 |
15 | $ export CVSROOT="/afs/ncsa/projects/globus/Repository" |
| 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 | |
| 53 | 2002/09/23 |
| 54 | ---------- |
| 55 | Action: Merge |
| 56 | - occurred on: GPT branch (OPENSSH_3_1P1_GSSAPI_GPT-branch) |
| 57 | - original base: OPENSSH_3_4P1_GSI_20020701 |
| 58 | - new base: OPENSSH_3_4P1_GSI_20020923 |
| 59 | Conflicts: 1 |
| 60 | - configure.ac |
| 61 | resolved by ignoring mainline changes and keeping the text that was |
| 62 | originally in the file on this branch. (We require a specified flavor type |
| 63 | where the trunk can compensate in that case.) |
| 45357086 |
64 | |
| 65 | 2002/09/24 |
| 66 | ---------- |
| 67 | Action: Merge |
| 68 | - occurred on: GPT branch (OPENSSH_3_1P1_GSSAPI_GPT-branch) |
| 69 | - original base: OPENSSH_3_4P1_GSI_20020923 |
| 70 | - new base: OPENSSH_3_4P1_GSI_20020924 |
| 71 | Conflicts: 0 |
| 4d7caed2 |
72 | |
| 73 | 2002/09/26 |
| 74 | ---------- |
| 75 | Action: Merge |
| 76 | - occurred on: GPT branch (OPENSSH_3_1P1_GSSAPI_GPT-branch) |
| 77 | - original base: OPENSSH_3_4P1_GSI_20020924 |
| 78 | - new base: OPENSSH_3_4P1_GSI_20020926 |
| 79 | Conflicts: 0 |
| fdc22535 |
80 | |
| 81 | 2002/10/08 |
| 82 | ---------- |
| 83 | Action: Merge |
| 84 | - occurred on: GPT branch (OPENSSH_3_1P1_GSSAPI_GPT-branch) |
| 85 | - original base: OPENSSH_3_4P1_GSI_20020926 |
| 86 | - new base: OPENSSH_3_4P1_GSI_20021008 |
| 87 | Conflicts: 0 |
| a052f36f |
88 | |
| 89 | 2002/10/18 |
| 90 | ---------- |
| 91 | Action: Merge |
| 92 | - occurred on: GPT branch (OPENSSH_3_1P1_GSSAPI_GPT-branch) |
| 93 | - original base: OPENSSH_3_4P1_GSI_20021008 |
| 94 | - new base: OPENSSH_3_5P1_GSI_20021018 |
| 95 | Conflicts: 1 |
| 96 | - Makefile.in |
| 97 | resolved by removing check-user and adding check-config. |
| dcbe50f6 |
98 | |
| 99 | 2003/02/06 |
| 100 | ---------- |
| 101 | Action: Tag GPT branch as new release |
| 102 | - occurred on: GPT branch (OPENSSH_3_1P1_GSSAPI_GPT-branch) |
andersk / gssapi-openssh.git / blame