subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject svn commit: r1745741 - /subversion/trunk/subversion/libsvn_client/conflicts.c
Date Fri, 27 May 2016 11:08:18 GMT
Author: stsp
Date: Fri May 27 11:08:17 2016
New Revision: 1745741

URL: http://svn.apache.org/viewvc?rev=1745741&view=rev
Log:
* subversion/libsvn_client/conflicts.c
  (merge_incoming_added_dir_replace): Document a known bug.

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=1745741&r1=1745740&r2=1745741&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/conflicts.c (original)
+++ subversion/trunk/subversion/libsvn_client/conflicts.c Fri May 27 11:08:17 2016
@@ -4349,6 +4349,8 @@ merge_incoming_added_dir_replace(svn_cli
        * in the repository. */
       source1 = url;
       revision1.kind = svn_opt_revision_number;
+      /* ### Our merge logic doesn't support the merge -c ADDED_REV case.
+       * ### It errors out with 'path not found', unlike diff -c ADDED_REV. */
       if (b.added_rev == base_revision)
         revision1.value.number = b.added_rev - 1; /* merge -c ADDED_REV */
       else



Mime
View raw message