Ignore:
Timestamp:
2017-11-23T16:36:09+01:00 (3 years ago)
Author:
nicolasmartin
Message:

Modifications to get it working on Curie for all trusting tests

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/2015/dev_r5092_CNRS18_TRUST/NEMOGCM/TRUST/trusting.sh

    r8780 r8797  
    5454    ## If -v|--version option has been set, modify default SVN action on directories 
    5555    if   [ $( echo ${TRUS_SVNV} | grep  "HEAD\|up\|update"                     ) ]; then 
    56    TRUS_SVNA='svn update -r HEAD --accept=theirs-conflict' 
     56   TRUS_SVNA='svn update -r HEAD' 
    5757    elif [ $( echo ${TRUS_SVNV} | grep -o '{[0-9]\{4\}-[0-9]\{2\}-[0-9]\{2\}}' ) ]; then 
    5858   TRUS_SVNA='svn update -r     '$( echo ${TRUS_SVNV} | grep -o '{[0-9]\{4\}-[0-9]\{2\}-[0-9]\{2\}}' ) 
Note: See TracChangeset for help on using the changeset viewer.