Author: danielsh
Date: Sat Feb 21 00:32:12 2015
New Revision: 1661257
URL: http://svn.apache.org/r1661257
Log:
Follow-up to r1661250:
* tools/dist/backport.pl
(backport_usage): Also document the exclusion mechanism of 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=1661257&r1=1661256&r2=1661257&view=diff
==============================================================================
--- subversion/trunk/tools/dist/backport.pl (original)
+++ subversion/trunk/tools/dist/backport.pl Sat Feb 21 00:32:12 2015
@@ -194,6 +194,11 @@ undefined. In this mode, the script wil
(including unapproved and vetoed ones), and complain to stderr if the merge
failed due to a conflict. This mode never commits anything.
+The hourly conflicts detector bot turns red if any entry produced a merge
+conflict. When entry A depends on entry B for a clean merge, put a "Depends:"
+header on entry A to instruct the bot not to turn red due to A. (The header
+is not parsed; only its presence or absence matters.)
+
Both batch modes also perform a basic sanity-check on entries that declare
backport branches (via the "Branch:" header): if a backport branch is used, but
at least one of the revisions enumerated in the entry title had not been merged
