/[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/09 20:10:48	105
+++ auto_branch_latest_upstream.sh	2010/09/10 11:04:39	129
@@ -9,10 +9,11 @@
 fi
 
 export current_downstream_revision=`cat "$BRANCH_LOCATION/$BRANCH_NAME/upstream_repository_revision.txt"`
+export current_local_revision=`cat "$BRANCH_LOCATION/$BRANCH_NAME/local_repository_revision.txt"`
 
 if [ "$OVERRIDE_UPDATE_NEEDED_CHECK" != "1" ] ; then
-        if [ "$current_downstream_revision" == "$upstream_revision" ] ; then
-                echo "UPSTREAM REVISION: $upstream_revision"
+        if [ "$current_downstream_revision" == "$PCSX2_REVISION" && "$current_local_revision" == "$PCSX2_REVISION_LOCAL" ] ; then
+                echo "UPSTREAM REVISION: $PCSX2_REVISION"
                 echo "DOWNSTREAM REVISION: $current_downstream_revision"
                 echo
                 echo -e "\\tThere is no need to update the local repository. reason: upstream repository has not been updated."
@@ -22,8 +23,8 @@
                 exit 0
         fi
 else
-        if [ "$current_downstream_revision" == "$upstream_revision" ] ; then
-                echo "UPSTREAM REVISION: $upstream_revision"
+        if [ "$current_downstream_revision" == "$PCSX2_REVISION" && "$current_local_revision" == "$PCSX2_REVISION_LOCAL" ] ; then
+                echo "UPSTREAM REVISION: $PCSX2_REVISION"
                 echo "DOWNSTREAM REVISION: $current_downstream_revision"
                 echo
                 echo -e "\\tThere is no need to update the local repository. reason: upstream repository has not been updated."

 

  ViewVC Help
Powered by ViewVC 1.1.22