Changes between Version 47 and Version 48 of RoseCylc/Hints


Ignore:
Timestamp:
09/01/17 15:08:21 (3 years ago)
Author:
annette
Comment:

Legend:

Unmodified
Added
Removed
Modified
  • RoseCylc/Hints

    v47 v48  
    139139 
    140140Note 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.  
     141 
     142=== Merging in changes from another suite ===  
     143 
     144You 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{{{ 
     146svn merge -c 23406 https://code.metoffice.gov.uk/svn/roses-u/a/a/7/7/4 
     147svn merge -r 21186:23406  https://code.metoffice.gov.uk/svn/roses-u/a/a/7/7/4 
     148}}} 
     149If there are any clashes, you will need to resolve them.  
     150 
    141151 
    142152== Troubleshooting common errors ==