Opened 4 years ago

Closed 4 years ago

#1500 closed help (answered)

fcm branch version query

Reported by: swr04ojb Owned by: ros
Component: FCM Keywords:
Cc: Platform: PUMA
UM Version: 8.5

Description

Hello,

I wanted to run the UMvn8.5, but with some small code changes. A while ago I created a branch from the UM trunk, added some code, and have been debugging. I recently stumbled across this page..

https://puma.nerc.ac.uk/trac/UM

which seemed, to me, to suggest that for UM8.5 I should be working off of revision 13123. I then ran branch-info on one of my branches to check and it seems that I've branched from much later in the code…

>fcm branch-info
URL: svn://puma/UM_svn/UM/branches/dev/swr04ojb/r16524_bc_control
Repository Root: svn://puma/UM_svn
Revision: 18435
Last Changed Author: swr04ojb
Last Changed Rev: 16789
Last Changed Date: 2014-10-07T17:08:12.310440Z
--------------------------------------------------------------------------------
Branch Create Author: swr04ojb
Branch Create Rev: 16788
Branch Create Date: 2014-10-07 17:57:32 +0100 (Tue, 07 Oct 2014)
--------------------------------------------------------------------------------
Branch Parent: svn://puma/UM_svn/UM/branches/dev/swr04ojb/vn8.5_um_bc_titan_v2@16524
Merges Avail From Parent: 16802 16797 16790
Merges Avail Into Parent: 16789

So, am I not using vn8.5? Revision 16524, on that table above, puts me somewhere b/wn vn 9.0 and 9.1? For reference, I've been implementing that branch in my job XINI#G.

Oliver

Change History (2)

comment:1 Changed 4 years ago by ros

  • Status changed from new to accepted

Hi Oliver,

UM8.5 is indeed revision 13123 of the UM trunk.

When you created branch r16524_bc_control you didn't create it directly from the UM8.5 trunk. You have actually created it as a branch from r16524 of your vn8.5_um_bc_titan_v2 branch. If you look at https://puma.nerc.ac.uk/trac/UM/log/UM/branches/dev/swr04ojb/r16524_bc_control you will see at the bottom that what you have is a copy of your vn8.5_um_bc_titan_v2 with your new changes on top. Is this what you wanted or did you want a fresh new branch without your um_bc_titan_v2 changes? Branches of branches can work but the UM can also get confused so we advise against it unless really necessary.

Regards,
Ros.


comment:2 Changed 4 years ago by ros

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