On 07/10/2014 15:14, Mark Thomas wrote: > The following is a summary of the previous discussions and the concerns > raised. It is an attempt to get all the information in one place so we > can agree on whether or not we want to migrate to git.
Given the lack of feedback on this thread, my working assumption is that the consensus opinion is not to migrate to git at this time. Therefore, I intend to create the 9.0.x branch (using the same structure in svn as previously) at the same time as I create the next 8.0.x tag. Mark > > 1. This is purely a decision about the version control system we use. > Other changes to the development process (Ant/Maven/Gradle or > Bugzilla/Jira) are out of scope for this discussion but free free to > start another thread to discuss other changes. > > 2. We would migrate to a two git repo that - initially would have the > following mapping to the current svn repo: > tomcat git repo > trunk -> master > tc7.0.x/trunk -> 7.0.x > tc6.0.x/trunk -> 6.0.x > tc8.0.x/tags -> git tags > tc7.0.x/tags -> git tags > tc6.0.x/tags -> git tags > tomcat-native git repo > native/trunk -> master > native/branches/1.1.x -> 1.1.x > native/branches/tags -> git tags > > The trunk/bayeux and trunk/tomcat-lite modules would be excluded from > the migration > > 3. site has to remain in svn for now > > 4. archive and sandbox would remain in svn > > 5. Development would take place on master and be cherry-picked to > branches as required. > > 6. The configuration diffs used in the migration documentation would be > provided via GitHub's compare too > > 7. Drop reviewboard in favour of commenting on GitHub pull requests. > > 8. The current svn external from native to trunk would be implemented > using git sub-modules. > > 9. Configure git commit e-mails to include the diff in the body > > > > The following are still TBD > > 1. mod_jk > Does it migrate to a third git repo or remain in svn? > > 2. taglibs > Does it migrate to a third git repo or remain in svn? > > 3. maven-plugin > Does it migrate to a third git repo or remain in svn? > > 4. sandbox/trunk-maven-layout > Is there a way for this to continue if we migrate to git? > > > I think I have captured everything. Feel free to add things and/or > respond to the points above so we can see how close we are to consensus. > > > 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
