subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject svn commit: r1764276 - /subversion/branches/resolve-incoming-add/subversion/libsvn_client/conflicts.c
Date Tue, 11 Oct 2016 15:58:14 GMT
Author: stsp
Date: Tue Oct 11 15:58:13 2016
New Revision: 1764276

URL: http://svn.apache.org/viewvc?rev=1764276&view=rev
Log:
On the 'resolve-incoming-add' branch: Make an XFAIL test PASS.

* subversion/libsvn_client/conflicts.c
  (diff_dir_changed, diff_dir_deleted, diff_file_changed,
   diff_file_deleted): Remove SVN_DBG calls.
  

Modified:
    subversion/branches/resolve-incoming-add/subversion/libsvn_client/conflicts.c

Modified: subversion/branches/resolve-incoming-add/subversion/libsvn_client/conflicts.c
URL: http://svn.apache.org/viewvc/subversion/branches/resolve-incoming-add/subversion/libsvn_client/conflicts.c?rev=1764276&r1=1764275&r2=1764276&view=diff
==============================================================================
--- subversion/branches/resolve-incoming-add/subversion/libsvn_client/conflicts.c (original)
+++ subversion/branches/resolve-incoming-add/subversion/libsvn_client/conflicts.c Tue Oct
11 15:58:13 2016
@@ -5752,8 +5752,6 @@ diff_dir_changed(const char *relpath,
   SVN_ERR(svn_wc_read_kind2(&db_kind, b->ctx->wc_ctx, local_abspath,
                             FALSE, FALSE, scratch_pool));
   SVN_ERR(svn_io_check_path(local_abspath, &on_disk_kind, scratch_pool));
-  SVN_DBG(("%s: %s (db: %s / disk: %s)\n", __func__, relpath,
-      svn_node_kind_to_word(db_kind), svn_node_kind_to_word(on_disk_kind)));
 
   if (db_kind != svn_node_dir)
     {
@@ -5794,11 +5792,6 @@ diff_dir_changed(const char *relpath,
       return SVN_NO_ERROR;
     }
 
-  SVN_DBG(("%s: left source: %s@%lu\n", __func__,
-    left_source->repos_relpath, left_source->revision));
-  SVN_DBG(("%s: right source: %s@%lu\n", __func__,
-    right_source->repos_relpath, right_source->revision));
-
   return SVN_NO_ERROR;
 }
 
@@ -5821,8 +5814,6 @@ diff_dir_deleted(const char *relpath,
   SVN_ERR(svn_wc_read_kind2(&db_kind, b->ctx->wc_ctx, local_abspath,
                             FALSE, FALSE, scratch_pool));
   SVN_ERR(svn_io_check_path(local_abspath, &on_disk_kind, scratch_pool));
-  SVN_DBG(("%s: %s (db: %s / disk: %s)\n", __func__, relpath,
-      svn_node_kind_to_word(db_kind), svn_node_kind_to_word(on_disk_kind)));
 
   if (db_kind != svn_node_dir)
     {
@@ -5871,9 +5862,6 @@ diff_dir_deleted(const char *relpath,
       return SVN_NO_ERROR;
     }
 
-  SVN_DBG(("%s: left source: %s@%lu\n", __func__,
-    left_source->repos_relpath, left_source->revision));
-
   return SVN_NO_ERROR;
 }
 
@@ -5967,8 +5955,6 @@ diff_file_changed(const char *relpath,
 
   SVN_ERR(svn_wc_read_kind2(&db_kind, b->ctx->wc_ctx, local_abspath,
                             FALSE, FALSE, scratch_pool));
-  SVN_DBG(("%s: %s (db: %s / disk: %s)\n", __func__, relpath,
-      svn_node_kind_to_word(db_kind), svn_node_kind_to_word(on_disk_kind)));
   SVN_ERR(svn_io_check_path(local_abspath, &on_disk_kind, scratch_pool));
 
   if (db_kind != svn_node_file)
@@ -6010,12 +5996,6 @@ diff_file_changed(const char *relpath,
       return SVN_NO_ERROR;
     }
 
-  SVN_DBG(("%s: left source: %s@%lu\n", __func__,
-    left_source->repos_relpath, left_source->revision));
-  SVN_DBG(("%s: right source: %s@%lu\n", __func__,
-    right_source->repos_relpath, right_source->revision));
-  SVN_DBG(("%s: right file: %s\n", __func__, right_file));
-
   return SVN_NO_ERROR;
 }
 
@@ -6039,8 +6019,6 @@ diff_file_deleted(const char *relpath,
   SVN_ERR(svn_wc_read_kind2(&db_kind, b->ctx->wc_ctx, local_abspath,
                             FALSE, FALSE, scratch_pool));
   SVN_ERR(svn_io_check_path(local_abspath, &on_disk_kind, scratch_pool));
-  SVN_DBG(("%s: %s (db: %s / disk: %s)\n", __func__, relpath,
-      svn_node_kind_to_word(db_kind), svn_node_kind_to_word(on_disk_kind)));
 
   if (db_kind != svn_node_file)
     {
@@ -6089,9 +6067,6 @@ diff_file_deleted(const char *relpath,
       return SVN_NO_ERROR;
     }
 
-  SVN_DBG(("%s: left source: %s@%lu\n", __func__,
-    left_source->repos_relpath, left_source->revision));
-
   return SVN_NO_ERROR;
 }
 



Mime
View raw message