subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject svn commit: r1771334 - /subversion/trunk/subversion/libsvn_wc/wc_db_update_move.c
Date Fri, 25 Nov 2016 15:58:05 GMT
Author: stsp
Date: Fri Nov 25 15:58:05 2016
New Revision: 1771334

URL: http://svn.apache.org/viewvc?rev=1771334&view=rev
Log:
* subversion/libsvn_wc/wc_db_update_move.c
  (update_incoming_moved_node): Pass the original node kind to the 'add file'
   function so that replacements get reported accurately (before this change,
   the resolver always reported a replacement, even for normal adds).

Modified:
    subversion/trunk/subversion/libsvn_wc/wc_db_update_move.c

Modified: subversion/trunk/subversion/libsvn_wc/wc_db_update_move.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/wc_db_update_move.c?rev=1771334&r1=1771333&r2=1771334&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc_db_update_move.c (original)
+++ subversion/trunk/subversion/libsvn_wc/wc_db_update_move.c Fri Nov 25 15:58:05 2016
@@ -2323,7 +2323,7 @@ update_incoming_moved_node(node_move_bat
           SVN_ERR(svn_stream_copy3(working_stream, temp_stream, NULL, NULL,
                                    scratch_pool));
 
-          SVN_ERR(tc_editor_incoming_add_file(nmb, dst_relpath, working_kind,
+          SVN_ERR(tc_editor_incoming_add_file(nmb, dst_relpath, orig_kind,
                                               working_checksum, working_props,
                                               victim_relpath, temp_abspath,
                                               scratch_pool));



Mime
View raw message