[ros-diffs] [dreimer] 47145: Bug 5369: Patch and Enhancements for RosBE: Wrong SSVN update behavior. Partially applied: - The EOC to skip rosapps and rostests was not applied, because it might be possible that rosapps or rostests need a update anyway. - Fixed a logical error in %_BUILDBOT_SVNSKIPMAINTRUNK% if condition.

dreimer at svn.reactos.org dreimer at svn.reactos.org
Sun May 9 15:15:34 CEST 2010


Author: dreimer
Date: Sun May  9 15:15:33 2010
New Revision: 47145

URL: http://svn.reactos.org/svn/reactos?rev=47145&view=rev
Log:
Bug 5369: Patch and Enhancements for RosBE: Wrong SSVN update behavior.
Partially applied:
- The EOC to skip rosapps and rostests was not applied, because it might be possible that rosapps or rostests need a update anyway.
- Fixed a logical error in %_BUILDBOT_SVNSKIPMAINTRUNK% if condition.

Modified:
    trunk/tools/RosBE/RosBE-Windows/Powershell/sSVN.ps1
    trunk/tools/RosBE/RosBE-Windows/Root/sSVN.cmd

Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/sSVN.ps1
URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershell/sSVN.ps1?rev=47145&r1=47144&r2=47145&view=diff
==============================================================================
--- trunk/tools/RosBE/RosBE-Windows/Powershell/sSVN.ps1 [iso-8859-1] (original)
+++ trunk/tools/RosBE/RosBE-Windows/Powershell/sSVN.ps1 [iso-8859-1] Sun May  9 15:15:33 2010
@@ -30,11 +30,27 @@
                 $_ROSBE_SSVN_JOB = "update"
             }
         }
+        if ($OFFSVN -eq $ONSVN) {
+            "Your tree is up to date."
+        }
+
         if ("$_ROSBE_SSVN_JOB" -eq "update") {
             if ("$($arg[1])" -ne "") {
                 $temparg = $arg[1]
+
+                if ($temparg -eq $OFFSVN) {
+                    "Your Local Repository is currently $temparg"
+                }
+                if ($temparg -lt $OFFSVN) {
+                    "Downgrading to $temparg ..."
+                }
+                if ($temparg -gt $OFFSVN) {
+                    "Updating to $temparg ..."
+                }
                 if ("$_BUILDBOT_SVNSKIPMAINTRUNK" -ne "1") {
                     IEX "& svn.exe update -r $temparg"
+                } else {
+                    "Skipping ReactOS Trunk update."
                 }
                 if (Test-Path "modules\rosapps\.") {
                     Set-Location "modules\rosapps"
@@ -72,9 +88,6 @@
                 IEX "& svn.exe log -r $range"
             }
         }
-    }
-    if ($OFFSVN -eq $ONSVN) {
-        "Your tree is up to date."
     }
 }
 

Modified: trunk/tools/RosBE/RosBE-Windows/Root/sSVN.cmd
URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/sSVN.cmd?rev=47145&r1=47144&r2=47145&view=diff
==============================================================================
--- trunk/tools/RosBE/RosBE-Windows/Root/sSVN.cmd [iso-8859-1] (original)
+++ trunk/tools/RosBE/RosBE-Windows/Root/sSVN.cmd [iso-8859-1] Sun May  9 15:15:33 2010
@@ -28,7 +28,7 @@
     echo This might take a while, so please be patient.
     echo.
     set _ROSBE_SSVN_JOB=update
-    goto :UP    
+    goto :UP
 )
 
 if /i "%1" == "cleanup" (
@@ -202,10 +202,27 @@
             set /p UP="Please enter 'yes' or 'no': "
             if /i "!UP!" == "yes" set _ROSBE_SSVN_JOB=update
         )
-        if "!_ROSBE_SSVN_JOB!" == "update" (
+    )
+    if !OFFSVN! equ !ONSVN! (
+        echo Your tree is up to date.
+    )
+
+    if "!_ROSBE_SSVN_JOB!" == "update" (
             if not "%2" == "" (
+            
+                if "%2" == "!OFFSVN!" (
+                    echo Your Local Repository is currently %2
+                )
+                if "%2" LSS "!OFFSVN!" (
+                    echo Downgrading to %2 ...
+                )
+                if "%2" GTR "!OFFSVN!" (
+                    echo Updating to %2 ...
+                )
                 if not "%_BUILDBOT_SVNSKIPMAINTRUNK%" == "1" (
                     svn.exe update -r %2
+                ) else (
+                    echo Skipping ReactOS Trunk update.
                 )
                 if exist "modules\rosapps\." (
                     cd "modules\rosapps"
@@ -243,9 +260,6 @@
             svn.exe log -r !OFFSVN!:!ONSVN!
         )
     )
-    if !OFFSVN! equ !ONSVN! (
-        echo Your tree is up to date.
-    )
 
 goto EOC
 




More information about the Ros-diffs mailing list