Author: stsp
Date: Wed Oct 12 10:33:08 2016
New Revision: 1764434

URL: http://svn.apache.org/viewvc?rev=1764434&view=rev
Log:
Don't flag an unnecessary tree conflict while resolving 'add vs add'.

* subversion/libsvn_client/conflicts.c
  (diff_dir_added): If a subdirectory already exists then just merge the
   incoming properties and return.

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

Modified: subversion/trunk/subversion/libsvn_client/conflicts.c
URL: 
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/conflicts.c?rev=1764434&r1=1764433&r2=1764434&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/conflicts.c (original)
+++ subversion/trunk/subversion/libsvn_client/conflicts.c Wed Oct 12 10:33:08 
2016
@@ -5692,6 +5692,17 @@ diff_dir_added(const char *relpath,
                             FALSE, FALSE, scratch_pool));
   SVN_ERR(svn_io_check_path(local_abspath, &on_disk_kind, scratch_pool));
 
+  if (db_kind == svn_node_dir && on_disk_kind == svn_node_dir)
+    {
+      SVN_ERR(merge_added_dir_props(svn_dirent_join(b->target_abspath, relpath,
+                                                    scratch_pool),
+                                    b->added_repos_relpath, right_props,
+                                    b->repos_root_url, b->repos_uuid,
+                                    b->merge_left_rev, b->merge_right_rev,
+                                    b->ctx, scratch_pool));
+      return SVN_NO_ERROR;
+    }
+
   if (db_kind != svn_node_none && db_kind != svn_node_unknown)
     {
       SVN_ERR(raise_tree_conflict(


Reply via email to