Hi,
2014-09-02 22:15 GMT+03:00 Mark Thomas <ma...@apache.org>: > > ... > It is up to us. > > <aside> > The current svn setup is a single repo. > </aside> > > My preference is for a single git repo with branches for 7.0.x and 6.0.x +1 one repo with many branches master is the latest development in our case 8.0.x at the moment > > > - how to backport modifications from one major version to another ? is cherry-picking ok ? > > Again, it is up to us. I see two basic choices. > > a) Make change in master and cherry pick to backport +1 cherry pick from master to other branches > b) Make changes in earliest branch that needs the change and merge > forward until we reach trunk/master > > a) is closer to how we work now. b) is 'nicer'. a) is more flexible. > > I have a slight preference for a) but I'm happy with either. > 2014-09-02 22:28 GMT+03:00 Konstantin Kolinko <knst.koli...@gmail.com>: > > ... > 2). svn revision numbers are used by the config difference form in the > Migration guide. > http://tomcat.apache.org/migration-8.html#Upgrading_8.0.x > > (Is it possible to replace it with links to similar Git tools, e.g. to > "compare" pages on GitHub? Does HTML GUI at git.apache.org have > similar history and compare pages?) > https://github.com/apache/tomcat/compare Regards, Violeta
