subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject svn commit: r1618617 - /subversion/trunk/subversion/libsvn_client/merge.c
Date Mon, 18 Aug 2014 14:25:30 GMT
Author: stsp
Date: Mon Aug 18 14:25:29 2014
New Revision: 1618617

URL: http://svn.apache.org/r1618617
Log:
Follow-up to r1618616: fix build

* subversion/libsvn_client/merge.c
  (merge_file_opened, merge_dir_opened): Look for merge-left node kind in
   the right place.

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

Modified: subversion/trunk/subversion/libsvn_client/merge.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/merge.c?rev=1618617&r1=1618616&r2=1618617&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/merge.c (original)
+++ subversion/trunk/subversion/libsvn_client/merge.c Mon Aug 18 14:25:29 2014
@@ -1907,7 +1907,7 @@ merge_file_opened(void **new_file_baton,
           /* Update the tree conflict to store that this is a replace */
           SVN_ERR(record_tree_conflict(merge_b, local_abspath, pdb,
                                        old_tc->local_node_kind,
-                                       old_tc->merge_left_node_kind,
+                                       old_tc->src_left_version->node_kind,
                                        svn_node_file,
                                        fb->tree_conflict_action,
                                        fb->tree_conflict_reason,
@@ -2711,7 +2711,7 @@ merge_dir_opened(void **new_dir_baton,
               /* Update the tree conflict to store that this is a replace */
               SVN_ERR(record_tree_conflict(merge_b, local_abspath, pdb,
                                            old_tc->local_node_kind,
-                                           old_tc->merge_left_node_kind,
+                                           old_tc->src_left_version->node_kind,
                                            svn_node_dir,
                                            db->tree_conflict_action,
                                            db->tree_conflict_reason,



Mime
View raw message