diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2018-11-30 13:07:40 +0200 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2018-11-30 13:07:40 +0200 |
| commit | cc3ad9a3d1b278852336265e0505e82cc5453778 (patch) | |
| tree | e547404991872b3519088edda16d13b2d378c838 /CONTRIBUTE | |
| parent | a89dbe2af8a8a23e07c1e5cb988f067fe08111d9 (diff) | |
| download | emacs-cc3ad9a3d1b278852336265e0505e82cc5453778.tar.gz | |
; * CONTRIBUTE: Clarify rules for committing to release branches.
Diffstat (limited to 'CONTRIBUTE')
| -rw-r--r-- | CONTRIBUTE | 26 |
1 files changed, 17 insertions, 9 deletions
diff --git a/CONTRIBUTE b/CONTRIBUTE index 0b68052a0cd..efd4bf10ecd 100644 --- a/CONTRIBUTE +++ b/CONTRIBUTE @@ -287,15 +287,23 @@ the current release branch. Periodically, the current release branch is merged into the master, using the gitmerge function described in admin/notes/git-workflow. -If you are fixing a bug that exists in the current release, be sure to -commit it to the release branch; it will be merged to the master -branch later by the gitmerge function. - -Documentation fixes (in doc strings, in manuals, and in comments) -should always go to the release branch, if the documentation to be -fixed exists and is relevant to the release-branch codebase. Doc -fixes are always considered "safe" -- even when a release branch is in -feature freeze, it can still receive doc fixes. +If you are fixing a bug that exists in the current release, you should +generally commit it to the release branch; it will be merged to the +master branch later by the gitmerge function. However, when the +release branch is for Emacs version NN.2 and later, or when it is for +Emacs version NN.1 that is in the very last stages of its pretest, +that branch is considered to be in a feature freeze: only bug fixes +that are "safe" or are fixing major problems should go to the release +branch, the rest should be committed to the master branch. This is so +to avoid destabilizing the next Emacs release. If you are unsure +whether your bug fix is "safe" enough for the release branch, ask on +the emacs-devel mailing list. + +Documentation fixes (in doc strings, in manuals, in NEWS, and in +comments) should always go to the release branch, if the documentation +to be fixed exists and is relevant to the release-branch codebase. +Doc fixes are always considered "safe" -- even when a release branch +is in feature freeze, it can still receive doc fixes. When you know that the change will be difficult to merge to the master (e.g., because the code on master has changed a lot), you can |