Changeset 1617


Ignore:
Timestamp:
12/12/11 09:04:45 (13 years ago)
Author:
mmaipsl
Message:

Move temporary directory in tmp sub-directory. Check case of svn update in the sub-tree of a component.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • modipsl/trunk/util/script_diff_model

    r1596 r1617  
    6767 
    6868MODIPSL_SAVE_NAME=modipsl_save_diff_$( date +%F_%H%M%S ) 
    69 echo "out directory in " ${MODIPSL_SAVE_NAME} 
    70 MODIPSL_SAVE=${MODIPSL}/${MODIPSL_SAVE_NAME} 
     69echo "SAVE directory in " ${MODIPSL_SAVE_NAME} 
     70MODIPSL_SAVE=${MODIPSL}/tmp/${MODIPSL_SAVE_NAME} 
    7171printDebugArray MODIPSL_SAVE 
    7272 
     
    7474    \( -not -path '*.svn*' -a -not -path '*CVS*' -a -not -path "${MODIPSL}/modipsl_save*" \ 
    7575    -a -not -path "${MODIPSL}/bin" -a -not -path "${MODIPSL}/lib" -a -not -path "${MODIPSL}/util" \ 
    76     -a -not -path "${MODIPSL}/tmp" \) \ 
     76    -a -not -path "${MODIPSL}/tmp*" \) \ 
    7777    -exec bash -c " echo "'{}'" | sed -e 's&"${MODIPSL}"/&&' | tee -a >( sed -e 's&\(.*\)&"${MODIPSL_SAVE}"/\1&' | xargs mkdir -p >> out_mkdir 2>&1 ) " \; ) 
    7878rm out_mkdir 
     
    181181                ListPathBranch[$i]=${comp} 
    182182                 
    183                 svn diff ${filecomp} > ${MODIPSL}/svn_diff_${save_diff_file} 
     183                svn diff -r ${ListPathRev[$i]} ${filecomp} > ${MODIPSL}/svn_diff_${save_diff_file} 
    184184                RET=$? 
    185185                if [ $RET -gt 0 ] ; then 
     
    311311    ListPathRev[$i]=$( svn info | grep "R.vision_*:" | gawk -F  ' ' '{print $2}' ) 
    312312     
    313     svn diff > ${MODIPSL}/svn_diff_${save_diff_file} 
     313    svn diff -r ${ListPathRev[$i]} > ${MODIPSL}/svn_diff_${save_diff_file} 
    314314    RET=$? 
    315315    if [ $RET -gt 0 ] ; then 
Note: See TracChangeset for help on using the changeset viewer.