Versions Compared

Key

  • This line was added.
  • This line was removed.
  • Formatting was changed.
Comment: Merge strategy agreed

...

git push -u origin tomcat70
git push --tags

Issues

Merge forward or cherry-pick?

...

svn

...

Solution 1: Cherry-pick

...

:

...

Solution 3: ???

svn:external for native

Solution 1: Move native to git and use a sub-module

...

  1. Review board. Tomcat gas been removed from (technically hidden in) the ASF ReviewBoard instance

  2. 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
  3. Branch names. master, tc8.5, tc8.0, tc7.0 etc
  4. 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.
  5. Merge strategy. Commit to master then cherry-pick to branches for older versions as required.