subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From julianf...@apache.org
Subject svn commit: r1348922 - in /subversion/trunk/subversion: include/private/svn_client_private.h libsvn_client/merge.c tests/cmdline/merge_symmetric_tests.py
Date Mon, 11 Jun 2012 16:02:43 GMT
Author: julianfoad
Date: Mon Jun 11 16:02:42 2012
New Revision: 1348922

URL: http://svn.apache.org/viewvc?rev=1348922&view=rev
Log:
Define 'SVN_WITH_SYMMETRIC_MERGE' unconditionally, instead of only when
SVN_DEBUG is defined.  This avoids having some symmetric merge tests pass
in a debug build but fail in a release build.

* subversion/include/private/svn_client_private.h
  (SVN_WITH_SYMMETRIC_MERGE): Define unconditionally.

* subversion/libsvn_client/merge.c
  (find_symmetric_merge, do_symmetric_merge_locked): Remove SVN_DBG
    statements.

* subversion/tests/cmdline/merge_symmetric_tests.py
  (merge_to_and_fro_1_1, merge_to_and_fro_1_1,
   merge_to_and_fro_2_1, merge_to_and_fro_2_1,
   merge_to_and_fro_3_1, merge_to_and_fro_3_2,
   merge_to_and_fro_4_1, merge_to_and_fro_4_1): Remove 'Wimp'.

Modified:
    subversion/trunk/subversion/include/private/svn_client_private.h
    subversion/trunk/subversion/libsvn_client/merge.c
    subversion/trunk/subversion/tests/cmdline/merge_symmetric_tests.py

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=1348922&r1=1348921&r2=1348922&view=diff
==============================================================================
--- subversion/trunk/subversion/include/private/svn_client_private.h (original)
+++ subversion/trunk/subversion/include/private/svn_client_private.h Mon Jun 11 16:02:42 2012
@@ -180,9 +180,7 @@ svn_client__wc_node_get_origin(svn_clien
 
 /* 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
 

Modified: subversion/trunk/subversion/libsvn_client/merge.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/merge.c?rev=1348922&r1=1348921&r2=1348922&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/merge.c (original)
+++ subversion/trunk/subversion/libsvn_client/merge.c Mon Jun 11 16:02:42 2012
@@ -11462,9 +11462,6 @@ find_symmetric_merge(svn_client__pathrev
   SVN_ERR(find_base_on_target(&base_on_target, &mid, s_t,
                               ctx, scratch_pool, scratch_pool));
 
-  SVN_DBG(("base on source: %s@%ld\n", base_on_source->url, base_on_source->rev));
-  SVN_DBG(("base on target: %s@%ld\n", base_on_target->url, base_on_target->rev));
-
   /* Choose a base. */
   if (base_on_source->rev >= base_on_target->rev)
     {
@@ -11568,11 +11565,6 @@ do_symmetric_merge_locked(const svn_clie
   source.loc1 = merge->base;
   source.loc2 = merge->right;
   source.ancestral = (merge->mid == NULL);
-  SVN_DBG(("yca   %s@%ld\n", merge->yca->url, merge->yca->rev));
-  SVN_DBG(("base  %s@%ld\n", merge->base->url, merge->base->rev));
-  if (merge->mid)
-    SVN_DBG(("mid   %s@%ld\n", merge->mid->url, merge->mid->rev));
-  SVN_DBG(("right %s@%ld\n", merge->right->url, merge->right->rev));
 
   if (merge->mid)
     {

Modified: subversion/trunk/subversion/tests/cmdline/merge_symmetric_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/merge_symmetric_tests.py?rev=1348922&r1=1348921&r2=1348922&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/merge_symmetric_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/merge_symmetric_tests.py Mon Jun 11 16:02:42
2012
@@ -481,7 +481,6 @@ def merge_twice_same_direction_2(sbox):
 #   Merge to and fro
 
 @SkipUnless(server_has_mergeinfo)
-@Wimp("needs SVN_WITH_SYMMETRIC_MERGE")
 def merge_to_and_fro_1_1(sbox):
   """merge_to_and_fro_1_1"""
 
@@ -498,7 +497,6 @@ def merge_to_and_fro_1_1(sbox):
                   expect_3ways=[three_way_merge('A4', 'B7')])
 
 @SkipUnless(server_has_mergeinfo)
-@Wimp("needs SVN_WITH_SYMMETRIC_MERGE")
 def merge_to_and_fro_1_2(sbox):
   """merge_to_and_fro_1_2"""
 
@@ -542,7 +540,6 @@ def init_merge_to_and_fro_2(sbox, mod_9,
     no_op_commit(sbox)  # r10
 
 @SkipUnless(server_has_mergeinfo)
-@Wimp("needs SVN_WITH_SYMMETRIC_MERGE")
 def merge_to_and_fro_2_1(sbox):
   """merge_to_and_fro_2_1"""
 
@@ -559,7 +556,6 @@ def merge_to_and_fro_2_1(sbox):
                   expect_3ways=[three_way_merge('A7', 'B10')])
 
 @SkipUnless(server_has_mergeinfo)
-@Wimp("needs SVN_WITH_SYMMETRIC_MERGE")
 def merge_to_and_fro_2_2(sbox):
   """merge_to_and_fro_2_2"""
 
@@ -603,7 +599,6 @@ def init_merge_to_and_fro_3(sbox, mod_9,
     no_op_commit(sbox)  # r10
 
 @SkipUnless(server_has_mergeinfo)
-@Wimp("needs SVN_WITH_SYMMETRIC_MERGE")
 def merge_to_and_fro_3_1(sbox):
   """merge_to_and_fro_3_1"""
 
@@ -620,7 +615,6 @@ def merge_to_and_fro_3_1(sbox):
                   expect_3ways=[three_way_merge_no_op('B7', 'B10')])
 
 @SkipUnless(server_has_mergeinfo)
-@Wimp("needs SVN_WITH_SYMMETRIC_MERGE")
 def merge_to_and_fro_3_2(sbox):
   """merge_to_and_fro_3_2"""
 
@@ -637,7 +631,6 @@ def merge_to_and_fro_3_2(sbox):
                   expect_3ways=[three_way_merge('B7', 'B10')])
 
 @SkipUnless(server_has_mergeinfo)
-@Wimp("needs SVN_WITH_SYMMETRIC_MERGE")
 def merge_to_and_fro_4_1(sbox):
   """merge_to_and_fro_4_1"""
 
@@ -654,7 +647,6 @@ def merge_to_and_fro_4_1(sbox):
                   expect_3ways=[three_way_merge_no_op('B7', 'A10')])
 
 @SkipUnless(server_has_mergeinfo)
-@Wimp("needs SVN_WITH_SYMMETRIC_MERGE")
 def merge_to_and_fro_4_2(sbox):
   """merge_to_and_fro_4_2"""
 



Mime
View raw message