Changes between Version 52 and Version 53 of RoseCylc/Hints


Ignore:
Timestamp:
19/04/17 13:00:22 (3 years ago)
Author:
annette
Comment:

Legend:

Unmodified
Added
Removed
Modified
  • RoseCylc/Hints

    v52 v53  
    146146You 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:  
    147147{{{ 
    148 svn merge -c 23406 https://code.metoffice.gov.uk/svn/roses-u/a/a/7/7/4 
    149 svn merge -r 21186:23406  https://code.metoffice.gov.uk/svn/roses-u/a/a/7/7/4 
     148svn merge -c 23406 https://code.metoffice.gov.uk/svn/roses-u/a/a/7/7/4/trunk 
     149svn merge -r 21186:23406  https://code.metoffice.gov.uk/svn/roses-u/a/a/7/7/4/trunk 
    150150}}} 
    151151If there are any clashes, you will need to resolve them.