Opened 8 years ago

Closed 8 years ago

#977 closed defect (fixed)

Problem with fcm conflicts

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

Description

I have checked out a branch

fcm checkout fcm:um_br/dev/ptelford/VN7.3_UKCA_CheM_vn1.1_StratCFC_Solar

to

/home/ptelford/um_code/branches/VN7.3_UKCA_CheM_vn1.1_StratCFC_Solar

and merged in the other branch

fcm merge fcm:um_br/dev/rene/VN7.3_rh_CCMVal.rad.chem_transient_EPF

which produces (as expected) a series of conflicts.

However when I try to run fcm conflicts I just get the following errors

fcm conflicts
[info] src/atmosphere/UKCA/asad_bimol.F90: in text conflict.
Use of uninitialized value in addition (+) at /home/um/fcm/bin/../lib/FCM/System/CM/ResolveConflicts.pm line 149.
src/atmosphere/UKCA/asad_bimol.F90: file exists, overwrite?
Enter "y" or "n" (or just press <return> for "n") y
[FAIL] fcm_graphic_merge src/atmosphere/UKCA/asad_bimol.F90 src/atmosphere/UKCAhome/ptelford/um_code/branches/VN7.3_UKCA_CheM_vn1.1_StratCFC_Solar/src/atmosphere/UKCA/asad_bimol.F90.working src/atmosphere/UKCAhome/ptelford/um_code/branches/VN7.3_UKCA_CheM_vn1.1_StratCFC_Solar/src/atmosphere/UKCA/asad_bimol.F90.merge-left.r1678 src/atmosphere/UKCAhome/ptelford/um_code/branches/VN7.3_UKCA_CheM_vn1.1_StratCFC_Solar/src/atmosphere/UKCA/asad_bimol.F90.merge-right.r9829 # rc=2
[FAIL] xxdiff (util.cpp:493):
[FAIL] Cannot access file: src/atmosphere/UKCA
home/ptelford/um_code/branches/VN7.3_UKCA_CheM_vn1.1_StratCFC_Solar/src/atmosphere/UKCA/asad_bimol.F90.working
[FAIL] IO error: No such file or directory

I was able to merge this branch into a similar branch before the upgrade. Could the upgrade of affected anything?

Change History (2)

comment:1 Changed 8 years ago by ros

  • Status changed from new to accepted

Hi Paul,

Yes, it looks like the version of subversion we upgraded to and "fcm conflicts" don't want to work together. I can see what's gone wrong I just currently don't know how to fix it. I suspect I will have to confer with the Met Office. Until I get it fixed can you use the version of subversion in my directory please.

export PATH=/home/ros/software/subversion/bin:$PATH

You may need to re-checkout your fcm:um_br/dev/ptelford/VN7.3_UKCA_CheM_vn1.1_StratCFC_Solar branch and rerun the "fcm merge" command before trying "fcm conflicts" again.

Regards,
Ros.

comment:2 Changed 8 years ago by ros

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

This problem was resolved on 4th December by downgrading the installation of subversion on PUMA to version 1.6.

Note: See TracTickets for help on using tickets.