[Zope-Coders] CHANGES.txt

[Steve Alexander]

Shane Hathaway wrote:
 >

>  Brian later stitches them together.


Thanks Shane, that helps explain things.

So, out of these four versions, what holds?
[ my comments in square brackets ]



1: When you apply a patch to the trunk and the release you should add a 
comment to both CHANGES.txt files.

[ this doesn't seem to be correct ]


2: Usually you need make a comment in it on the current release branch 
only. The only time an entry should make it in to the trunk CHANGES.txt 
is if the feature only makes it in to the trunk for some reason... in 
practice this is rare.

[ this looks correct for bugfixes, but not for features added ]


3: When committing a bugfix, make the fix go into the trunk, the current 
release branch (currently Zope-2_4-branch), and the CHANGES.txt file for 
the current release branch.

[ this looks correct ]


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 ]

--
Steve Alexander