/[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

--- auto_branch_latest_upstream.sh	2010/09/10 12:30:03	132
+++ auto_branch_latest_upstream.sh	2010/09/10 15:57:37	141
@@ -45,40 +45,47 @@
         echo -e "\\tDetected the use of: --force-update ... forcing update ..."
 fi
 
+export BRANCH_COMMIT_MESSAGE="Creating $BRANCH_NAME branch for r$PCSX2_REVISION"
+
 echo $BRANCH_COMMIT_MESSAGE
 
 rm -Rf "$BRANCH_LOCATION/$BRANCH_NAME"
 #remove the latest branch from the base repository
-#svn delete "$BRANCH_LOCATION/$BRANCH_NAME" --non-interactive --trust-server-cert
-svn delete "$BRANCH_LOCATION/$BRANCH_NAME" --non-interactive --trust-server-cert >/dev/null 2>/dev/null && BRANCH_CREATE_SUCCESS="0" || BRANCH_CREATE_SUCCESS="1"
+#echo "calling: svn delete $BRANCH_LOCATION/$BRANCH_NAME"
+#svn delete "$BRANCH_LOCATION/$BRANCH_NAME" --non-interactive --trust-server-cert && BRANCH_CREATE_SUCCESS="1" || BRANCH_CREATE_SUCCESS="0"
+svn delete "$BRANCH_LOCATION/$BRANCH_NAME" --non-interactive --trust-server-cert >/dev/null 2>/dev/null && BRANCH_CREATE_SUCCESS="1" || BRANCH_CREATE_SUCCESS="0"
 
 #update the working copy
-#svn commit "$BRANCH_LOCATION" --non-interactive --trust-server-cert --depth immediates -m "remove latest branch for re-branching"
-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"
-
+#echo "calling: svn commit $BRANCH_LOCATION"
+#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"
+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"
 echo
 echo -n "EXPORTING: $downstream_export_location/trunk to $BRANCH_LOCATION/$BRANCH_NAME ... "
-#svn export --force $downstream_export_location/trunk "$BRANCH_LOCATION/$BRANCH_NAME"
-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" && BRANCH_CREATE_SUCCESS="1" || BRANCH_CREATE_SUCCESS="0"
+svn export --force $downstream_export_location/trunk "$BRANCH_LOCATION/$BRANCH_NAME" 2>/dev/null && BRANCH_CREATE_SUCCESS="1" || BRANCH_CREATE_SUCCESS="0"
 
 
 # add new branch to svn
 echo
 echo -n "Adding latest branch to svn ... "
-#svn add "$BRANCH_LOCATION/$BRANCH_NAME"
-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" && BRANCH_CREATE_SUCCESS="1" || BRANCH_CREATE_SUCCESS="0"
+svn add "$BRANCH_LOCATION/$BRANCH_NAME" >/dev/null 2>/dev/null && BRANCH_CREATE_SUCCESS="1" || BRANCH_CREATE_SUCCESS="0"
 echo "Done."
 
 cd "$BRANCH_LOCATION/$BRANCH_NAME"
+echo
+echo -n "Committing latest branch to svn ... "
 # commit the newly created branch
-#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 >/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 && BRANCH_CREATE_SUCCESS="1" || BRANCH_CREATE_SUCCESS="0"
+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"
+echo "Done."
 
 
 # call auto_build_latest_upstream.sh
 #"$downstream_export_location/auto_import_patches.sh"
 #"$downstream_export_location/auto_build.sh"
 if [ "$BRANCH_CREATE_SUCCESS" == "1" ] ; then
+	cd "$downstream_export_location/"
 	"$downstream_export_location/auto_tag_latest_upstream.sh"
 else
 	echo "AUTO BRANCH FAILED ... AUTO TAGGING NOT PERFORMED."

 

  ViewVC Help
Powered by ViewVC 1.1.22