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 2012/03/20 18:31:24 UTC

svn commit: r1303030 - /subversion/trunk/subversion/include/private/svn_client_private.h

Author: julianfoad
Date: Tue Mar 20 17:31:24 2012
New Revision: 1303030

URL: http://svn.apache.org/viewvc?rev=1303030&view=rev
Log:
* subversion/include/private/svn_client_private.h
  (SVN_WITH_SYMMETRIC_MERGE): Only define when SVN_DEBUG is defined,
    as the code still has some SVN_DBG statements (which I want to keep at
    this unfinished stage) and they can't be used in a release-mode build.

Modified:
    subversion/trunk/subversion/include/private/svn_client_private.h

Modified: subversion/trunk/subversion/include/private/svn_client_private.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/include/private/svn_client_private.h?rev=1303030&r1=1303029&r2=1303030&view=diff
==============================================================================
--- subversion/trunk/subversion/include/private/svn_client_private.h (original)
+++ subversion/trunk/subversion/include/private/svn_client_private.h Tue Mar 20 17:31:24 2012
@@ -102,7 +102,9 @@ svn_client__wc_node_get_origin(const cha
 
 /* A macro to mark sections of code that belong to the 'symmetric merge'
  * feature while it's still new. */
+#ifdef SVN_DEBUG
 #define SVN_WITH_SYMMETRIC_MERGE
+#endif
 
 #ifdef SVN_WITH_SYMMETRIC_MERGE