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 9E8539F68 for ; Wed, 30 May 2012 16:31:51 +0000 (UTC) Received: (qmail 871 invoked by uid 500); 30 May 2012 16:31:51 -0000 Delivered-To: apmail-subversion-commits-archive@subversion.apache.org Received: (qmail 780 invoked by uid 500); 30 May 2012 16:31: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 772 invoked by uid 99); 30 May 2012 16:31:51 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 30 May 2012 16:31: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; Wed, 30 May 2012 16:31:50 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 73F51238890B; Wed, 30 May 2012 16:31:30 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1344339 - /subversion/trunk/subversion/libsvn_client/merge.c Date: Wed, 30 May 2012 16:31:30 -0000 To: commits@subversion.apache.org From: julianfoad@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120530163130.73F51238890B@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: julianfoad Date: Wed May 30 16:31:29 2012 New Revision: 1344339 URL: http://svn.apache.org/viewvc?rev=1344339&view=rev Log: * subversion/libsvn_client/merge.c (split_mergeinfo_on_revision): Remove a redundant cast. 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=1344339&r1=1344338&r2=1344339&view=diff ============================================================================== --- subversion/trunk/subversion/libsvn_client/merge.c (original) +++ subversion/trunk/subversion/libsvn_client/merge.c Wed May 30 16:31:29 2012 @@ -841,8 +841,7 @@ split_mergeinfo_on_revision(svn_mergeinf ranges from *MERGEINFO */ if (!(*younger_mergeinfo)) *younger_mergeinfo = apr_hash_make(pool); - apr_hash_set(*younger_mergeinfo, - (const char *)merge_source_path, + apr_hash_set(*younger_mergeinfo, merge_source_path, APR_HASH_KEY_STRING, younger_rangelist); SVN_ERR(svn_mergeinfo_remove2(mergeinfo, *younger_mergeinfo, *mergeinfo, TRUE, pool, iterpool));