On 09/01/18 07:06, Martin Grigorov wrote: > Hi, > > On Jan 8, 2018 15:33, "Mark Thomas" <ma...@apache.org> wrote: > > This is the third of the per issue e-mails to discuss the issues > associated with migrating from svn to git. > > The standard name for the main branch where development takes place in > svn is 'trunk'. In git the standard name is 'master'. > > We can use either of these going forwards. Or something completely > different. > > We need to pick a name. > > Thoughts? > > > Here is another suggestion: > each branch is named after the version of Tomcat it is for. > For example : 7.x, 8.x, 8.5.x, 9.x, etc. > Tomcat supports several versions and this approach makes it very clear > which branch for which version is.
For older branches I'd assumed we'd stick with some variation based on the version. In the test repo we have: - tomcat70 - tomcat80 - tomcat85 That could just as easily be "tc7.0.x, tc8.0.x, tc8.5.x" or "tc70, tc80, tc85" or ... My only concern is that the naming is logical, consistent and will still work when we get to Tomcat 10 :) Of the above the versions based on the current svn names look to be the best match (tc7.0.x etc) > Also this way all branch names are consistent. I can see the advantage in that. However, it does mean anything that works of 'latest' will need to be updated when we create a new version/branch. On balance, I think I prefer using a single name for the latest development branch (trunk/master/whatever). My thinking is that more folks/tools are going to want to follow 'latest' than any specific version. Cheers, Mark > If it just between trunk and master then I vote for master. > > Regards, > Martin > > > Mark > > --------------------------------------------------------------------- > To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org > For additional commands, e-mail: dev-h...@tomcat.apache.org > --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
