Opened 9 years ago

Closed 9 years ago

#681 closed help (fixed)

peoblem caused by doing a wrong fcm merge job

Reported by: emxin Owned by: ros
Component: FCM Keywords:
Cc: Platform:
UM Version: 7.3

Description

Hi,
Yesterday, I tried to use 'fcm merge' command to do something. Since I am quite new to this command, I think made a big mistake to overwriting one of my current working branch(directory) by old branch content. I do not want to to lose all the new stuff, but I have no idea of how to reverse them back. Can you help?

my account is:: emxin, the location of the directiry I was woking is:
/home/emxin/fcm/VN7.3_UKCA_TropBr/src/atmosphere/UKCA

I remember the latest version number I made (using fcm commit in this directory) is like: 7297.

thanks for your help
Xin Yang

Change History (2)

comment:1 Changed 9 years ago by ros

  • Status changed from new to accepted

Hi Xin,

Running the command "fcm info" in /home/emxin/fcm/VN7.3_UKCA_TropBr gives the following output

ros@puma$ fcm info
Path: .
URL: svn://puma/UM_svn/UM/trunk
Repository Root: svn://puma/UM_svn
Repository UUID: 8ca64e62-1750-0410-b9b8-f1ff413d6028
Revision: 7297
Node Kind: directory
Schedule: normal
Last Changed Author: um
Last Changed Rev: 6682
Last Changed Date: 2011-05-25 14:57:25 +0100 (Wed, 25 May 2011)

This indicates that your VN7.3_UKCA_TropBr directory has been switched to be the UM trunk at rev 6682 (aka UM7.9)

If I'm understanding you correctly you want to get back your VN7.3_UKCA_TropBr branch at revision 7297?
To do this just remove your current working directory /home/emxin/fcm/VN7.3_UKCA_TropBr and then run the command

fcm co fcm:um_br/dev/emxin/VN7.3_UKCA_TropBr

to checkout your branch and recreate the working copy.

If you need any help with "fcm merge" let me know or alternatively part of the UM Tutorial covers merging. See http://puma.nerc.ac.uk/trac/UM_TUTORIAL/wiki/UmTutorial/vn7.1/ResolvingConflicts

Regards,
Ros.

comment:2 Changed 9 years ago by ros

  • Resolution set to fixed
  • Status changed from accepted to closed

This is ticket is being closed now as there has been no activity in the last couple of months.

Note: See TracTickets for help on using tickets.