> 4: This is how I understand it: If you're fixing a bug, you only need to > add to CHANGES in the branch. If you're adding a feature, you only need > to add to CHANGES in the trunk. Brian later stitches them together. > > [ this looks correct ] Yes - this is correct. Brian Lloyd brian@zope.com Software Engineer 540.361.1716 Zope Corporation http://www.zope.com