diff options
| author | Vincent Laporte | 2019-05-06 13:08:14 +0000 |
|---|---|---|
| committer | Vincent Laporte | 2019-05-06 13:08:14 +0000 |
| commit | 1a670a23ad54cf5a3c2d2bbf4939f78f4f4b6b35 (patch) | |
| tree | 81288272de52b007499b1d8d5933aad508c1660a /dev | |
| parent | 6ff10c569c1684927d4cb866a159fe6f54e55abe (diff) | |
| parent | 50b148154fada66bb1145aaba696d9b427511592 (diff) | |
Merge PR #9964: Unreleased changelog folder
Ack-by: SkySkimmer
Ack-by: Zimmi48
Reviewed-by: gares
Reviewed-by: vbgl
Diffstat (limited to 'dev')
| -rwxr-xr-x | dev/build/windows/makecoq_mingw.sh | 1 | ||||
| -rw-r--r-- | dev/doc/MERGING.md | 5 |
2 files changed, 3 insertions, 3 deletions
diff --git a/dev/build/windows/makecoq_mingw.sh b/dev/build/windows/makecoq_mingw.sh index 4c5bd29236..ea9af60330 100755 --- a/dev/build/windows/makecoq_mingw.sh +++ b/dev/build/windows/makecoq_mingw.sh @@ -1316,7 +1316,6 @@ function copy_coq_license { # FIXME: this is not the micromega license # It only applies to code that was copied into one single file! install -D README.md "$PREFIXCOQ/license_readme/coq/ReadMe.md" - install -D CHANGES.md "$PREFIXCOQ/license_readme/coq/Changes.md" install -D INSTALL "$PREFIXCOQ/license_readme/coq/Install.txt" install -D doc/README.md "$PREFIXCOQ/license_readme/coq/ReadMeDoc.md" || true fi diff --git a/dev/doc/MERGING.md b/dev/doc/MERGING.md index 3f1b470878..c9eceb1270 100644 --- a/dev/doc/MERGING.md +++ b/dev/doc/MERGING.md @@ -71,8 +71,9 @@ those external projects should have been prepared (cf. the relevant sub-section in the [CI README](../ci/README.md#Breaking-changes) and the PR can be tested with these fixes thanks to ["overlays"](../ci/user-overlays/README.md). -Moreover the PR must absolutely update the [`CHANGES.md`](../../CHANGES.md) or -the [`dev/doc/changes.md`](changes.md) file. +Moreover the PR author *must* add an entry to the [unreleased +changelog](../../doc/changelog/README.md) or to the +[`dev/doc/changes.md`](changes.md) file. If overlays are missing, ask the author to prepare them and label the PR with the [needs: overlay](https://github.com/coq/coq/labels/needs%3A%20overlay) label. |