www/apache
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2026-10-23 22:49:01 +03:00
Code Activity

Consider case insensitive filessystems

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


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1879840 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Ruediger Pluem
2020-07-13 18:47:34 +00:00
parent 971fc8f5b5
commit a4ee6e97a2
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.in
View File

@@ -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}; \

10
README.CHANGES
View File

@@ -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.