/[pcsx2_0.9.7]/auto_branch_latest_upstream.sh
ViewVC logotype

Diff of /auto_branch_latest_upstream.sh

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 140 by william, Fri Sep 10 12:30:03 2010 UTC revision 141 by william, Fri Sep 10 15:57:37 2010 UTC
# Line 45  else Line 45  else
45          echo -e "\\tDetected the use of: --force-update ... forcing update ..."          echo -e "\\tDetected the use of: --force-update ... forcing update ..."
46  fi  fi
47    
48    export BRANCH_COMMIT_MESSAGE="Creating $BRANCH_NAME branch for r$PCSX2_REVISION"
49    
50  echo $BRANCH_COMMIT_MESSAGE  echo $BRANCH_COMMIT_MESSAGE
51    
52  rm -Rf "$BRANCH_LOCATION/$BRANCH_NAME"  rm -Rf "$BRANCH_LOCATION/$BRANCH_NAME"
53  #remove the latest branch from the base repository  #remove the latest branch from the base repository
54  #svn delete "$BRANCH_LOCATION/$BRANCH_NAME" --non-interactive --trust-server-cert  #echo "calling: svn delete $BRANCH_LOCATION/$BRANCH_NAME"
55  svn delete "$BRANCH_LOCATION/$BRANCH_NAME" --non-interactive --trust-server-cert >/dev/null 2>/dev/null && BRANCH_CREATE_SUCCESS="0" || BRANCH_CREATE_SUCCESS="1"  #svn delete "$BRANCH_LOCATION/$BRANCH_NAME" --non-interactive --trust-server-cert && BRANCH_CREATE_SUCCESS="1" || BRANCH_CREATE_SUCCESS="0"
56    svn delete "$BRANCH_LOCATION/$BRANCH_NAME" --non-interactive --trust-server-cert >/dev/null 2>/dev/null && BRANCH_CREATE_SUCCESS="1" || BRANCH_CREATE_SUCCESS="0"
57    
58  #update the working copy  #update the working copy
59  #svn commit "$BRANCH_LOCATION" --non-interactive --trust-server-cert --depth immediates -m "remove latest branch for re-branching"  #echo "calling: svn commit $BRANCH_LOCATION"
60  svn commit "$BRANCH_LOCATION" --non-interactive --trust-server-cert --depth immediates -m "remove latest branch for re-branching" >/dev/null 2>/dev/null && BRANCH_CREATE_SUCCESS="0" || BRANCH_CREATE_SUCCESS="1"  #svn commit "$BRANCH_LOCATION" --non-interactive --trust-server-cert --depth immediates -m "remove latest branch for re-branching" && BRANCH_CREATE_SUCCESS="1" || BRANCH_CREATE_SUCCESS="0"
61    svn commit "$BRANCH_LOCATION" --non-interactive --trust-server-cert --depth immediates -m "remove latest branch for re-branching" >/dev/null 2>/dev/null && BRANCH_CREATE_SUCCESS="1" || BRANCH_CREATE_SUCCESS="0"
62  echo  echo
63  echo -n "EXPORTING: $downstream_export_location/trunk to $BRANCH_LOCATION/$BRANCH_NAME ... "  echo -n "EXPORTING: $downstream_export_location/trunk to $BRANCH_LOCATION/$BRANCH_NAME ... "
64  #svn export --force $downstream_export_location/trunk "$BRANCH_LOCATION/$BRANCH_NAME"  #svn export --force $downstream_export_location/trunk "$BRANCH_LOCATION/$BRANCH_NAME" && BRANCH_CREATE_SUCCESS="1" || BRANCH_CREATE_SUCCESS="0"
65  svn export --force $downstream_export_location/trunk "$BRANCH_LOCATION/$BRANCH_NAME" 2>/dev/null && BRANCH_CREATE_SUCCESS="0" || BRANCH_CREATE_SUCCESS="1"  svn export --force $downstream_export_location/trunk "$BRANCH_LOCATION/$BRANCH_NAME" 2>/dev/null && BRANCH_CREATE_SUCCESS="1" || BRANCH_CREATE_SUCCESS="0"
66    
67    
68  # add new branch to svn  # add new branch to svn
69  echo  echo
70  echo -n "Adding latest branch to svn ... "  echo -n "Adding latest branch to svn ... "
71  #svn add "$BRANCH_LOCATION/$BRANCH_NAME"  #svn add "$BRANCH_LOCATION/$BRANCH_NAME" && BRANCH_CREATE_SUCCESS="1" || BRANCH_CREATE_SUCCESS="0"
72  svn add "$BRANCH_LOCATION/$BRANCH_NAME" >/dev/null 2>/dev/null && BRANCH_CREATE_SUCCESS="0" || BRANCH_CREATE_SUCCESS="1"  svn add "$BRANCH_LOCATION/$BRANCH_NAME" >/dev/null 2>/dev/null && BRANCH_CREATE_SUCCESS="1" || BRANCH_CREATE_SUCCESS="0"
73  echo "Done."  echo "Done."
74    
75  cd "$BRANCH_LOCATION/$BRANCH_NAME"  cd "$BRANCH_LOCATION/$BRANCH_NAME"
76    echo
77    echo -n "Committing latest branch to svn ... "
78  # commit the newly created branch  # commit the newly created branch
79  #svn commit -m "$BRANCH_COMMIT_MESSAGE" "$BRANCH_LOCATION" --non-interactive --trust-server-cert  #svn commit -m "$BRANCH_COMMIT_MESSAGE" "$BRANCH_LOCATION" --non-interactive --trust-server-cert && BRANCH_CREATE_SUCCESS="1" || BRANCH_CREATE_SUCCESS="0"
80  svn commit -m "$BRANCH_COMMIT_MESSAGE" "$BRANCH_LOCATION" --non-interactive --trust-server-cert >/dev/null 2>/dev/null && BRANCH_CREATE_SUCCESS="0" || BRANCH_CREATE_SUCCESS="1"  svn commit -m "$BRANCH_COMMIT_MESSAGE" "$BRANCH_LOCATION" --non-interactive --trust-server-cert >/dev/null 2>/dev/null && BRANCH_CREATE_SUCCESS="1" || BRANCH_CREATE_SUCCESS="0"
81    echo "Done."
82    
83    
84  # call auto_build_latest_upstream.sh  # call auto_build_latest_upstream.sh
85  #"$downstream_export_location/auto_import_patches.sh"  #"$downstream_export_location/auto_import_patches.sh"
86  #"$downstream_export_location/auto_build.sh"  #"$downstream_export_location/auto_build.sh"
87  if [ "$BRANCH_CREATE_SUCCESS" == "1" ] ; then  if [ "$BRANCH_CREATE_SUCCESS" == "1" ] ; then
88            cd "$downstream_export_location/"
89          "$downstream_export_location/auto_tag_latest_upstream.sh"          "$downstream_export_location/auto_tag_latest_upstream.sh"
90  else  else
91          echo "AUTO BRANCH FAILED ... AUTO TAGGING NOT PERFORMED."          echo "AUTO BRANCH FAILED ... AUTO TAGGING NOT PERFORMED."

Legend:
Removed from v.140  
changed lines
  Added in v.141

  ViewVC Help
Powered by ViewVC 1.1.22