From: Stephen Finucane <stephen@that.guru>
Date: Tue, 13 Dec 2016 18:12:02 +0000 (+0000)
Subject: docs: Document how to backport patches
X-Git-Tag: v2.0.0-rc1~146
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=72fc04dff73f1d4e8e74288ccae1181f8e8a3d0b;p=thirdparty%2Fpatchwork.git

docs: Document how to backport patches

Signed-off-by: Stephen Finucane <stephen@that.guru>
---

diff --git a/docs/development/releasing.md b/docs/development/releasing.md
index 5974da22..e09b5243 100644
--- a/docs/development/releasing.md
+++ b/docs/development/releasing.md
@@ -29,4 +29,21 @@ is to ensure stability for users of these versions of Patchwork.
 * Documentation has been updated with latest release version
 * Documentation references latest supported version of Django
 
+## Backporting
+
+We will occasionally backport bugfixes and security updates. When backporting
+a patch, said patch should first be merged into `master`. Once merged, you can
+backport by cherry-picking commits, using the `-x` flag for posterity:
+
+    $ git cherry-pick <master_commit> -x
+
+There may be some conflicts; resolve these, uncommenting the `Conflicts` line
+when commiting:
+
+    Conflicts
+            patchwork/bin/pwclient
+
+When enough patches have been backported, you should release a new `PATCH`
+release.
+
 [ref-semver]: http://semver.org/