From commits-return-26701-apmail-subversion-commits-archive=subversion.apache.org@subversion.apache.org Thu Jan 31 19:25:41 2013 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 EE1ABECCC for ; Thu, 31 Jan 2013 19:25:41 +0000 (UTC) Received: (qmail 95809 invoked by uid 500); 31 Jan 2013 19:25:41 -0000 Delivered-To: apmail-subversion-commits-archive@subversion.apache.org Received: (qmail 95787 invoked by uid 500); 31 Jan 2013 19:25:41 -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 95780 invoked by uid 99); 31 Jan 2013 19:25:41 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 31 Jan 2013 19:25:41 +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; Thu, 31 Jan 2013 19:25:40 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id CBE362388A38; Thu, 31 Jan 2013 19:25:21 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1441153 - /subversion/trunk/subversion/libsvn_client/merge.c Date: Thu, 31 Jan 2013 19:25:21 -0000 To: commits@subversion.apache.org From: rhuijben@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130131192521.CBE362388A38@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: rhuijben Date: Thu Jan 31 19:25:21 2013 New Revision: 1441153 URL: http://svn.apache.org/viewvc?rev=1441153&view=rev Log: * subversion/libsvn_client/merge.c (do_merge): Revert accidental change in r1441143. 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=1441153&r1=1441152&r2=1441153&view=diff ============================================================================== --- subversion/trunk/subversion/libsvn_client/merge.c (original) +++ subversion/trunk/subversion/libsvn_client/merge.c Thu Jan 31 19:25:21 2013 @@ -9563,6 +9563,9 @@ do_merge(apr_hash_t **modified_subtrees, *modified_subtrees = apr_hash_overlay(result_pool, *modified_subtrees, merge_cmd_baton.skipped_abspaths); + *modified_subtrees = + apr_hash_overlay(result_pool, *modified_subtrees, + merge_cmd_baton.tree_conflicted_abspaths); } }