Add merging instructions

Signed-off-by: Ivan Dolgov <ivan@qvarnlabs.com>

4 files changed, 77 insertions, 5 deletions

diff --git a/NEWS b/NEWS
index 51409fd..9ab10b5 100644
--- a/NEWS
+++ b/NEWS
@@ -3,10 +3,18 @@ NEWS for Salami
 
 This file has release notes for Salami
 
-Version 0.6+git, not yet released
+Version 0.7+git, not yet released
 ---------------------------------
 
 
+Version 0.7, released 2018-02-01
+---------------------------------
+
+* Add support for OAuth2 client credential grant. Do NOT use this yet.
+  The credential is stored in cleartext server-side.
+
+* This release is made only to facilitate internal testing.
+
 Version 0.6, released 2017-11-17
 ---------------------------------
 
diff --git a/README b/README
index a8a62e1..255a6d9 100644
--- a/README
+++ b/README
@@ -7,6 +7,64 @@ server. Originally developed to help development of Qvarn
 credentials** grant. Later on, we hope to develop this into an OpenID
 Connect provider.
 
+Merging workflow
+-----------------------------------------------------------------------------
+
+All development will happen on branches other than master. Changes are
+merged into master, when they're ready to be included into the next
+release. If the feature is not ready to be enabled by default, the
+merge will include a feature flag that disables the feature by
+default. Merging should ideally happen about daily.
+
+Before a merge happens, the changes to be merged will be reviewed and
+OK'd by someone else than the their author. The reviewer does the
+merge.
+
+The branch to be merged MUST be rebased onto the commit in master. The
+actual merge MUST NOT have any conflicts.
+
+The merge MUST be done using --no-ff, i.e., with a merge commit, even
+if only one commit is being merged. The merge commit MUST say who
+reviewed and accepted it, by including a `Signed-off-by` line. If
+there are more than one reviewer, they should all be added to the
+merge commit.
+
+Every commit in the master branch MUST pass `./check`.
+
+The merge process is described below. It starts after the changes have
+been reviewed and are ready to be merged.
+
+* `git checkout feature-branch`
+
+  Check out the changes to be merged.
+
+* `git checkout -b feature-branch-rebase`
+
+  Create a new branch, where it's safe to rebase.
+
+* `git rebase master`
+
+  Rebase onto master. Resolve any conflicts. Hopefully there aren't
+  any.
+
+* `git checkout master`
+
+  Checkout master, which is where the changes will be merged to.
+
+* `git merge --no-ff --no-commit feature-branch-rebase`
+
+  Merge, without committing the changes.
+
+* `./check`
+
+  Run tests. If there are any problem, abort merge process.
+
+* `git commit -s`
+
+  Commit the merge, adding the `Signed-off-by` line to the commit
+  message. The merge commit message should summarise the changes made.
+
+
 Legalese
 -----------------------------------------------------------------------------
 
diff --git a/debian/changelog b/debian/changelog
index f24283b..ad62f64 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,17 @@
-salami (0.6+git-1) UNRELEASED; urgency=medium
+salami (0.7+git-1) UNRELEASED; urgency=medium
+
+  * New upstream version.
+
+ -- Lars Wirzenius <liw@liw.fi>  Thu, 01 Feb 2018 11:05:56 +0200
+
+salami (0.7-1) unstable; urgency=medium
 
   * New upstream version.
   * Add build dependency on python3-coverage-test-runner, and
     pycodetyle and pylint3, and cmdtest (for yarn), and
     python{,3}-crypto{,graphy}, python*-requests, python{,3}-jwt.
 
- -- Lars Wirzenius <liw@liw.fi>  Fri, 17 Nov 2017 11:01:35 +0100
+ -- Lars Wirzenius <liw@liw.fi>  Thu, 01 Feb 2018 11:05:53 +0200
 
 salami (0.6-1) unstable; urgency=medium
 
diff --git a/salami/version.py b/salami/version.py
index ed54455..6ab0781 100644
--- a/salami/version.py
+++ b/salami/version.py
@@ -1,2 +1,2 @@
-__version__ = "0.6+git"
-__version_info__ = (0, 6, '+git')
+__version__ = "0.7+git"
+__version_info__ = (0, 7, '+git')