subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject svn commit: r1771728 - /subversion/trunk/subversion/libsvn_client/conflicts.c
Date Mon, 28 Nov 2016 12:30:23 GMT
Author: stsp
Date: Mon Nov 28 12:30:23 2016
New Revision: 1771728

URL: http://svn.apache.org/viewvc?rev=1771728&view=rev
Log:
* subversion/libsvn_client/conflicts.c
  (resolve_incoming_move_file_text_merge): Remove comment obsoleted by r1771722.

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=1771728&r1=1771727&r2=1771728&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/conflicts.c (original)
+++ subversion/trunk/subversion/libsvn_client/conflicts.c Mon Nov 28 12:30:23 2016
@@ -7017,10 +7017,6 @@ resolve_incoming_move_file_text_merge(sv
    *  ### Need to fix what we pass as "right_abspath" here, as svn_wc_merge5()
    *  ### expects to see the fulltext in repository-normal form (linefeeds,
    *  ### with keywords contracted).
-   *
-   *  ### And I think we also need to patch up what we pass as original_props,
-   *  ### so that conflicting properties would actually produce a conflict.
-   *  ### See what resolve_local_move_file_merge() does.
    */
   err = svn_wc_merge5(&merge_content_outcome, &merge_props_outcome,
                       ctx->wc_ctx, ancestor_abspath,



Mime
View raw message