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

Diff of /auto_update_from_upstream.sh

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

--- auto_update_from_upstream.sh	2010/09/10 11:04:39	129
+++ auto_update_from_upstream.sh	2010/09/10 11:49:09	130
@@ -21,7 +21,8 @@
 	svn update > /dev/null
 	echo
 	echo -n "Updated Upstream PCSX2 Repository to Revision: "
-	svn log -r head:prev --xml | grep "revision=" | sed s/".*revision=\""// | sed s/"\".*"// > "$upstream_trunk/trunk/upstream_repository_revision.txt"
+	#svn log -r head:prev --xml | grep "revision=" | sed s/".*revision=\""// | sed s/"\".*"// > "$upstream_trunk/trunk/upstream_repository_revision.txt"
+	echo "$PCSX2_REVISION" > "$upstream_trunk/trunk/upstream_repository_revision.txt"	
 	export upstream_revision=`cat "$upstream_trunk/trunk/upstream_repository_revision.txt"`
 	echo $upstream_revision
 	upstream_repository_url=`svn info --xml | grep "<url>" | sed s/"^<url>"// | sed s/"<\/url>$"//`
@@ -33,7 +34,8 @@
 	svn update -r "$upstream_revision" > /dev/null
 	echo
 	echo -n "Updated Upstream PCSX2 Repository to Revision: "
-	svn log -r "$upstream_revision" --xml | grep "revision=" | sed s/".*revision=\""// | sed s/"\".*"// > "$upstream_trunk/trunk/upstream_repository_revision.txt"
+	#svn log -r head:prev --xml | grep "revision=" | sed s/".*revision=\""// | sed s/"\".*"// > "$upstream_trunk/trunk/upstream_repository_revision.txt"
+	echo "$PCSX2_REVISION" > "$upstream_trunk/trunk/upstream_repository_revision.txt"
 	export upstream_revision=`cat "$upstream_trunk/trunk/upstream_repository_revision.txt"`
 	echo $upstream_revision
 	upstream_repository_url=`svn info --xml | grep "<url>" | sed s/"^<url>"// | sed s/"<\/url>$"//`
@@ -49,10 +51,11 @@
 export current_local_revision=`cat "$downstream_export_location/trunk/local_repository_revision.txt"`
 
 if [ "$OVERRIDE_UPDATE_NEEDED_CHECK" != "1" ] ; then
-	if [ "$current_downstream_revision" == "$PCSX2_REVISION" -a "$current_local_revision" == "$PCSX2_REVISION_LOCAL" ] ; then
-		echo "UPSTREAM REVISION: $upstream_revision"
+	if [ "$current_downstream_revision" == "$PCSX2_REVISION" -a $current_local_revision -lt $PCSX2_REVISION_LOCAL ] ; then
+		echo "UPSTREAM REVISION: $PCSX2_REVISION"
 		echo "DOWNSTREAM REVISION: $current_downstream_revision"
 		echo "LOCAL REVISION: $current_local_revision"
+		echo "LOCAL COMMITTED REVISION: $PCSX2_REVISION_LOCAL"
 		echo
 		echo -e "\\tThere is no need to update the local repository. reason: upstream repository has not been updated."
 		echo
@@ -65,10 +68,11 @@
 		echo "LOCAL REVISION: $current_local_revision"		
 	fi	
 else
-	if [ "$current_downstream_revision" == "$PCSX2_REVISION" -a "$current_local_revision" == "$PCSX2_REVISION_LOCAL" ] ; then
-		echo "UPSTREAM REVISION: $upstream_revision"
+	if [ "$current_downstream_revision" == "$PCSX2_REVISION" -a $current_local_revision -lt $PCSX2_REVISION_LOCAL ] ; then
+		echo "UPSTREAM REVISION: $PCSX2_REVISION"
 		echo "DOWNSTREAM REVISION: $current_downstream_revision"
 		echo "LOCAL REVISION: $current_local_revision"
+		echo "LOCAL COMMITTED REVISION: $PCSX2_REVISION_LOCAL"
 		echo
 		echo -e "\\tThere is no need to update the local repository. reason: upstream repository has not been updated."
 		echo

 

  ViewVC Help
Powered by ViewVC 1.1.22