Recent changes to Workflow

WikiPage Workflow modified by Tim Band

Tim Band — Sun, 02 Dec 2012 22:18:18 -0000

--- v2
+++ v3
@@ -2,11 +2,13 @@
 
 - We have a **master** branch for development and a branch for each releases (ie: **release-X.Y.Z**).
 
-- Code in these branches must be as more stable as possible (considered that we haven't test suite for now).
+- Code in the release branch must be stable: The only changes that are allowed on a release branch are fixes for branches that would prevent that release. The changes should be small and low-risk -- this could mean using a smaller fix than one that has been developed for the master branch.
 
-- It's not permitted commit directly on these branches. All commits must be **merge requests** from development branches.
+- Code that has not been tested on another branch should not be merged into the master branch.
 
-- We must do user tests (while not test suites) from the merge requests before merge them.
+- It's not permitted to commit directly to these branches. All commits must be **merge requests** from development branches.
+
+- We must perform user tests on each merge request before we merge it. We must continue to do this until we have an automatic test suite and it has sufficient coverage.
 
 
 [Case 1. Bug on master](bugmaster)

WikiPage Workflow modified by Minaya Serrano

Minaya Serrano — Thu, 15 Nov 2012 19:58:34 -0000

--- v1
+++ v2
@@ -9,7 +9,7 @@
 - We must do user tests (while not test suites) from the merge requests before merge them.
 
 
-[Case 1. Bug in master](bugmaster)
-[Case 2. New feature in master](featuremaster)
-[Case 3. Bug in release-X.Y.Z (Hotfix)](hotfix)
+[Case 1. Bug on master](bugmaster)
+[Case 2. New feature on master](featuremaster)
+[Case 3. Bug on release-X.Y.Z (Hotfix)](hotfix)
 [Case 4. New release](newrelease)

WikiPage Workflow modified by Minaya Serrano

Minaya Serrano — Thu, 15 Nov 2012 19:54:03 -0000

#Workflow on Linux Stopmotion# - We have a **master** branch for development and a branch for each releases (ie: **release-X.Y.Z**). - Code in these branches must be as more stable as possible (considered that we haven't test suite for now). - It's not permitted commit directly on these branches. All commits must be **merge requests** from development branches. - We must do user tests (while not test suites) from the merge requests before merge them. [Case 1. Bug in master](bugmaster) [Case 2. New feature in master](featuremaster) [Case 3. Bug in release-X.Y.Z (Hotfix)](hotfix) [Case 4. New release](newrelease)