subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From julianf...@apache.org
Subject svn commit: r1719074 - /subversion/trunk/subversion/libsvn_delta/branch_compat.c
Date Thu, 10 Dec 2015 12:18:40 GMT
Author: julianfoad
Date: Thu Dec 10 12:18:39 2015
New Revision: 1719074

URL: http://svn.apache.org/viewvc?rev=1719074&view=rev
Log:
Change the debug code to return the info as an error message text, as that
may be logged by the buildbots whereas stdout/stderr are not. A follow-up
to r1719056.

* subversion/libsvn_delta/branch_compat.c
  (insert_change,
   drive_changes_r): Report debugging info through an error object.

Modified:
    subversion/trunk/subversion/libsvn_delta/branch_compat.c

Modified: subversion/trunk/subversion/libsvn_delta/branch_compat.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_delta/branch_compat.c?rev=1719074&r1=1719073&r2=1719074&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_delta/branch_compat.c (original)
+++ subversion/trunk/subversion/libsvn_delta/branch_compat.c Thu Dec 10 12:18:39 2015
@@ -387,8 +387,9 @@ insert_change(change_node_t **change_p,
            * but not allowed after an add or a no-restructure change. */
           if (change->action != RESTRUCTURE_DELETE)
             {
-              printf("### insert_change(relpath='%s', action=%d): "
-                     "unexpected previous change (%s)\n",
+              return svn_error_createf(SVN_ERR_ASSERTION_FAIL, NULL,
+                     "### insert_change(relpath='%s', action=%d): "
+                     "unexpected previous change (%s)",
                      relpath, action,
                      change_node_str(change, changes_pool));
             }
@@ -1638,11 +1639,12 @@ drive_changes_r(const char *rrpath,
                                     eb, scratch_pool);
               if (err && err->apr_err == SVN_ERR_ASSERTION_FAIL)
                 {
-                  printf("### recursive drive_changes_r('%s', %s, ...) failed: "
+                  return svn_error_createf(SVN_ERR_ASSERTION_FAIL, NULL,
+                         "### recursive drive_changes_r('%s', %s, ...) failed: "
                          "name='%s', child_in_current=%d, "
                          "current_children=%s, "
                          "final_children=%s, "
-                         "union_children=%s\n",
+                         "union_children=%s",
                          this_rrpath, pathrev_str(child_pred, scratch_pool),
                          name, child_in_current,
                          hash_keys_str(current_children),



Mime
View raw message