Changes between Version 10 and Version 11 of TracDev/DevelopmentWorkflow

Timestamp:

Mar 7, 2016, 12:20:49 AM (8 years ago)

Author:

Ryan J Ollos

Comment:

Add example for merging multiple changesets.

TracDev/DevelopmentWorkflow

@@ -17 +17 @@
 Merging in this direction (//porting// or //forward porting//) makes it quite easy to merge all pending changes from one stable branch to the next, eg [source:branches/0.12-stable 0.12-stable] to [source:branches/1.0-stable 1.0-stable], then to [source:trunk]. This workflow is much simpler than the opposite one, //back porting//, which involves cherry-picking or careful "blocking" of changes which shouldn't be merged back. The SCM tools have generally better support for merging in this forward direction, even Subversion since v1.5.
 
-While this pattern of //forward porting// makes it easy to merge all pending changes, in practice we cherry-pick changes as they are committed in order to keep all branches in sync and prevent pending changes from accumulating on a branch.
+While this pattern of //forward porting// makes it easy to merge all pending changes, in practice we cherry-pick changes as they are committed in order to keep all branches in sync and prevent pending changes from accumulating on a branch. Multiple changesets can be cherry-picked in a single merge command using a comma-separated list of changesets: `-c 15407,15409`.
 
 Here's a walk through example. We start by hacking on [source:branches/0.12-stable 0.12-stable]: