Author: danielsh
Date: Fri Jul 12 02:42:47 2013
New Revision: 1502412
URL: http://svn.apache.org/r1502412
Log:
* tools/dist/backport.pl
(handle_entry): Preemptively downgrade a warning to an info message, since
I anticipate it would otherwise false-positive the conflicts bot.
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=1502412&r1=1502411&r2=1502412&view=diff
==============================================================================
--- subversion/trunk/tools/dist/backport.pl (original)
+++ subversion/trunk/tools/dist/backport.pl Fri Jul 12 02:42:47 2013
@@ -549,7 +549,9 @@ sub handle_entry {
say STDERR "";
say STDERR $output;
} elsif (!@conflicts and $entry{depends}) {
- warn "No conflicts merging the $entry{header}, but conflicts were "
+ # Not a warning since svn-role may commit the dependency without
+ # also committing the dependent in hte same pass.
+ print "No conflicts merging $entry{id}, but conflicts were "
."expected ('Depends:' header set)\n";
} elsif (@conflicts) {
say "Conflicts found merging $entry{id}, as expected.";
