I presume that if you follow the dev list you've followed two interesting
threads on the user list:

https://groups.google.com/d/msg/gremlin-users/yrQDkmDJV-0/uLSBAQrnBgAJ
https://groups.google.com/d/msg/gremlin-users/_s_DuKW90gc/Xhp5HMfjAQAJ

Given some of the discussion there, Marko asked me how to setup a tp4
branch so that he could start to explore some ideas a bit. Thoughts
immediately in my mind:

1. this branch is "exploration" now but i imagine some day in the future it
will be the basis for 4.x
2. i can't imagine any merge action between 3.x and 4.x, but for
historical/practical/organization reasons we don't want multiple repos (it
feels like we only just settled down the confusion between 2.x and 3.x
repos)
3. i had a deep sense of displeasure at losing a continuous history between
3.x and 4.x

So, with all that and more in mind, i'm creating the branch in the
following fashion with an associated plan to pull it all back together when
the time comes for 4.x to be something:

1. Create tp4 as an orphan branch - empty of content except a README. As an
orphan it has no history tied to any other branch in the repo including
master
2. There will be no need to continually merge/rebase the tp4 branch since
it's an orphan and 3.x development continues as it does
3. When the time comes to promote tp4 we just:
    a. create a tp3 branch from master
    b. delete all content from master in one commit
    c. rebase tp4 on master
    d. merge tp4 to master and push
4. From this point 3.x dev will occur on tp3 and 4.x dev occurs on master
(with the same version branching as we have now, e.g tp33, tp41, etc.)
5. tp3 branch changes will still merge to master i think, but will all
merge as no-op changes.

Anyway....thanks to Dan LaRocque for talking this through with me - it
wasn't easy to consider all the possibilities and all the ramifications of
each approach without his help.

Reply via email to