On Sat, 2011-11-19 at 20:55 -0800, Aaron Patterson wrote: > > No, you don't know for sure when you'll backport. But when you do, you > > don't have to change master as well. So when you backport, you create a > > new change in 3-1-stable, containing a) the fix and b) a CHANGELOG entry > > for 3-1-stable. > > This means that your merge is no longer just a cherry-pick.
That's true, though I wouldn't find that a big problem as you often have to resolve conflicts during c-p's anyway. > > When it gets reverted in the 3-1-stable, your changelog entry was in the > > backport commit, so that gets reverted too. > > So if you revert on 3-1-stable, then do you need to add a changelog > entry to master? If it was changelog worthy for 3-1-stable, surely it > should be changelog worthy on master. No: bug fixes are only changelog-worthy on minor releases (i.e. 3-1-stable), not major releases (master). And feature additions should only be going into master, so would be changelogged there. -- http://jonathanleighton.com/
signature.asc
Description: This is a digitally signed message part
