You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by ju...@apache.org on 2015/12/10 12:43:58 UTC
svn commit: r1719067 -
/subversion/trunk/subversion/libsvn_delta/branch_compat.c
Author: julianfoad
Date: Thu Dec 10 11:43:58 2015
New Revision: 1719067
URL: http://svn.apache.org/viewvc?rev=1719067&view=rev
Log:
Enable the debug code also in release builds, as the buildbots are doing
release builds. A follow-up to r1719056.
* subversion/libsvn_delta/branch_compat.c
(pathrev_str,
hash_keys_str,
change_node_str): New.
(insert_change,
drive_changes_r): Don't make debugging info conditional on SVN_DEBUG.
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=1719067&r1=1719066&r2=1719067&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_delta/branch_compat.c (original)
+++ subversion/trunk/subversion/libsvn_delta/branch_compat.c Thu Dec 10 11:43:58 2015
@@ -74,8 +74,6 @@ pathrev_equal(const svn_pathrev_t *p1,
return TRUE;
}
-#ifdef SVN_DEBUG
-
/* Return a human-readable string representation of LOC. */
static const char *
pathrev_str(const svn_pathrev_t *loc,
@@ -111,8 +109,6 @@ hash_keys_str(apr_hash_t *hash)
return apr_psprintf(pool, "{%s}", str);
}
-#endif
-
/*
* ========================================================================
@@ -393,7 +389,6 @@ insert_change(change_node_t **change_p,
{
/* Add or copy is allowed after delete (and replaces the delete),
* but not allowed after an add or a no-restructure change. */
-#ifdef SVN_DEBUG
if (change->action != RESTRUCTURE_DELETE)
{
printf("### insert_change(relpath='%s', action=%d): "
@@ -401,7 +396,6 @@ insert_change(change_node_t **change_p,
relpath, action,
change_node_str(change, changes_pool));
}
-#endif
VERIFY(change->action == RESTRUCTURE_DELETE);
change->action = action;
}
@@ -1646,7 +1640,6 @@ drive_changes_r(const char *rrpath,
child_pred,
paths_final, top_branch_id,
eb, scratch_pool);
-#ifdef SVN_DEBUG
if (err && err->apr_err == SVN_ERR_ASSERTION_FAIL)
{
printf("### recursive drive_changes_r('%s', %s, ...) failed: "
@@ -1660,7 +1653,6 @@ drive_changes_r(const char *rrpath,
hash_keys_str(final_children),
hash_keys_str(union_children));
}
-#endif
SVN_ERR(err);
}
}