subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From julianf...@apache.org
Subject svn commit: r1366138 - /subversion/trunk/subversion/libsvn_client/merge.c
Date Thu, 26 Jul 2012 18:34:08 GMT
Author: julianfoad
Date: Thu Jul 26 18:34:08 2012
New Revision: 1366138

URL: http://svn.apache.org/viewvc?rev=1366138&view=rev
Log:
Un-break release-mode builds.  A follow-up to r1366120.

* subversion/libsvn_client/merge.c:
  (session_url_is): Compile this unconditionally, as SVN_ERR_ASSERT
    expressions are compiled even in release-mode builds.

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

Modified: subversion/trunk/subversion/libsvn_client/merge.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/merge.c?rev=1366138&r1=1366137&r2=1366138&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/merge.c (original)
+++ subversion/trunk/subversion/libsvn_client/merge.c Thu Jul 26 18:34:08 2012
@@ -363,7 +363,6 @@ typedef struct merge_cmd_baton_t {
 
 /*** Utilities ***/
 
-#ifdef SVN_DEBUG
 /* Return TRUE iff the session URL of RA_SESSION is equal to URL.  Useful in
  * asserting preconditions. */
 static svn_boolean_t
@@ -378,7 +377,6 @@ session_url_is(svn_ra_session_t *ra_sess
   SVN_ERR_ASSERT_NO_RETURN(! err);
   return strcmp(url, session_url) == 0;
 }
-#endif /* SVN_DEBUG */
 
 /* Return a new merge_source_t structure, allocated in RESULT_POOL,
  * initialized with deep copies of LOC1 and LOC2 and ANCESTRAL. */



Mime
View raw message