From 2a6bce482c13cff37c1af00231265de4656a454b Mon Sep 17 00:00:00 2001 From: Carnhof Daki Date: Wed, 16 Oct 2019 12:13:28 +0200 Subject: [PATCH] doc: Add a note about backporting MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit See laanwj's comment in #17158 https://github.com/bitcoin/bitcoin/pull/17158#issuecomment-542627090 Co-Authored-By: Wladimir J. van der Laan Co-Authored-By: Hennadii Stepanov <32963518+hebasto@users.noreply.github.com> Co-Authored-By: João Barbosa Co-Authored-By: Michael Co-Authored-By: Luke Dashjr --- CONTRIBUTING.md | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 33c797d7992..c8762866626 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -309,6 +309,31 @@ about: when someone else is asking for feedback on their code, and universe balances out. +Backporting +----------- + +Security and bug fixes can be backported from `master` to release +branches. +If the backport is non-trivial, it may be appropriate to open an +additional PR, to backport the change, only after the original PR +has been merged. +Otherwise, backports will be done in batches and +the maintainers will use the proper `Needs backport (...)` labels +when needed (the original author does not need to worry). + +A backport should contain the following metadata in the commit body: + +``` +Github-Pull: # +Rebased-From: +``` + +Have a look at [an example backport PR]( +https://github.com/bitcoin/bitcoin/pull/16189). + +Also see the [backport.py script]( +https://github.com/bitcoin-core/bitcoin-maintainer-tools#backport). + Release Policy --------------