Reports until 02:01, Wednesday 14 June 2017
LHO FMCS (CDS)
patrick.thomas@LIGO.ORG - posted 02:01, Wednesday 14 June 2017 - last comment - 02:22, Wednesday 14 June 2017(36870)
FMCS medm screens

I'm confused. I was almost certain I had updated the FMCS medm screens actually linked from the sitemap. However running svn update in /opt/rtcds/userapps/release/fmcs/h0/medm gave:

U    H0FMCS_CORNERSTATION_AH3.adl
U    H0FMCS_CORNERSTATION_CY.adl
U    H0FMCS_OUTBUILDING_CY_MY.adl
U    H0FMCS_OUTBUILDING_AH_EX.adl
U    H0FMCS_OUTBUILDING_MX.adl
U    H0FMCS_OUTBUILDING_MY.adl
U    H0FMCS_OUTBUILDING_AH_EY.adl
Conflict discovered in 'H0FMCS_CORNERSTATION.adl'.
Select: (p) postpone, (df) diff-full, (e) edit,
        (mc) mine-conflict, (tc) theirs-conflict,
        (s) show all options: tc
G    H0FMCS_CORNERSTATION.adl
U    H0FMCS_OUTBUILDING_AH_MX.adl
U    H0FMCS_OUTBUILDING_AH_MY.adl
U    H0FMCS_CORNERSTATION_AH1_2.adl
U    H0FMCS_OVERVIEW.adl
U    H0FMCS_OUTBUILDING_CY_EX.adl
U    H0FMCS_OUTBUILDING_CY_EY.adl
U    H0FMCS_OUTBUILDING_EX.adl
U    H0FMCS_OUTBUILDING_EY.adl
U    H0FMCS_OUTBUILDING_CY_MX.adl
Updated to revision 15730.

The conflict is because I had just started to edit this screen.

The screens linked from the sitemap now reflect the changes I had made. I'm not sure where I checked in the changes from if it was not /opt/rtcds/userapps/release/fmcs/h0/medm. I have a copy of these screens in my home directory but they do not seem to be an svn working copy. Did someone revert /opt/rtcds/userapps/release/fmcs/h0/medm to an earlier revision?

Comments related to this report
patrick.thomas@LIGO.ORG - 02:16, Wednesday 14 June 2017 (36871)

More confusion. The link in the SITEMAP.adl file in /opt/rtcds/lho/h1/medm points to /ligo/lho/h0/fmcs/medm not /opt/rtcds/userapps/release/fmcs/h0/medm.

/ligo/lho/h0/fmcs/medm is an svn working copy already at the most recent revision.

Perhaps something changed with the SITEMAP instead?

patrick.thomas@LIGO.ORG - 02:22, Wednesday 14 June 2017 (36872)
patrick.thomas@zotws3:~$ which sitemap
/ligo/apps/debian8/utils/bin/sitemap
patrick.thomas@zotws3:~$ cat /ligo/apps/debian8/utils/bin/sitemap
#!/bin/bash
source /ligo/cdscfg/stdsetup.sh
cd /opt/rtcds/lho/h1/medm
exec medm
    -noMsg
    -macro "USERAPPS=/opt/rtcds/userapps/release/"
    -attach
    -displayFont fixed
    -x SITEMAP.adl &> /dev/null &