On Wed, Sep 8, 2021 at 3:23 PM Yann Ylavic <ylavic....@gmail.com> wrote:
>
> On Wed, Sep 8, 2021 at 3:00 PM <ic...@apache.org> wrote:
> >
> > Author: icing
> > Date: Wed Sep  8 13:00:17 2021
> > New Revision: 1893136
> >
> > URL: http://svn.apache.org/viewvc?rev=1893136&view=rev
> > Log:
> > Tag branches/2.4.x@1893131 as 2.4.49-rc1
> >
> > Added:
> >     httpd/httpd/tags/candidate-2.4.49-rc1/   (props changed)
> >       - copied from r1893131, httpd/httpd/branches/2.4.x/
>
> Maybe the script should bail out if `make update-log-tags
> update-changes` would do anything?

Something like the attached patch maybe?
Index: dev-tools/release/r0-make-candidate.sh
===================================================================
--- dev-tools/release/r0-make-candidate.sh	(revision 1893144)
+++ dev-tools/release/r0-make-candidate.sh	(working copy)
@@ -45,6 +45,8 @@ source `dirname $0`/common-lib.sh
 source `dirname $0`/env.sh
 
 detect_checkout
+# Updating the CHANGES entries and log tags should be a noop (i.e. still a clean checkout afterward)
+make update-changes update-log-tags </dev/null || fail "unable to make update-changes update-log-tags"
 assure_clean_checkout
 detect_version $1
 

Reply via email to