Proper handling of merging between branches

[Mark A. Flacy]

On Tue, 2010-10-12 at 14:19 +1100, Martin Pool wrote:
> I think the approach there is basically reasonable.
> 
> Some other variations:
> 
>  * after you do a 'major release' when everything from trunk is merged
> into staging, then pull staging back to trunk; that way trunk never
> goes very far away or develops its own ancestry
>  * cherrypick the change into trunk, so that you bring across only the
> critical fix, and nothing else
>  * get rid of trunk as a branch in its own right and just have feature
> branches that merge into staging when they're stable (or perhaps this
> is better said as, have only a trunk that stays deployable)

There's also the idea of the tofu-scale.  See
http://stackoverflow.com/questions/1311849/using-the-tofu-scale-with-svn
as well as the PDF file linked in the above article
(http://oreilly.com/catalog/practicalperforce/chapter/ch07.pdf)

-- 
Mark A. Flacy <mflacy at verizon.net>