summaryrefslogtreecommitdiff
path: root/development.mdwn
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2014-05-16 16:57:26 -0300
committerSilvio Rhatto <rhatto@riseup.net>2014-05-16 16:57:26 -0300
commit03cc454684b152b036cd018e3d3d085759b86f3c (patch)
tree219d2abe1bda2ce3410a01e985042062a2c20a90 /development.mdwn
parent89005b548f9bc87b9a16f43ac40f12e4280c860f (diff)
parent30328dcdebd1bdca9385b8f4e17ace0c0500efdc (diff)
downloadkeyringer-03cc454684b152b036cd018e3d3d085759b86f3c.tar.gz
keyringer-03cc454684b152b036cd018e3d3d085759b86f3c.tar.bz2
Imported Upstream version 0.3.4upstream_keyringer_0.3.4
Diffstat (limited to 'development.mdwn')
-rw-r--r--development.mdwn19
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: