Opened 5 years ago

Closed 5 years ago

#1709 closed help (answered)


Reported by: simon.tett Owned by: ros
Component: FCM Keywords:
Cc: Platform: PUMA
UM Version: 8.5



I've been working with my own working copy and editing it. I am now ready, I think, to freeze this… I have committed my changes back into fcm and have the magic number 20249…

I think I would now be able to use the main branch:
fcm:um/branches/pkg/Config/vn8.5_GlobalAtmos6p0_UKMO/src with revision number 20249.

Is this correct — I'm working of my local working copy at ~simon.tett/fcm/vn8.5_bc_snow_albedo_tett4/src

fcm info gives:
simon.tett@puma:~/fcm/vn8.5_bc_snow_albedo_tett4> fcm info
Path: .
Working Copy Root Path: /home/simon.tett/fcm/vn8.5_bc_snow_albedo_tett4
URL: svn://puma/UM_svn/UM/branches/dev/simon.tett/vn8.5_bc_snow_albedo_tett3
Relative URL: /UM/branches/dev/simon.tett/vn8.5_bc_snow_albedo_tett3
Repository Root: svn://puma/UM_svn
Repository UUID: 8ca64e62-1750-0410-b9b8-f1ff413d6028
Revision: 20249
Node Kind: directory
Schedule: normal
Last Changed Author: simon.tett
Last Changed Rev: 20249
Last Changed Date: 2015-10-26 20:36:28 +0000 (Mon, 26 Oct 2015)



Change History (6)

comment:1 Changed 5 years ago by ros

Hi Simon,

To use the committed copy of your branch, you need to add it to the User modifications table in window FCM Configuration → FCM Options for Atmos & Reconfiguration


And in the revision column add 20249

The revision number 20249 relates only to your snow_albedo branch. The revision number of the vn8.5_GlobalAtmos6p0_UKMO branch will remain as you already have it.


comment:2 Changed 5 years ago by simon.tett

Hi Roz,

thanks… Ahh about the branch. Can I rename the branch to fcm:um-br/dev/simon.tett/fcm/vn8.5_bc_snow_albedo?

And once I'm happy and code has been reviewed how easy would it be to merge code back into the main trunk?

Is that a sensible thing to do anyway?


comment:3 Changed 5 years ago by ros

  • Owner changed from um_support to ros
  • Status changed from new to accepted

Hi Simon,

You can try using fcm copy SRC DEST or fcm move SRC DEST. In the past these commands have been slightly dodgy but they are now officially listed in the FCM User Guide so hopefully they are now robust! Personally I would do a copy so if things do go wonky you still have the original vn8.5_bc_snow_albedo_tett3 branch.

I've not ever tried overwriting an existing branch so you may find you have to delete the existing fcm:um-br/dev/simon.tett/fcm/vn8.5_bc_snow_albedo branch first and then do the copy.

With regard to getting the code changes onto the UM trunk. Now that we have shared repository it should, in theory, be easier to get changes back to the trunk. The first thing you would have to do is upgrade your change to the newest UM version which will be UM10.3 (planned for release this Friday). This of course is under Rose not the UMUI. Your change will need to be documented and pass all the standard validation tests before being considered for inclusion in the trunk. There is a whole document on the work flow on the MOSRS (I can request an account for you if you wish). Alternatively, if you are collaborating with someone at the Met Office you might be able to get them to do it for you??

As to whether your code changes should be put on the trunk, I can't really advise. If it is an improvement to the code/model, bug fixes or general development that other people would be interested in then I would say the answer is a yes, otherwise you would probably be best talking to the appropriate code section owner at the Met Office.

Hope that helps.

comment:4 Changed 5 years ago by simon.tett

Hi Roz,

thanks very much. fcm copy demanded an editor from me but didn't actually copy anything… and fcm checkout fcm:um_br/dev/simon.tett/vn8.5_bc_snow_albedo ~/fcm/vn8.5_bc_snow_albedo gave me an error message:

[FAIL] /home/simon.tett/fcm/vn8.5_bc_snow_albedo: is already a working copy of svn://puma/UM_svn/UM/branches/dev/simon.tett/vn8.5_bc_snow_albedo


comment:5 Changed 5 years ago by ros

Hi Simon,

fcm copy or indeed any operation that performs a write action on the repository will open an editor (emacs, vi, etc depending on your settings) prompting your for your commit message. You have to provide a commit message for the command to continue. Did you provide a commit message?
If so and it still failed please copy me the command you ran and the error message and I'll take a look.

Your fcm checkout command failed because there is already a checked out version of your branch in your ~fcm directory. You can't checkout over the top of an already existing working copy. If you are trying to update it with the repository cd into it and then run fcm update or alternatively delete the working copy and then re-run fcm checkout. For more information type fcm help update and fcm help checkout.


comment:6 Changed 5 years ago by ros

  • Resolution set to answered
  • Status changed from accepted to closed
Note: See TracTickets for help on using tickets.