subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject svn commit: r1762885 - /subversion/branches/resolve-incoming-add/subversion/libsvn_client/conflicts.c
Date Fri, 30 Sep 2016 11:36:59 GMT
Author: stsp
Date: Fri Sep 30 11:36:58 2016
New Revision: 1762885

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

* subversion/libsvn_client/conflicts.c
  (diff_dir_added): Skip adding the root of the added tree itself.
   The tree's root directory already exists in the working copy.

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=1762885&r1=1762884&r2=1762885&view=diff
==============================================================================
--- subversion/branches/resolve-incoming-add/subversion/libsvn_client/conflicts.c (original)
+++ subversion/branches/resolve-incoming-add/subversion/libsvn_client/conflicts.c Fri Sep
30 11:36:58 2016
@@ -5517,6 +5517,10 @@ diff_dir_added(const char *relpath,
   svn_node_kind_t db_kind;
   svn_node_kind_t on_disk_kind;
 
+  /* Skip adding the root of the added directory tree itself. */
+  if (relpath[0] == '\0')
+    return SVN_NO_ERROR;
+
   local_abspath = svn_dirent_join(b->target_abspath, relpath, scratch_pool);
 
   SVN_ERR(svn_wc_read_kind2(&db_kind, b->ctx->wc_ctx, local_abspath,



Mime
View raw message