Changeset 1367


Ignore:
Timestamp:
Jul 22, 2009 11:12:35 AM (11 years ago)
Author:
tkr
Message:

Merging r1366 from trunk to stable/0.6

Location:
stable/0.6
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • stable/0.6

    • Property svn:mergeinfo changed
      /trunkmerged: 1366
  • stable/0.6/prepare_new_release

    r1365 r1367  
    525525  echo ''
    526526
    527   rm -f Externals
     527  rm -f Externals.releases
    528528  ext_name=
    529529  ext_url=
     
    604604
    605605      echo "     $ext_rel_url"
    606       echo "$ext_name  $ext_rel_url" >>Externals
     606      echo "$ext_name  $ext_rel_url" >>Externals.releases
    607607      ext_name=
    608608      echo ''
     
    614614  echo ''
    615615
    616   svn pset svn:externals -F Externals .
     616  svn pset svn:externals -F Externals.releases .
    617617
    618618  svn update
     
    624624  ext_name=
    625625  ext_url=
    626   for i in `cat Externals`; do
     626  for i in `cat Externals.releases`; do
    627627    if test "$ext_name" = ""; then
    628628      ext_name="$i"
     
    646646    fi
    647647  done
    648 fi # if test -r Externals
     648fi # if test -r Externals.releases
    649649
    650650if test $isThirdParty = yes; then
     
    733733if test -n "$stableExternals" ; then
    734734  echo "Grooming Externals to remove stable references used for testing."
    735   rm -rf Externals.releases
     735  mv Externals.releases Externals
    736736  ext_name=
    737737  ext_url=
     
    754754    fi
    755755  done
    756   mv Externals.releases Externals
    757   svn propset -F Externals svn:externals .
    758 fi
    759 
    760 
    761 if test -r Externals; then
     756  svn propset -F Externals.releases svn:externals .
     757  rm -rf Externals
     758fi
     759
     760
     761if test -r Externals.releases; then
    762762  echo ''
    763763  echo 'Also, please confirm the Externals are correct:'
     
    773773echo "and run the commit_new_release script"
    774774
    775 rm -rf Externals
     775rm -rf Externals.releases
    776776
    777777cat >.new_release_data <<EOF
Note: See TracChangeset for help on using the changeset viewer.