I've just been trying to get CHANGES.TXT between branch-2 and trunk more in sync, so that cherry picking patches from branch-2 up to trunk is more reliable.
Once you look closely , you see it is a mess, specifically: trunk/CHANGES.TXT declares things as in trunk only yet which are in branch-2 and/or actual releases What to do? 1. audit trunk/CHANGES.TXT against branch-2/CHANGES.TXT; anything in branch-2's (i.e. to come in 2.8) is placed into trunk at that location; the "new in trunk" runk's version removed 2. go to JIRA-generated change logs. Though for that to be reliable, those fix-version fields have to be 100% accurate too.
