...
git push -u origin tomcat70
git push --tags
Issues
Merge forward or cherry-pick?
The model we have been using in svn is, effectively, to apply the fix to the latest version and then cherry-pick fixes to older releases. The natural git model is to apply the fix to the oldest version with the problem and then merge forward.
Solution 1: Cherry-pick
Solution 2: Switch to merge forward
Solution 3: ???
svn:external for native
Solution 1: Move native to git and use a sub-module
Solution 2: ???
CI systems
Solution 1: Switch them to pulling soutrce from git (Gump and buildbot support this)
Solution 2: ???
Format of commit messages
Need to confirm what this is with infra
Old github repos
Solution 1: Make them read-only
Developer process
Solution 1: Document options (multiple clones, git worktree, etc.) or better strill find an on-line reference.
Update docs
Solution 1: Update post migration and include in next release
Solution 2: As 1 but publish immediately.
Update website
Solution 1: Update svn.html post migration (any maybe rename)
Resolved Issues
Review board. Tomcat gas been removed from (technically hidden in) the ASF ReviewBoard instance
- Config diffs in migration guide. Use gitweb. e.g.:
https://gitbox.apache.org/repos/asf?p=camel.git;a=blobdiff;f=pom.xml;hb=camel-2.20.1;hpb=camel-2.19.0
- Branch names. master, tc8.5, tc8.0, tc7.0 etc
- PRs. Those against apache/tomcat will remain. Currently no other opne open PRs. Any opened between now and migration will be closed and asked to be made against apache/tomcat.
- Merge strategy. Commit to master then cherry-pick to branches for older versions as required.
- CI Systems. Leave them pointing at svn. Migrate to git. Once we are happy with the git repo update the CI systems to use it.
- Java source code for tomcat-native. Pull in the source code from a specific tag/hash as part fo the build process.
- Mail format. See recent tomcat-training emails on dev@ for examples. For further tweaks, infra have indicated patches to https://github.com/apache/infrastructure-puppet/blob/deployment/modules/gitbox/files/asfgit/git_multimail.py are welcome.
- Make old github repos read-only. Ensure information from PRs is available on dev@ list, in BZ or similar. Copy across anything missing. Then delete old repos.
- Developer process. git worktree
- Documentation update
- Update post migration and release ASAP
- Website update
- Update post migration
- Rename to source.html
- Edit svn.html to link to source.html