geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jdil...@apache.org
Subject svn commit: r511425 - /geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/system/library/svn/LibraryImpl.groovy
Date Sun, 25 Feb 2007 03:23:37 GMT
Author: jdillon
Date: Sat Feb 24 19:23:37 2007
New Revision: 511425

URL: http://svn.apache.org/viewvc?view=rev&rev=511425
Log:
Add hack to handle (or try to at least) situations where 'svn cleanup' needs to be run

Modified:
    geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/system/library/svn/LibraryImpl.groovy

Modified: geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/system/library/svn/LibraryImpl.groovy
URL: http://svn.apache.org/viewvc/geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/system/library/svn/LibraryImpl.groovy?view=diff&rev=511425&r1=511424&r2=511425
==============================================================================
--- geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/system/library/svn/LibraryImpl.groovy
(original)
+++ geronimo/sandbox/build-support/libraries/system/1/groovy/gbuild/system/library/svn/LibraryImpl.groovy
Sat Feb 24 19:23:37 2007
@@ -34,6 +34,8 @@
 {
     URL sourceURL
     
+    private boolean dirty = false
+    
     def LibraryImpl(URL sourceURL, File baseDir) {
         super(baseDir)
         assert sourceURL
@@ -138,6 +140,11 @@
         
         // If the checkout was not complete, then the commit details will be missing
         if (lcommit == null) {
+            //
+            // HACK: Mark as dirty
+            //
+            dirty = true
+            
             // So force an update to be made to fully sync the workspace
             return false
         }
@@ -152,6 +159,15 @@
         log.info "Updating library in: $baseDir"
         
         assert exists()
+        
+        //
+        // HACK: If dirty, then cleanup first
+        //
+        
+        if (dirty) {
+            svn('cleanup', [ baseDir ])
+            dirty = false
+        }
         
         // Update the local copy
         svn('update', [ baseDir ])



Mime
View raw message