svn commit: r1934811 - subversion/trunk/subversion/libsvn_client

[brane]

Author: brane
Date: Sun May 31 10:51:54 2026
New Revision: 1934811

Log:
Follow up to r1934787: SVN_DBG is only defined when debugging is enabled.

* subversion/libsvn_client/conflicts.c: Include private/svn_debug.h.
  (conflict_tree_get_description_incoming_delete,
   conflict_tree_get_description_incoming_add,
   conflict_tree_get_details_incoming_edit,
   conflict_tree_get_description_incoming_edit): Wrap usages of SVN_DBG
   in #ifdef SVN_DEBUG.

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

Modified: subversion/trunk/subversion/libsvn_client/conflicts.c
==============================================================================
--- subversion/trunk/subversion/libsvn_client/conflicts.c       Sun May 31 
09:21:08 2026        (r1934810)
+++ subversion/trunk/subversion/libsvn_client/conflicts.c       Sun May 31 
10:51:54 2026        (r1934811)
@@ -4887,7 +4887,9 @@ conflict_tree_get_description_incoming_d
     }
   else
     {
+#ifdef SVN_DEBUG
       SVN_DBG(("unknown conflict operation: %d", (int)conflict_operation));
+#endif
       SVN_ERR_MALFUNCTION();
     }
 
@@ -5846,7 +5848,9 @@ conflict_tree_get_description_incoming_a
     }
   else
     {
+#ifdef SVN_DEBUG
       SVN_DBG(("unknown conflict operation: %d", (int)conflict_operation));
+#endif
       SVN_ERR_MALFUNCTION();
     }
 
@@ -6040,7 +6044,9 @@ conflict_tree_get_details_incoming_edit(
     }
   else
     {
+#ifdef SVN_DEBUG
       SVN_DBG(("unknown conflict operation: %d", (int)conflict_operation));
+#endif
       SVN_ERR_MALFUNCTION();
     }
 
@@ -6381,7 +6387,9 @@ conflict_tree_get_description_incoming_e
     }
   else
     {
+#ifdef SVN_DEBUG
       SVN_DBG(("unknown conflict operation: %d", (int)conflict_operation));
+#endif
       SVN_ERR_MALFUNCTION();
     }