So, going forward... When committing an issue that needs a changes entry, where are we supposed to put it?
EG if it's a bug fix that we'll backport all the way to 2.9.x... where does it go? If it's a new feature/API that's going to 3.x and trunk... only in 3.x's CHANGES? Mike On Wed, Dec 1, 2010 at 9:22 AM, Uwe Schindler <[email protected]> wrote: > Hi all, > > when merging changes done in 2.9.4/3.0.3 with current 3.x and trunk I found > out that 3.x changes differ immense between the trunk changes.txt and the > 3.x changes.txt. Some entries are missing in the 3.x branch, but are > available in trunk's 3.x part or other entries using new trunk class names > are between 3.x changes in trunk. > > I copied over the 3.x branch CHANGES.txt over trunks 3.x section and > attached a patch of this. What should we do? Its messy :( Most parts seem to > be merge failures. We should go through all those diff'ed issues and check > where they were really fixed (3.x or trunk) and move the entries > accordingly. After that in the 3.x branch and in trunk's 3.x section of > CHANGES.txt should be identical text! > > Uwe > > ----- > Uwe Schindler > H.-H.-Meier-Allee 63, D-28213 Bremen > http://www.thetaphi.de > eMail: [email protected] > > > > > --------------------------------------------------------------------- > To unsubscribe, e-mail: [email protected] > For additional commands, e-mail: [email protected] > --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
