Hi, On Wed, Jun 18, 2008 at 01:23:20PM +0200, Christophe Combelles wrote: > Hi Christian, > > let's take a real package as an example (on which I recently did some merges) > > CHANGES.txt on the trunk: > http://svn.zope.org/zope.app.container/trunk/CHANGES.txt?rev=87370 > > CHANGES.txt on the 3.5 branch: > http://svn.zope.org/zope.app.container/branches/3.5/CHANGES.txt?rev=87428 > > Given what you said, what should these files look like?
*Almost* as they look like now, except that the changes from 3.5.1+ on the trunk would be visible as a change to 3.6. It would have only one entry for 3.5 which would be 3.5.0; and probably the pre-releases leading to the stable 3.5.0. Christian -- Christian Theune · [EMAIL PROTECTED] gocept gmbh & co. kg · forsterstraße 29 · 06112 halle (saale) · germany http://gocept.com · tel +49 345 1229889 7 · fax +49 345 1229889 1 Zope and Plone consulting and development _______________________________________________ Zope-Dev maillist - [email protected] http://mail.zope.org/mailman/listinfo/zope-dev ** No cross posts or HTML encoding! ** (Related lists - http://mail.zope.org/mailman/listinfo/zope-announce http://mail.zope.org/mailman/listinfo/zope )
