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 333E47D95 for ; Tue, 13 Dec 2011 15:52:40 +0000 (UTC) Received: (qmail 19573 invoked by uid 500); 13 Dec 2011 15:52:40 -0000 Delivered-To: apmail-subversion-commits-archive@subversion.apache.org Received: (qmail 19507 invoked by uid 500); 13 Dec 2011 15:52:40 -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 19500 invoked by uid 99); 13 Dec 2011 15:52:40 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 13 Dec 2011 15:52:40 +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; Tue, 13 Dec 2011 15:52:37 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 3B6FC238889B for ; Tue, 13 Dec 2011 15:52:16 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1213748 - /subversion/trunk/tools/dist/backport.pl Date: Tue, 13 Dec 2011 15:52:16 -0000 To: commits@subversion.apache.org From: danielsh@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20111213155216.3B6FC238889B@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: danielsh Date: Tue Dec 13 15:52:15 2011 New Revision: 1213748 URL: http://svn.apache.org/viewvc?rev=1213748&view=rev Log: * tools/dist/backport.pl: Call the right function. Modified: subversion/trunk/tools/dist/backport.pl Modified: subversion/trunk/tools/dist/backport.pl URL: http://svn.apache.org/viewvc/subversion/trunk/tools/dist/backport.pl?rev=1213748&r1=1213747&r2=1213748&view=diff ============================================================================== --- subversion/trunk/tools/dist/backport.pl (original) +++ subversion/trunk/tools/dist/backport.pl Tue Dec 13 15:52:15 2011 @@ -68,7 +68,7 @@ sub merge { if ($entry{branch}) { # NOTE: This doesn't escape the branch into the pattern. - $pattern = printf '^ [*] %s branch\|Branch:\n *%s', $entry{branch}, $entry{branch}; + $pattern = sprintf '^ [*] %s branch\|Branch:\n *%s', $entry{branch}, $entry{branch}; $mergeargs = "--reintegrate $BRANCHES/$entry{branch}"; print $logmsg_fh "Reintergrate the $entry{header}:"; print $logmsg_fh "";