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 104137C60 for ; Mon, 21 Nov 2011 11:28:53 +0000 (UTC) Received: (qmail 79353 invoked by uid 500); 21 Nov 2011 11:28:53 -0000 Delivered-To: apmail-subversion-commits-archive@subversion.apache.org Received: (qmail 79314 invoked by uid 500); 21 Nov 2011 11:28:52 -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 79307 invoked by uid 99); 21 Nov 2011 11:28:52 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 21 Nov 2011 11:28:52 +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, 21 Nov 2011 11:28:49 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id C7FE22388978 for ; Mon, 21 Nov 2011 11:28:28 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1204452 - /subversion/trunk/subversion/libsvn_client/merge.c Date: Mon, 21 Nov 2011 11:28:28 -0000 To: commits@subversion.apache.org From: julianfoad@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20111121112828.C7FE22388978@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: julianfoad Date: Mon Nov 21 11:28:28 2011 New Revision: 1204452 URL: http://svn.apache.org/viewvc?rev=1204452&view=rev Log: * subversion/libsvn_client/merge.c: (do_file_merge): Move some variables to a smaller scope. 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=1204452&r1=1204451&r2=1204452&view=diff ============================================================================== --- subversion/trunk/subversion/libsvn_client/merge.c (original) +++ subversion/trunk/subversion/libsvn_client/merge.c Mon Nov 21 11:28:28 2011 @@ -6722,11 +6722,7 @@ do_file_merge(svn_mergeinfo_catalog_t re merge_cmd_baton_t *merge_b, apr_pool_t *scratch_pool) { - apr_hash_t *props1, *props2; - const char *tmpfile1, *tmpfile2; - const char *mimetype1, *mimetype2; - svn_string_t *pval; - apr_array_header_t *propchanges, *remaining_ranges; + apr_array_header_t *remaining_ranges; svn_wc_notify_state_t prop_state = svn_wc_notify_state_unknown; svn_wc_notify_state_t text_state = svn_wc_notify_state_unknown; svn_boolean_t tree_conflicted = FALSE; @@ -6846,15 +6842,16 @@ do_file_merge(svn_mergeinfo_catalog_t re for (i = 0; i < ranges_to_merge->nelts; i++) { + svn_merge_range_t *r = APR_ARRAY_IDX(ranges_to_merge, i, + svn_merge_range_t *); svn_wc_notify_t *n; svn_boolean_t header_sent = FALSE; svn_ra_session_t *ra_session1, *ra_session2; - - /* When using this merge range, account for the exclusivity of - its low value (which is indicated by this operation being a - merge vs. revert). */ - svn_merge_range_t *r = APR_ARRAY_IDX(ranges_to_merge, i, - svn_merge_range_t *); + const char *tmpfile1, *tmpfile2; + apr_hash_t *props1, *props2; + svn_string_t *pval; + const char *mimetype1, *mimetype2; + apr_array_header_t *propchanges; svn_pool_clear(iterpool); @@ -6917,33 +6914,27 @@ do_file_merge(svn_mergeinfo_catalog_t re SVN_ERR(merge_file_deleted(&text_state, &tree_conflicted, target_relpath, - tmpfile1, - tmpfile2, + tmpfile1, tmpfile2, mimetype1, mimetype2, props1, - merge_b, - iterpool)); + merge_b, iterpool)); single_file_merge_notify(notify_b, target_relpath, tree_conflicted ? svn_wc_notify_tree_conflict : svn_wc_notify_update_delete, - text_state, - svn_wc_notify_state_unknown, + text_state, svn_wc_notify_state_unknown, n, &header_sent, iterpool); /* ...plus add... */ SVN_ERR(merge_file_added(&text_state, &prop_state, &tree_conflicted, target_relpath, - tmpfile1, - tmpfile2, - r->start, - r->end, + tmpfile1, tmpfile2, + r->start, r->end, mimetype1, mimetype2, NULL, SVN_INVALID_REVNUM, propchanges, props1, - merge_b, - iterpool)); + merge_b, iterpool)); single_file_merge_notify(notify_b, target_relpath, tree_conflicted ? svn_wc_notify_tree_conflict @@ -6957,14 +6948,11 @@ do_file_merge(svn_mergeinfo_catalog_t re SVN_ERR(merge_file_changed(&text_state, &prop_state, &tree_conflicted, target_relpath, - tmpfile1, - tmpfile2, - r->start, - r->end, + tmpfile1, tmpfile2, + r->start, r->end, mimetype1, mimetype2, propchanges, props1, - merge_b, - iterpool)); + merge_b, iterpool)); single_file_merge_notify(notify_b, target_relpath, tree_conflicted ? svn_wc_notify_tree_conflict