subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cmpil...@apache.org
Subject svn commit: r1334029 - /subversion/trunk/subversion/libsvn_client/ra.c
Date Fri, 04 May 2012 15:21:48 GMT
Author: cmpilato
Date: Fri May  4 15:21:48 2012
New Revision: 1334029

URL: http://svn.apache.org/viewvc?rev=1334029&view=rev
Log:
Follow-up to r1333936, (hopefully) fixing the "commit disjoint working
copies" case that some of the buildbots are puking on right now.

* subversion/libsvn_client/ra.c
  (svn_client__open_ra_session_internal): base_dir_abspath might not
    point to a working copy directory.  If that's the case, don't try
    to calculate a working copy root path.

Modified:
    subversion/trunk/subversion/libsvn_client/ra.c

Modified: subversion/trunk/subversion/libsvn_client/ra.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/ra.c?rev=1334029&r1=1334028&r2=1334029&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/ra.c (original)
+++ subversion/trunk/subversion/libsvn_client/ra.c Fri May  4 15:21:48 2012
@@ -337,9 +337,24 @@ svn_client__open_ra_session_internal(svn
           SVN_ERR(err);
         }
 
-      SVN_ERR(svn_wc__get_wc_root(&wcroot_abspath, ctx->wc_ctx,
-                                  base_dir_abspath, pool, pool));
-      cb->wcroot_abspath = wcroot_abspath;
+      err = svn_wc__get_wc_root(&wcroot_abspath, ctx->wc_ctx,
+                                base_dir_abspath, pool, pool);
+      if (err)
+        {
+          if (err->apr_err == SVN_ERR_WC_NOT_WORKING_COPY)
+            {
+              svn_error_clear(err);
+              err = SVN_NO_ERROR;
+            }
+          else
+            {
+              return err;
+            }
+        }
+      else
+        {
+          cb->wcroot_abspath = wcroot_abspath;
+        }
     }
 
   /* If the caller allows for auto-following redirections, and the



Mime
View raw message