On Wed, Sep 8, 2021 at 4:06 PM Yann Ylavic <ylavic....@gmail.com> wrote: > > 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?
Well it looks more complicated than that, no Makefile on fresh checkout. So I borrowed the right command from tag.sh I got this v2 instead (attached, not tested..). Also we probably shouldn't put a potential failure for update-log-tags on the RM (let's not lose you this far :), so the patch is checking for update-changes only. Cheers; Yann.
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,15 @@ source `dirname $0`/common-lib.sh source `dirname $0`/env.sh detect_checkout + +# Updating the CHANGES entries should be a noop, that is still a clean checkout +# afterward (per assure_clean_checkout). The Makefile is not available at this +# point but since the update-changes target has not much dependencies we use +# Makefile.in directly with some little preparations. +touch build/rules.mk +make -f Makefile.in update-changes SVN=/usr/bin/svn top_srcdir=. top_builddir=. </dev/null +rm build/rules.mk + assure_clean_checkout detect_version $1
