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 2C824C38D for ; Sat, 6 Jul 2013 15:25:08 +0000 (UTC) Received: (qmail 65382 invoked by uid 500); 6 Jul 2013 15:25:06 -0000 Delivered-To: apmail-subversion-commits-archive@subversion.apache.org Received: (qmail 65350 invoked by uid 500); 6 Jul 2013 15:25:06 -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 65343 invoked by uid 99); 6 Jul 2013 15:25:05 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 06 Jul 2013 15:25:05 +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; Sat, 06 Jul 2013 15:25:04 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 7FD6E23888D7; Sat, 6 Jul 2013 15:24:44 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1500296 - /subversion/trunk/tools/dist/backport.pl Date: Sat, 06 Jul 2013 15:24:44 -0000 To: commits@subversion.apache.org From: danielsh@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20130706152444.7FD6E23888D7@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: danielsh Date: Sat Jul 6 15:24:43 2013 New Revision: 1500296 URL: http://svn.apache.org/r1500296 Log: backport.pl: warn of local mods to STATUS in interactive mode. This matters for the "Enter votes" workflow. * tools/dist/backport.pl (prompt): Grow dontprint parameter. (main): Warn of local STATUS mods in interactive mode. 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=1500296&r1=1500295&r2=1500296&view=diff ============================================================================== --- subversion/trunk/tools/dist/backport.pl (original) +++ subversion/trunk/tools/dist/backport.pl Sat Jul 6 15:24:43 2013 @@ -117,7 +117,7 @@ sub prompt { die "$0: called prompt() in non-interactive mode!" if $YES; my $answer = $getchar->(); $answer .= $getchar->() if exists $args{extra} and $answer =~ $args{extra}; - say ""; + say "" unless $args{dontprint}; return $args{verbose} ? $answer : ($answer =~ /^y/i) ? 1 : 0; @@ -509,7 +509,12 @@ sub main { # ### TODO: both here and in merge(), unlink files that previous merges added # When running from cron, there shouldn't be local mods. (For interactive # usage, we preserve local mods to STATUS.) - die "Local mods to STATUS file $STATUS" if $YES and `$SVN status -q $STATUS`; + if (`$SVN status -q $STATUS`) { + die "Local mods to STATUS file $STATUS" if $YES; + warn "Local mods to STATUS file $STATUS"; + system $SVN, qw/diff --/, $STATUS; + prompt "Press the 'any' key to continue...\n", dontprint => 1; + } # Skip most of the file $/ = ""; # paragraph mode