| | 76 | === Update a branch with changes done in the trunk === |
| | 77 | First make sure that all changes in the branch have been committed. No local changes should exist in the folder. |
| | 78 | In a terminal, go to the directory with the source code for the branch: |
| | 79 | {{{ |
| | 80 | cd modipsl/modeles/ORCHIDEE # in the branch |
| | 81 | }}} |
| | 82 | |
| | 83 | Determine the revision interval x1:X2 with changes done on the trunk that you want to integrate in the branch |
| | 84 | Check first with --dry-run which files are affected: |
| | 85 | {{{ |
| | 86 | svn merge --dry-run -r x1:x2 svn://forge.ipsl.jussieu.fr/orchidee/trunk/ORCHIDEE |
| | 87 | }}} |
| | 88 | |
| | 89 | Then do the real merge: |
| | 90 | {{{ |
| | 91 | svn merge -r x1:x2 svn://forge.ipsl.jussieu.fr/orchidee/trunk/ORCHIDEE |
| | 92 | }}} |
| | 93 | If files gives conflicts, you can answer p for postpone and resolve them manually after finishing the command merge. The command svn merge will not commit any changes. All changes will be done locally and you need to validate by svn diff and svn ci to commit. |
| | 94 | |
| | 95 | |
| | 96 | |
| | 97 | === Merge changes done on a branch into the trunk === |
| | 98 | The same command svn merge can be used to merge a branch into the trunk. For this case, install locally the trunk and go to that folder. The svn command will look something like folllwing: |
| | 99 | {{{ |
| | 100 | cd modipsl/modeles/ORCHIDEE # in the trunk |
| | 101 | svn merge -r x1:x2 svn://forge.ipsl.jussieu.fr/orchidee/branches/ORCHIDEE-TOTO/ORCHIDEE |
| | 102 | }}} |
