diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2014-05-16 16:57:27 -0300 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2014-05-16 16:57:27 -0300 |
| commit | 3570b454af7f6751c761b75333f432de31fad4e0 (patch) | |
| tree | 05c749cb452e89956691c15d4ac8f70d082d8712 /development.mdwn | |
| parent | 91504ef19607da26c2b99adf156ba37e2742d54e (diff) | |
| parent | 03cc454684b152b036cd018e3d3d085759b86f3c (diff) | |
| download | keyringer-3570b454af7f6751c761b75333f432de31fad4e0.tar.gz keyringer-3570b454af7f6751c761b75333f432de31fad4e0.tar.bz2 | |
Merge tag 'upstream_keyringer_0.3.4' into debian
Upstream version 0.3.4
Diffstat (limited to 'development.mdwn')
| -rw-r--r-- | development.mdwn | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/development.mdwn b/development.mdwn index cf969fe..67c6456 100644 --- a/development.mdwn +++ b/development.mdwn @@ -37,12 +37,25 @@ These steps should be run once in a while to ensure we have an up to date packag DIST=sid sudo cowbuilder --update +Coding standards +---------------- + + - Respect the existing coding style. + + - Be clear: easy audability must be one of keyringer's requirements. + +Development workflow +-------------------- + +We use [git-flow](https://github.com/nvie/gitflow) for the development workflow. + Release workflow ---------------- -Go to master branch +Go to develop branch and start a new release - git checkout master + git checkout develop + git flow release start VERSION Prepare the source code: @@ -52,6 +65,8 @@ Prepare the source code: Create and upload a new release: + git flow release finish $VERSION + git checkout master make release Update the debian branch: |