: How do we do CHANGES.txt on the 1.3 branch? Add a 1.3.1 section on both the trunk (below 1.4) and the branch, keep them in sync.
FWIW: The method Doug (i think it was Doug) recommend for dealing with point releases once upon a time (on Lucene-Java) was to commit all bug fixed to the trunk, mark the bug fixed in Jira, and if you thought it warranted a point release indicate that in Jira using the "Fix Version" -- but hold off on commiting anything to the branch until a decisison is made to actually do a point release -- then use search the "Fix Version" for issues and merge their specific commits onto the branch. the theory is that merging many things to the branch is easier to do at one time then in individual merges, and you'reless likely to run into problems if an initial bug fix turned out to have it's own bugs. Plus you don't waste a lot of work if it turns out the point release never actaully happens. -Hoss
