Return-Path: X-Original-To: apmail-subversion-commits-archive@minotaur.apache.org Delivered-To: apmail-subversion-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id BABAA11FA8 for ; Mon, 18 Aug 2014 14:25:51 +0000 (UTC) Received: (qmail 58435 invoked by uid 500); 18 Aug 2014 14:25:51 -0000 Delivered-To: apmail-subversion-commits-archive@subversion.apache.org Received: (qmail 58404 invoked by uid 500); 18 Aug 2014 14:25:51 -0000 Mailing-List: contact commits-help@subversion.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@subversion.apache.org Delivered-To: mailing list commits@subversion.apache.org Received: (qmail 58394 invoked by uid 99); 18 Aug 2014 14:25:51 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 18 Aug 2014 14:25:51 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 18 Aug 2014 14:25:50 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 627BB23889D5; Mon, 18 Aug 2014 14:25:30 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1618617 - /subversion/trunk/subversion/libsvn_client/merge.c Date: Mon, 18 Aug 2014 14:25:30 -0000 To: commits@subversion.apache.org From: stsp@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20140818142530.627BB23889D5@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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,