This is an automated email from the ASF dual-hosted git repository.
spmallette pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git
The following commit(s) were added to refs/heads/master by this push:
new ff6a308 Updated future dev doc with tp4 branch plan CTR
ff6a308 is described below
commit ff6a308922c98c23c3949268f0e60b915565a1a3
Author: Stephen Mallette <[email protected]>
AuthorDate: Wed Mar 13 14:14:12 2019 -0400
Updated future dev doc with tp4 branch plan CTR
---
docs/src/dev/future/index.asciidoc | 13 +++++++++++++
1 file changed, 13 insertions(+)
diff --git a/docs/src/dev/future/index.asciidoc
b/docs/src/dev/future/index.asciidoc
index b973d19..3c6ef48 100644
--- a/docs/src/dev/future/index.asciidoc
+++ b/docs/src/dev/future/index.asciidoc
@@ -39,6 +39,19 @@ If adding comments sections, please "sign" comments with
initials and reference
image:tp4-think.png[]
+Development of 4.x occurs on the `tp4` branch. This branch was created as an
orphan branch and therefore has no
+history tied to any other branch in the repo including master. As such, there
is no need to merge/rebase `tp4`. When
+it comes time to promote `tp4` to `master` the procedure for doing so will be
to:
+
+1. Create a `tp3` branch from `master`
+1. Delete all content from `master` in one commit
+1. Rebase `tp4` on `master`
+1. Merge `tp4` to `master` and push
+
+From this point 3.x development will occur on `tp3` and 4.x development occurs
on `master` (with the same version
+branching as we have now, e.g `tp33`, `tp41`, etc.) The `tp3` branch changes
will likely still merge to `master`, but
+will all merge as no-op changes.
+
== The Main Features
TinkerPop 4.x should focus on the most successful aspects of TinkerPop 3.x and
it should avoid the traps realized in
