Changes between Version 2 and Version 3 of UltimateQualityDevelopmentSystem
- Timestamp:
- 03/13/2012 05:25:06 PM (15 months ago)
Legend:
- Unmodified
- Added
- Removed
- Modified
-
UltimateQualityDevelopmentSystem
v2 v3 27 27 }}} 28 28 29 * Note that {{{mkbranch}}} is a command provided by [ https://launchpad.net/divmod.org DivmodCombinator], a tool we use to simplify the management of revision control system branches.29 * Note that {{{mkbranch}}} is a command provided by [wiki:Combinator], a tool we use to simplify the management of revision control system branches. 30 30 * Development occurs to implement the feature or resolve the defect in the branch. 31 31 * When the code is deemed ready by the developer, the developer checks in their changes '''on the branch''' (not the trunk). … … 40 40 }}} 41 41 * (If the patch does not merge cleanly, the reviewer may reassign to the developer to [wiki:MergedForward merge forward] for review. Branches and patches must always be sufficiently recent that they will apply cleanly to trunk in order to be considered for review). 42 * Note here that the {{{unbranch}}} command (also part of [ https://launchpad.net/divmod.org DivmodCombinator]) merges your current branch ({{{sprocket-123}}}) into your local {{{trunk}}} in {{{Divmod/trunk}}}. Your trunk should be up to date - otherwise you will not be able to use {{{svn diff}}} to see just the new differences, and you will not be able to easily {{{svn revert}}} the merge.42 * Note here that the {{{unbranch}}} command (also part of [wiki:Combinator]) merges your current branch ({{{sprocket-123}}}) into your local {{{trunk}}} in {{{Divmod/trunk}}}. Your trunk should be up to date - otherwise you will not be able to use {{{svn diff}}} to see just the new differences, and you will not be able to easily {{{svn revert}}} the merge. 43 43 * The reviewer runs all automated tests. 44 44 {{{
