You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by da...@apache.org on 2011/12/13 16:52:16 UTC
svn commit: r1213748 - /subversion/trunk/tools/dist/backport.pl
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 "";