On 02/07/12 20:12, Glenn Adams wrote: > What would people prefer? > > - merging these RC1 tagged revs back to trunk now (i.e., real soon now)
Yes, but don’t delete the fop-1_1 branch after the merge. Use the following trick to keep it alive: http://svnbook.red-bean.com/en/1.6/svn.branchmerge.advanced.html#svn.branchmerge.advanced.reintegratetwice > - not merging now, but waiting until their respective branches > (commons-1_5 & fop-1_1) are final before merging > > If the former is followed, then we don't have to worry about overwriting > site docs with the now older trunk docs. Further, this will make merges > into trunk simpler as these branches reach finality. If the latter is > followed, then there is a danger of accidentally using trunk to publish an > update to site docs. > > My preference is to merge now, but I'd like to hear your comments (if any). > > G. > Thanks, Vincent
