| 79 | |
| 80 | '''Step 3'''. Merge in trunk changes between trunk@2782 and trunk@2787. Check-in changes if no conflicts arise |
| 81 | |
| 82 | |
| 83 | {{{ |
| 84 | svn merge svn+ssh://acc@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk@2782 \ |
| 85 | svn+ssh://acc@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk@2787 \ |
| 86 | ./ |
| 87 | |
| 88 | --- Merging r2783 through r2787 into '.': |
| 89 | U NEMOGCM/CONFIG/ORCA2_OFF_PISCES/cpp_ORCA2_OFF_PISCES.fcm |
| 90 | U NEMOGCM/NEMO/OFF_SRC/domrea.F90 |
| 91 | U NEMOGCM/NEMO/OPA_SRC/SBC/sbcrnf.F90 |
| 92 | U NEMOGCM/NEMO/OPA_SRC/ZDF/zdfmxl.F90 |
| 93 | U NEMOGCM/NEMO/TOP_SRC/MY_TRC/trcini_my_trc.F90 |
| 94 | U NEMOGCM/NEMO/TOP_SRC/oce_trc.F90 |
| 95 | |
| 96 | svn ci -m"Branch dev_NOC_2011_MERGE. #874. Step 3: Merge in trunk changes between revision 2782 and 2787" |
| 97 | |
| 98 | Sending NEMOGCM/CONFIG/ORCA2_OFF_PISCES/cpp_ORCA2_OFF_PISCES.fcm |
| 99 | Sending NEMOGCM/NEMO/OFF_SRC/domrea.F90 |
| 100 | Sending NEMOGCM/NEMO/OPA_SRC/SBC/sbcrnf.F90 |
| 101 | Sending NEMOGCM/NEMO/OPA_SRC/ZDF/zdfmxl.F90 |
| 102 | Sending NEMOGCM/NEMO/TOP_SRC/MY_TRC/trcini_my_trc.F90 |
| 103 | Sending NEMOGCM/NEMO/TOP_SRC/oce_trc.F90 |
| 104 | Transmitting file data ...... |
| 105 | Committed revision 2985. |
| 106 | }}} |
| 107 | |
| 108 | '''Step 4'''. Merge in all changes on the NOCS_NEPTUNE branch. Revert the cpp_ORCA2_LIM.fcm file that shouldn't have been changed. Check-in if no conflicts arise: |
| 109 | |
| 110 | |
| 111 | {{{ |
| 112 | svn merge svn+ssh://acc@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk@2787 \ |
| 113 | svn+ssh://acc@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/branches/2011/dev_r2787_NOCS_NEPTUNE \ |
| 114 | ./ |
| 115 | |
| 116 | --- Merging r2791 through r2985 into '.': |
| 117 | U DOC/TexFiles/Biblio/Biblio.bib |
| 118 | U DOC/TexFiles/Chapters/Chap_DYN.tex |
| 119 | A DOC/TexFiles/Namelist/namdyn_nept |
| 120 | U NEMOGCM/CONFIG/GYRE/EXP00/namelist |
| 121 | U NEMOGCM/CONFIG/ORCA2_OFF_PISCES/EXP00/namelist |
| 122 | U NEMOGCM/CONFIG/ORCA2_LIM/EXP00/namelist |
| 123 | U NEMOGCM/CONFIG/ORCA2_LIM/cpp_ORCA2_LIM.fcm |
| 124 | U NEMOGCM/CONFIG/POMME/EXP00/namelist |
| 125 | U NEMOGCM/ARCH/arch-ALTIX_NAUTILUS4.fcm |
| 126 | U NEMOGCM/NEMO/OPA_SRC/nemogcm.F90 |
| 127 | A NEMOGCM/NEMO/OPA_SRC/DYN/dynnept.F90 |
| 128 | U NEMOGCM/NEMO/OPA_SRC/step.F90 |
| 129 | |
| 130 | svn revert NEMOGCM/CONFIG/ORCA2_LIM/cpp_ORCA2_LIM.fcm |
| 131 | Reverted 'NEMOGCM/CONFIG/ORCA2_LIM/cpp_ORCA2_LIM.fcm' |
| 132 | |
| 133 | svn ci -m"Branch dev_NOC_2011_MERGE. #874. Step 4: Merge in changes from 2011/dev_r2787_NOCS_NEPTUNE branch" |
| 134 | |
| 135 | Sending DOC/TexFiles/Biblio/Biblio.bib |
| 136 | Sending DOC/TexFiles/Chapters/Chap_DYN.tex |
| 137 | Adding DOC/TexFiles/Namelist/namdyn_nept |
| 138 | Sending NEMOGCM/ARCH/arch-ALTIX_NAUTILUS4.fcm |
| 139 | Sending NEMOGCM/CONFIG/GYRE/EXP00/namelist |
| 140 | Sending NEMOGCM/CONFIG/ORCA2_LIM/EXP00/namelist |
| 141 | Sending NEMOGCM/CONFIG/ORCA2_OFF_PISCES/EXP00/namelist |
| 142 | Sending NEMOGCM/CONFIG/POMME/EXP00/namelist |
| 143 | Adding NEMOGCM/NEMO/OPA_SRC/DYN/dynnept.F90 |
| 144 | Sending NEMOGCM/NEMO/OPA_SRC/nemogcm.F90 |
| 145 | Sending NEMOGCM/NEMO/OPA_SRC/step.F90 |
| 146 | Transmitting file data ......... |
| 147 | Committed revision 2986. |
| 148 | }}} |
| 149 | |