svn commit: r936961 - /subversion/trunk/subversion/libsvn_wc/node.c

[neels]

Author: neels
Date: Thu Apr 22 17:00:50 2010
New Revision: 936961

URL: http://svn.apache.org/viewvc?rev=936961&view=rev
Log:
Fix error handling from r936464.

* subversion/libsvn_wc/node.c
  (svn_wc__node_get_commit_base_rev): Wrap two returns into svn_error_return().

Modified:
    subversion/trunk/subversion/libsvn_wc/node.c

Modified: subversion/trunk/subversion/libsvn_wc/node.c
URL: 
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/node.c?rev=936961&r1=936960&r2=936961&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/node.c (original)
+++ subversion/trunk/subversion/libsvn_wc/node.c Thu Apr 22 17:00:50 2010
@@ -694,9 +694,9 @@ svn_wc__node_get_commit_base_rev(svn_rev
       if (! SVN_IS_VALID_REVNUM(*commit_base_revision) && base_shadowed)
         /* It is a replace that does not feature a copy/move-here.
            Return the revert-base revision. */
-        return svn_wc__node_get_base_rev(commit_base_revision,
-                                         wc_ctx, local_abspath,
-                                         scratch_pool);
+        return svn_error_return(
+          svn_wc__node_get_base_rev(commit_base_revision, wc_ctx,
+                                    local_abspath, scratch_pool));
     }
   else if (status == svn_wc__db_status_deleted)
     {
@@ -733,9 +733,9 @@ svn_wc__node_get_commit_base_rev(svn_rev
         }
       else
         /* This is a normal delete. Get the base revision. */
-        return svn_wc__node_get_base_rev(commit_base_revision,
-                                         wc_ctx, local_abspath,
-                                         scratch_pool);
+        return svn_error_return(
+          svn_wc__node_get_base_rev(commit_base_revision, wc_ctx,
+                                    local_abspath, scratch_pool));
     }
 
   return SVN_NO_ERROR;