Merge pull request #7575 from nicoddemus/fix-changelog-entries-releas…

…e-process
pytest-dev · Jul 29, 2020 · 4962878 · 4962878
2 parents 095bf19 + 22acbaf
commit 4962878
Show file tree

Hide file tree

Showing 13 changed files with 3 additions and 38 deletions.
diff --git a/RELEASING.rst b/RELEASING.rst
@@ -69,9 +69,9 @@ Both automatic and manual processes described above follow the same steps from t
 
        git fetch --all --prune
        git checkout origin/master -b cherry-pick-release
-       git cherry-pick --no-commit -m1 origin/MAJOR.MINOR.x
-       git checkout origin/master -- changelog
-       git commit  # no arguments
+       git cherry-pick -x -m1 origin/MAJOR.MINOR.x
+
+#. Open a PR for ``cherry-pick-release`` and merge it once CI passes. No need to wait for approvals if there were no conflicts on the previous step.
 
 #. Send an email announcement with the contents from::
 

diff --git a/changelog/5584.breaking.rst b/changelog/5584.breaking.rst
diff --git a/changelog/7389.trivial.rst b/changelog/7389.trivial.rst
diff --git a/changelog/7392.bugfix.rst b/changelog/7392.bugfix.rst
diff --git a/changelog/7422.doc.rst b/changelog/7422.doc.rst
diff --git a/changelog/7441.doc.rst b/changelog/7441.doc.rst
diff --git a/changelog/7464.feature.rst b/changelog/7464.feature.rst
diff --git a/changelog/7467.improvement.rst b/changelog/7467.improvement.rst
diff --git a/changelog/7472.breaking.rst b/changelog/7472.breaking.rst
diff --git a/changelog/7489.improvement.rst b/changelog/7489.improvement.rst
diff --git a/changelog/7491.bugfix.rst b/changelog/7491.bugfix.rst
diff --git a/changelog/7517.bugfix.rst b/changelog/7517.bugfix.rst
diff --git a/changelog/7534.bugfix.rst b/changelog/7534.bugfix.rst