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/08 16:30:36 UTC
svn commit: r1500764 - /subversion/trunk/tools/dist/backport.pl
Author: danielsh
Date: Mon Jul 8 14:30:36 2013
New Revision: 1500764
URL: http://svn.apache.org/r1500764
Log:
backport.pl: Don't require a dependency when it is not required.
Found by: stefan2
* tools/dist/backport.pl
(main): Relax the check for Vim's presence.
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=1500764&r1=1500763&r2=1500764&view=diff
==============================================================================
--- subversion/trunk/tools/dist/backport.pl (original)
+++ subversion/trunk/tools/dist/backport.pl Mon Jul 8 14:30:36 2013
@@ -568,8 +568,8 @@ sub main {
open STATUS, "<", $STATUS or (usage, exit 1);
# Because we use the ':normal' command in Vim...
- die "A vim with the +ex_extra feature is required"
- if `${VIM} --version` !~ /[+]ex_extra/;
+ die "A vim with the +ex_extra feature is required for \$MAY_COMMIT mode"
+ if $MAY_COMMIT eq 'true' and `${VIM} --version` !~ /[+]ex_extra/;
# ### TODO: need to run 'revert' here
# ### TODO: both here and in merge(), unlink files that previous merges added