svn commit: r1879840 - in /httpd/httpd/trunk: Makefile.in README.CHANGES changes-entries/ changes.new/

[rp...@apache.org]

Author: rpluem
Date: Mon Jul 13 18:47:34 2020
New Revision: 1879840

URL: http://svn.apache.org/viewvc?rev=1879840&view=rev
Log:
Consider case insensitive filessystems

Consider case insensitive filessystems and thus choose a new non conflicting
name for the directory to store CHANGES entries.

Added:
    httpd/httpd/trunk/changes-entries/
      - copied from r1879839, httpd/httpd/trunk/changes.new/
Removed:
    httpd/httpd/trunk/changes.new/
Modified:
    httpd/httpd/trunk/Makefile.in
    httpd/httpd/trunk/README.CHANGES

Modified: httpd/httpd/trunk/Makefile.in
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/Makefile.in?rev=1879840&r1=1879839&r2=1879840&view=diff
==============================================================================
--- httpd/httpd/trunk/Makefile.in (original)
+++ httpd/httpd/trunk/Makefile.in Mon Jul 13 18:47:34 2020
@@ -167,7 +167,7 @@ docs:
 	fi
 
 update-changes:
-	@for i in `find changes -type f`; do \
+	@for i in `find changes-entries -type f`; do \
 	    cp CHANGES CHANGES.tmp ; \
 	    awk -vfname=$$i 'BEGIN{done = 0} \
 	                    done == 0 && /^Changes with Apache /{ active = 1; print; next}; \

Modified: httpd/httpd/trunk/README.CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/README.CHANGES?rev=1879840&r1=1879839&r2=1879840&view=diff
==============================================================================
--- httpd/httpd/trunk/README.CHANGES (original)
+++ httpd/httpd/trunk/README.CHANGES Mon Jul 13 18:47:34 2020
@@ -1,17 +1,19 @@
 Changes can be documented in two ways now: Either by directly editing the
 CHANGES file like it was done until now or by storing each entry for the
-CHANGES file correctly formated in a separate file in the "changes" directory.
+CHANGES file correctly formated in a separate file in the changes-entries
+directory.
 
 The benefit of the single file per change approach is that it eases backporting
 the CHANGES entry to a stable branch as it avoids the frequent merge conflicts
 as changes are merged in different orders or not at all in the stable branch.
 
 In order to keep the current CHANGES file for the users as is there is a new
-make target called 'update-changes'. It merges all change files in the changes
-directory to the top of the CHANGES file and removes them afterwards.
+make target called 'update-changes'. It merges all change files in the
+changes-entries directory to the top of the CHANGES file and removes them
+afterwards.
 
 This make target can be seen in a similar way as the scripts to update the
 documentation files from its xml sources. It can be executed immediately
-after the new file in the changes directory has been created / merged
+after the new file in the changes-entries directory has been created / merged
 and committed or it can executed later. It should be executed at least before
 a release gets tagged.