svn commit: r1892854 - /httpd/dev-tools/v2/make-candidate.sh

[ic...@apache.org]

Author: icing
Date: Fri Sep  3 11:39:35 2021
New Revision: 1892854

URL: http://svn.apache.org/viewvc?rev=1892854&view=rev
Log:
 * make-candidate.sh: ask on changes-entries not empty
 * make-candidate.sh: ask on release candidate tag already there

Modified:
    httpd/dev-tools/v2/make-candidate.sh

Modified: httpd/dev-tools/v2/make-candidate.sh
URL: http://svn.apache.org/viewvc/httpd/dev-tools/v2/make-candidate.sh?rev=1892854&r1=1892853&r2=1892854&view=diff
==============================================================================
--- httpd/dev-tools/v2/make-candidate.sh (original)
+++ httpd/dev-tools/v2/make-candidate.sh Fri Sep  3 11:39:35 2021
@@ -73,13 +73,18 @@ fi
 
 if test -d changes-entries; then
   if test "$(ls -A changes-entries)"; then
-    warn "the 'changes-entries' directory should be empty."\
-      "Run 'make update-changes' and commit changes."
+    warn "the 'changes-entries' directory should be empty."
+    if ! ask_yes_no "Do you want to continue anyway?"; then
+      exit 1
+    fi
   fi
 fi
 
 if svn ls "$SVN_BASE/$SVN_DEST" >/dev/null 2>&1; then
   warn "release candidate tag already exists at $SVN_DEST"
+  if ! ask_yes_no "Do you want to continue anyway?"; then
+    exit 1
+  fi
 else
   echo "creating candidate tag: $SVN_DEST"
   svn cp -m "Tag $SVN_SRC@$SVN_REV as $VERSION" "$SVN_BASE/$SVN_SRC@$SVN_REV" "$SVN_BASE/$SVN_DEST"