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 2014/04/24 22:34:46 UTC

svn commit: r1589871 - /subversion/trunk/tools/dist/backport.pl

Author: danielsh
Date: Thu Apr 24 20:34:46 2014
New Revision: 1589871

URL: http://svn.apache.org/r1589871
Log:
backport.pl: Forcefully disable "run merges and commit them" mode.

* tools/dist/backport.pl
  ($MAY_COMMIT / svn-role mode): Bail out if this mode was requested.

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=1589871&r1=1589870&r2=1589871&view=diff
==============================================================================
--- subversion/trunk/tools/dist/backport.pl (original)
+++ subversion/trunk/tools/dist/backport.pl Thu Apr 24 20:34:46 2014
@@ -1076,6 +1076,12 @@ sub nominate_main {
 }
 
 # Dispatch to the appropriate main().
+die "svn-role mode is broken when there are >=2 entries in Approved; ".
+    "see <http://mail-archives.apache.org/mod_mbox/subversion-dev/201404.mbox/%3C20140417111215.GB1802@tarsus.local2%3E> ".
+    "and <http://mail-archives.apache.org/mod_mbox/subversion-dev/201404.mbox/%3C8738h36mwh.fsf@ntlworld.com%3E> ".
+    "for details."
+    if $MAY_COMMIT;
+
 given (basename($0)) {
   when (/^b$|backport/) {
     chdir dirname $0 or die "Can't chdir: $!" if /^b$/;