Changes between Version 21 and Version 22 of WorkingGuideLines

Timestamp:

02/13/12 13:34:11 (13 years ago)

Author:

slyfox

Comment:

Added 'backporing to stable' instructions.

WorkingGuideLines

@@ -133 +133 @@
 }}}
 
- If you has any problems in merge process you should fix it manually and continue merge process, but try to check merge process before start to push or you can break branch.
+ If you have any problems in merge process you should fix it manually and continue merge process, but try to check merge process before start to push or you can break branch.
 
- * Now you can close the ticket and the ticket will change into the testing state, and rewrite 'Votes for changeset' to 'committed-master' text. Also, change value of 'Severity' fileld to 'merged'. In ticket comment you must describe how get summary patch. For example:
+ * Now you can close the ticket and the ticket will change into the testing state, and rewrite 'Votes for changeset' to 'committed-master' text. Also, change value of 'Branch state' fileld to 'merged'. In ticket comment you must describe how get summary patch. For example:
 {{{
 fixed: 111111111111111^...222222222222222 # for multipatch
@@ -152 +152 @@
 Release process should be described [wiki:ReleaseProcess here].
 
+== Backporting to stable branch ==
+Sometimes the change needs to backported to latest stable branch (like '''4.8.1-stable''').
+Such changes are marked as '''keywords: stable-candidate'''.
+
+In order to merge them you need to:
+
+ * git checkout 4.8.1-stable
+ * git cherry-pick commit-id '''every needed changeset'''
+ * git push origin 4.8.1-stable
+ * change bug status accordingly:
+
+     Drop '''keywords: stable candidate''' and add'''committed-stable''' to '''Votes for changeset:'''.
+     {{{
+     fixed: 111111111111111^...222222222222222 # for multipatch
+     fixed: 111111111111111                    # for one changeset
+     }}}
+
+
 == Code Indentation Guidelines ==