Opened 6 years ago

Closed 6 years ago

#1201 closed task (fixed)

fcm conflicts: problem with PATH specification in UM FCM Tutorial

Reported by: ih280 Owned by: ros
Component: FCM Tutorial Keywords: fcm conflicts
Cc: Platform: PUMA
UM Version: 8.2

Description

The command fcm conflicts results in the following order of the order of the files for resolving the existing conflicts:

ih280@puma:/home/ih280/um_tutorial/vn8.2_branch_one> fcm conflicts
[info] src/control/top_level/microphys_ctl.F90: in text conflict.
You have made no decision.
[info] src/atmosphere/land_surface/surf_hyd.F90: in text conflict.
You have made no decision.
[info] src/atmosphere/land_surface/pdm.F90: in text conflict.
You have made no decision.

When specifinng the path in the command as fcm conflicts src/atmosphere/land_surface/surf_hyd.F90 it is not the file surf_hyd.F90 that is opened with xxdiff but all the three files are opened one after the other in the same order as before:

ih280@puma:/home/ih280/um_tutorial/vn8.2_branch_one> fcm conflicts src/atmosphere/land_surface/surf_hyd.F90
[info] src/control/top_level/microphys_ctl.F90: in text conflict.
You have made no decision.
[info] src/atmosphere/land_surface/surf_hyd.F90: in text conflict.
You have made no decision.
[info] src/atmosphere/land_surface/pdm.F90: in text conflict.
You have made no decision.

Change History (2)

comment:1 Changed 6 years ago by ros

  • Owner changed from um_support to ros
  • Platform changed from HECToR to PUMA
  • Status changed from new to accepted
  • Type changed from help to task

Hi Ines,

It looks like an update to FCM has changed slightly how the conflict command works. I will update the tutorial pages soon. Thanks for letting us know. In the meantime you should still be able to complete the tutorial, just doing the files in a slightly different order.

Regards,
Ros.

comment:2 Changed 6 years ago by ros

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

FCM UM Tutorial updated.

Note: See TracTickets for help on using tickets.