| 141 | |
| 142 | === Merging in changes from another suite === |
| 143 | |
| 144 | You may have taken a copy of a suite, but there have been subsequent changes that you wish to include. FCM won't allow you to merge in changes from another suite, but you can do it with a direct svn command. You will need to know the full svn URL for the suite containing the changes and the revision number (use `-c`) or range (use `-r`), for example: |
| 145 | {{{ |
| 146 | svn merge -c 23406 https://code.metoffice.gov.uk/svn/roses-u/a/a/7/7/4 |
| 147 | svn merge -r 21186:23406 https://code.metoffice.gov.uk/svn/roses-u/a/a/7/7/4 |
| 148 | }}} |
| 149 | If there are any clashes, you will need to resolve them. |
| 150 | |