Changes between Version 47 and Version 48 of RoseCylc/Hints

Timestamp:

09/01/17 15:08:21 (4 years ago)

Author:

annette

Comment:

—

RoseCylc/Hints

@@ -139 +139 @@
 
 Note that it is recommended to use cylc notifications rather than Rose notifications. Rose notifications have the form `rose suite-hook --mail` and may not work on PUMA. 
+
+=== Merging in changes from another suite === 
+
+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: 
+{{{
+svn merge -c 23406 https://code.metoffice.gov.uk/svn/roses-u/a/a/7/7/4
+svn merge -r 21186:23406  https://code.metoffice.gov.uk/svn/roses-u/a/a/7/7/4
+}}}
+If there are any clashes, you will need to resolve them. 
+
 
 == Troubleshooting common errors ==