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 2013/07/03 23:56:59 UTC
svn commit: r1499573 - /subversion/trunk/tools/dist/backport.pl
Author: danielsh
Date: Wed Jul 3 21:56:59 2013
New Revision: 1499573
URL: http://svn.apache.org/r1499573
Log:
* tools/dist/backport.pl: Indentation changes only.
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=1499573&r1=1499572&r2=1499573&view=diff
==============================================================================
--- subversion/trunk/tools/dist/backport.pl (original)
+++ subversion/trunk/tools/dist/backport.pl Wed Jul 3 21:56:59 2013
@@ -357,35 +357,36 @@ sub handle_entry {
print "";
print "Vetoes found!" if @vetoes;
- given (prompt 'Go ahead? [y,±1,±0,q,e,N]', verbose => 1, extra => qr/[+-]/) {
- when (/^y/i) {
- merge %entry;
- MAYBE_DIFF: while (1) {
- given (prompt "Shall I open a subshell? [ydN]", verbose => 1) {
- when (/^y/i) {
- system($ENV{SHELL} // "/bin/sh") == 0
- or warn "Creating an interactive subshell failed ($?): $!"
- }
- when (/^d/) {
- system($SVN, 'diff') == 0
- or warn "diff failed ($?): $!";
- next;
+ given (prompt 'Go ahead? [y,±1,±0,q,e,N]',
+ verbose => 1, extra => qr/[+-]/) {
+ when (/^y/i) {
+ merge %entry;
+ MAYBE_DIFF: while (1) {
+ given (prompt "Shall I open a subshell? [ydN]", verbose => 1) {
+ when (/^y/i) {
+ system($ENV{SHELL} // "/bin/sh") == 0
+ or warn "Creating an interactive subshell failed ($?): $!"
+ }
+ when (/^d/) {
+ system($SVN, 'diff') == 0
+ or warn "diff failed ($?): $!";
+ next;
+ }
}
+ last;
}
- last;
+ # Don't revert. The next merge() call will do that anyway, or maybe
+ # the user did in his interactive shell.
+ }
+ when (/^q/i) {
+ exit_stage_left $votes;
+ }
+ when (/^([+-][01])\s*$/i) {
+ $votes->{$.} = [$1, \%entry];
+ }
+ when (/^e/i) {
+ $votes->{$.} = ['edit', \%entry];
}
- # Don't revert. The next merge() call will do that anyway, or maybe the
- # user did in his interactive shell.
- }
- when (/^q/i) {
- exit_stage_left $votes;
- }
- when (/^([+-][01])\s*$/i) {
- $votes->{$.} = [$1, \%entry];
- }
- when (/^e/i) {
- $votes->{$.} = ['edit', \%entry];
- }
}
}