subversion-commits mailing list archives

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

URL: http://svn.apache.org/viewvc?rev=1764254&view=rev
Log:
On the resolve-incoming-add branch:

* subversion/libsvn_client/conflicts.c
  (diff_dir_added): 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=1764254&r1=1764253&r2=1764254&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 14:27:25 2016
@@ -5675,8 +5675,6 @@ diff_dir_added(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_none && db_kind != svn_node_unknown)
     {
@@ -5705,12 +5703,6 @@ diff_dir_added(const char *relpath,
       return SVN_NO_ERROR;
     }
 
-  if (copyfrom_source)
-    SVN_DBG(("%s: copyfrom source: %s@%lu\n", __func__,
-      copyfrom_source->repos_relpath, copyfrom_source->revision));
-  SVN_DBG(("%s: right source: %s@%lu\n", __func__,
-    right_source->repos_relpath, right_source->revision));
-
   SVN_ERR(svn_io_dir_make(local_abspath, APR_OS_DEFAULT, scratch_pool));
   copyfrom_url = apr_pstrcat(scratch_pool, b->repos_root_url, "/",
                              right_source->repos_relpath, SVN_VA_NULL);



Mime
View raw message