-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 Mark,
On 1/9/18 9:25 AM, Mark Thomas wrote: > 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 :) Then please for goodness sake use delimiters between parts of the version number. Nobody wants to try to figure out whether tc1052 is Tomcat 1.0.52 or Tomcat 10.0.52 or Tomcat 105.2. > Of the above the versions based on the current svn names look to be > the best match (tc7.0.x etc) +1(00) >> 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. A couple of thoughts: 1. There must be something called "master" because 100% of Git users expect something to be there. 2. Switching from subversion means that "trunk" is simply no longer the conventional name. Let's drop that. 3. "master" could reasonably be either: a. Current development HEAD (i.e. what we currently call "trunk" in svn) b. Current release HEAD (i.e. what we currently call tc8.5.x/trunk in svn -- or 8.0.x if we want to be really conservative) c. Current latest release tag (i.e. what is currently called tc8.5.x/tags/TOMCAT_8_5_24) The implication of choice 3(c) is that we no longer allow "junk on trunk [master]". That would mean that anytime someone did a "git clone tomcat/master", they would have something that the Tomcat team considers to be release-ready. I'm not sure if that is possible, reasonable, or expected. But it's something to consider. - -chris -----BEGIN PGP SIGNATURE----- Comment: GPGTools - http://gpgtools.org Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQJRBAEBCAA7FiEEMmKgYcQvxMe7tcJcHPApP6U8pFgFAlpX6i0dHGNocmlzQGNo cmlzdG9waGVyc2NodWx0ei5uZXQACgkQHPApP6U8pFhRyA/+K1tCEntPA1zfCOkI LrwMsBJk4zl/f3zTo4I3h+LWBdZUhezMMnwbpm2aovC4Kg2cUVBidu1Vsd/qK9/E EMQ7zUkSMhMjdS1W18L0FGS6P5M1r7AYA+Xpg4HEhbAk9FE4TUZ0ZqEq0JFu7xrn B/KmQuZVddOL4SaAVA6dj9afsRVYPaYS1ekeQPcaGLbodHTymx8dCij1+ZIq5Zo4 Jhem9PQzbfNbFZYVJ4Dj5tU2T0SgoedcS0VgxgRmKmNRgwz0Zk3vdL0MkZ+EZGN6 Mv1fnyrl4EXztHcqrOn5kodQyBM0buOnk0SQ/Uyd6GWpYKKJ+mfOAoBvpJ8eN0fQ //43QOZ7x3NdQ1vmth/eN/EY2QUP5E/b9JVo0HLzU/yvbw5/Oz9jERRcIKTx2QGt uoZXcZ3jQgabOkSp7wyDyYEJab5qzl/DgeiRkOnKGg9sjkTv1jL2+tF+zFkH3rsF 9YMB8kbIsqS7z2CnuQaXpg/ew45XIlira/JlGZ+HZURzW/Vs1WCbMcHShGkBiTd7 4Hj3hRqhCQyKlKeabUdMqvCXCuPVLSN0znyZQ6f3oq9rmIE5HS2mRAwSfQL8GZSu 4DvpVMVekmZqfWmJB6JRJOvMzlUeOZ9CNXLzVP0xsqFMCuldaBgW6N3Ua1+DTMuA HpUN7X+ekBEmwHctFMTOxrSPx5w= =APnA -----END PGP SIGNATURE----- --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
