diff options
| author | Stephen Finucane <stephen@that.guru> | 2016-12-13 18:12:02 +0000 |
|---|---|---|
| committer | Stephen Finucane <stephen@that.guru> | 2016-12-13 18:12:02 +0000 |
| commit | 72fc04dff73f1d4e8e74288ccae1181f8e8a3d0b (patch) | |
| tree | 878636fcfefaf26f9c3db1b69aa3a0041eefec5d /docs/development | |
| parent | 52654da17967a930a3cac962fc654e0d5de2855b (diff) | |
| download | patchwork-72fc04dff73f1d4e8e74288ccae1181f8e8a3d0b.tar patchwork-72fc04dff73f1d4e8e74288ccae1181f8e8a3d0b.tar.gz | |
docs: Document how to backport patches
Signed-off-by: Stephen Finucane <stephen@that.guru>
Diffstat (limited to 'docs/development')
| -rw-r--r-- | docs/development/releasing.md | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/docs/development/releasing.md b/docs/development/releasing.md index 5974da2..e09b524 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/ |