Accumulo
  1. Accumulo
  2. ACCUMULO-1498

Create document to outline step to Git transition

    Details

    • Type: Task Task
    • Status: Resolved
    • Priority: Major Major
    • Resolution: Fixed
    • Affects Version/s: None
    • Fix Version/s: 1.6.0
    • Component/s: docs
    • Labels:
      None

      Description

      We need to outline both how we plan to use Git (for those who are not familiar with it) and the steps necessary to get the infrastructure in place.

      1. ctubbsii-git-suggestions.v1.txt
        2 kB
        Christopher Tubbs
      2. ctubbsii-git-proposed-actions.v1.txt
        0.9 kB
        Christopher Tubbs

        Activity

        Hide
        ASF subversion and git services added a comment -

        Commit 1519795 from Christopher Tubbs in branch 'site/branches/git'
        [ https://svn.apache.org/r1519795 ]

        ACCUMULO-1498 Remove site branch for git documentation (already merged to trunk)

        Show
        ASF subversion and git services added a comment - Commit 1519795 from Christopher Tubbs in branch 'site/branches/git' [ https://svn.apache.org/r1519795 ] ACCUMULO-1498 Remove site branch for git documentation (already merged to trunk)
        Hide
        Josh Elser added a comment -

        Pushed to production

        Show
        Josh Elser added a comment - Pushed to production
        Hide
        ASF subversion and git services added a comment -

        Commit 1504717 from Josh Elser in branch 'site/trunk'
        [ https://svn.apache.org/r1504717 ]

        ACCUMULO-1498 Nuke the 1.3 build as it's gone.

        Show
        ASF subversion and git services added a comment - Commit 1504717 from Josh Elser in branch 'site/trunk' [ https://svn.apache.org/r1504717 ] ACCUMULO-1498 Nuke the 1.3 build as it's gone.
        Hide
        ASF subversion and git services added a comment -

        Commit 1504715 from Josh Elser in branch 'site/trunk'
        [ https://svn.apache.org/r1504715 ]

        ACCUMULO-1498 Fix some links I broke when merging.

        Show
        ASF subversion and git services added a comment - Commit 1504715 from Josh Elser in branch 'site/trunk' [ https://svn.apache.org/r1504715 ] ACCUMULO-1498 Fix some links I broke when merging.
        Hide
        ASF subversion and git services added a comment -

        Commit 1504708 from Josh Elser in branch 'site/trunk'
        [ https://svn.apache.org/r1504708 ]

        ACCUMULO-1498 Merge back in all of the changes to the site

        Show
        ASF subversion and git services added a comment - Commit 1504708 from Josh Elser in branch 'site/trunk' [ https://svn.apache.org/r1504708 ] ACCUMULO-1498 Merge back in all of the changes to the site
        Hide
        ASF subversion and git services added a comment -

        Commit 1504703 from Josh Elser in branch 'site/branches/git'
        [ https://svn.apache.org/r1504703 ]

        ACCUMULO-1498 Clean up the changes I made with what Keith changed.

        Show
        ASF subversion and git services added a comment - Commit 1504703 from Josh Elser in branch 'site/branches/git' [ https://svn.apache.org/r1504703 ] ACCUMULO-1498 Clean up the changes I made with what Keith changed.
        Hide
        ASF subversion and git services added a comment -

        Commit 1492949 from Christopher Tubbs
        [ https://svn.apache.org/r1492949 ]

        ACCUMULO-1498 Ensure 1.5 branch merges cleanly to trunk

        Show
        ASF subversion and git services added a comment - Commit 1492949 from Christopher Tubbs [ https://svn.apache.org/r1492949 ] ACCUMULO-1498 Ensure 1.5 branch merges cleanly to trunk
        Hide
        ASF subversion and git services added a comment -

        Commit 1492948 from Christopher Tubbs
        [ https://svn.apache.org/r1492948 ]

        ACCUMULO-1498 Fix more svn mergeinfo from 1.4 to 1.5

        Show
        ASF subversion and git services added a comment - Commit 1492948 from Christopher Tubbs [ https://svn.apache.org/r1492948 ] ACCUMULO-1498 Fix more svn mergeinfo from 1.4 to 1.5
        Hide
        ASF subversion and git services added a comment -

        Commit 1492947 from Christopher Tubbs
        [ https://svn.apache.org/r1492947 ]

        ACCUMULO-1498 ensure 1.4 merges cleanly to 1.5

        Show
        ASF subversion and git services added a comment - Commit 1492947 from Christopher Tubbs [ https://svn.apache.org/r1492947 ] ACCUMULO-1498 ensure 1.4 merges cleanly to 1.5
        Hide
        ASF subversion and git services added a comment -

        Commit 1492672 from Josh Elser
        [ https://svn.apache.org/r1492672 ]

        ACCUMULO-1498 Fixing spelling error.

        Show
        ASF subversion and git services added a comment - Commit 1492672 from Josh Elser [ https://svn.apache.org/r1492672 ] ACCUMULO-1498 Fixing spelling error.
        Hide
        ASF subversion and git services added a comment -

        Commit 1492520 from Josh Elser
        [ https://svn.apache.org/r1492520 ]

        ACCUMULO-1498 Add examples from Christopher Tubbs, clarify git-merge options for Mike Drob and Drew Farris. Remove "uncertainty" sections as (semi-lazy) consensus has been reached.

        Show
        ASF subversion and git services added a comment - Commit 1492520 from Josh Elser [ https://svn.apache.org/r1492520 ] ACCUMULO-1498 Add examples from Christopher Tubbs , clarify git-merge options for Mike Drob and Drew Farris . Remove "uncertainty" sections as (semi-lazy) consensus has been reached.
        Hide
        ASF subversion and git services added a comment -

        Commit 1492032 from Josh Elser
        [ https://svn.apache.org/r1492032 ]

        ACCUMULO-1498 Adding in section on merging from mailing list discussion.

        Show
        ASF subversion and git services added a comment - Commit 1492032 from Josh Elser [ https://svn.apache.org/r1492032 ] ACCUMULO-1498 Adding in section on merging from mailing list discussion.
        Hide
        ASF subversion and git services added a comment -

        Commit 1491677 from Josh Elser
        [ https://svn.apache.org/r1491677 ]

        ACCUMULO-1498 Fix some major-release bugs. Lift more things from the Kakfa wiki. Outline patch and pull-requests for contributors and devs. Clean up the multi-line code blocks that weren't being properly formatted

        Show
        ASF subversion and git services added a comment - Commit 1491677 from Josh Elser [ https://svn.apache.org/r1491677 ] ACCUMULO-1498 Fix some major-release bugs. Lift more things from the Kakfa wiki. Outline patch and pull-requests for contributors and devs. Clean up the multi-line code blocks that weren't being properly formatted
        Hide
        ASF subversion and git services added a comment -

        Commit 1491667 from Josh Elser
        [ https://svn.apache.org/r1491667 ]

        ACCUMULO-1498 Stub out the major-release section and start lifting some info from the Kafka wiki

        Show
        ASF subversion and git services added a comment - Commit 1491667 from Josh Elser [ https://svn.apache.org/r1491667 ] ACCUMULO-1498 Stub out the major-release section and start lifting some info from the Kafka wiki
        Hide
        ASF subversion and git services added a comment -

        Commit 1490759 from Christopher Tubbs
        [ https://svn.apache.org/r1490759 ]

        ACCUMULO-1498 ensure 1.4 branch merges cleanly into 1.5 branch by updating svn metadata

        Show
        ASF subversion and git services added a comment - Commit 1490759 from Christopher Tubbs [ https://svn.apache.org/r1490759 ] ACCUMULO-1498 ensure 1.4 branch merges cleanly into 1.5 branch by updating svn metadata
        Hide
        ASF subversion and git services added a comment -

        Commit 1490749 from Christopher Tubbs
        [ https://svn.apache.org/r1490749 ]

        ACCUMULO-1498 ensure 1.3.6 tag merges cleanly into 1.4 branch by updating svn metadata

        Show
        ASF subversion and git services added a comment - Commit 1490749 from Christopher Tubbs [ https://svn.apache.org/r1490749 ] ACCUMULO-1498 ensure 1.3.6 tag merges cleanly into 1.4 branch by updating svn metadata
        Hide
        ASF subversion and git services added a comment -

        Commit 1490461 from Josh Elser
        [ https://svn.apache.org/r1490461 ]

        ACCUMULO-1498 Minor-release steps based on Christopher Tubbs's write-up.

        Show
        ASF subversion and git services added a comment - Commit 1490461 from Josh Elser [ https://svn.apache.org/r1490461 ] ACCUMULO-1498 Minor-release steps based on Christopher Tubbs 's write-up.
        Hide
        Josh Elser added a comment -

        Right, but these are the long-running old versions branches we've discussed. This is related to number 4. The main point being that eventually, all the last tags in each series should merge forward cleanly. What we don't want to do is tag them without making them merge cleanly first... that would be VERY frustrating when doing bugfixes in older versions.

        Oh you're right, I'm being silly. I would imagine this is something we can request name translation on the INFRA ticket, as well.

        Show
        Josh Elser added a comment - Right, but these are the long-running old versions branches we've discussed. This is related to number 4. The main point being that eventually, all the last tags in each series should merge forward cleanly. What we don't want to do is tag them without making them merge cleanly first... that would be VERY frustrating when doing bugfixes in older versions. Oh you're right, I'm being silly. I would imagine this is something we can request name translation on the INFRA ticket, as well.
        Hide
        Christopher Tubbs added a comment -

        Actions:
        1. Need to remember to request this

        We could rename the branch ourselves if necessary, but probably they'd need to do it for us so it's the default branch when cloning.

        4. Probably/Maybe? I'm not sure how robust git+svn clone is here. Verification/validation before the transition is complete would be necessary.

        Right now, I'm pretty sure the branches don't merge cleanly, so it would be very annoying if this made git branches not merge cleanly. If fixing it in SVN first will make git-svn and git happy later, we should do that. I'd really love to close the 1.3 branch prior to switching... it's one less branch we'd have to deal with. I'd also like to get this transition done prior to releasing 1.6.0, so we don't add another branch in the chain to deal with.

        5. Not sure I follow this one. SVN branches will appear as git branches, and SVN tags as git tags. Verification/validation again.

        Right, but these are the long-running old versions branches we've discussed. This is related to number 4. The main point being that eventually, all the last tags in each series should merge forward cleanly. What we don't want to do is tag them without making them merge cleanly first... that would be VERY frustrating when doing bugfixes in older versions.

        6. Should pre-date 5

        Number 5 would create some more... unless you're including branch cleanup as part of the tagging process, then we're thinking similarly.

        Show
        Christopher Tubbs added a comment - Actions: 1. Need to remember to request this We could rename the branch ourselves if necessary, but probably they'd need to do it for us so it's the default branch when cloning. 4. Probably/Maybe? I'm not sure how robust git+svn clone is here. Verification/validation before the transition is complete would be necessary. Right now, I'm pretty sure the branches don't merge cleanly, so it would be very annoying if this made git branches not merge cleanly. If fixing it in SVN first will make git-svn and git happy later, we should do that. I'd really love to close the 1.3 branch prior to switching... it's one less branch we'd have to deal with. I'd also like to get this transition done prior to releasing 1.6.0, so we don't add another branch in the chain to deal with. 5. Not sure I follow this one. SVN branches will appear as git branches, and SVN tags as git tags. Verification/validation again. Right, but these are the long-running old versions branches we've discussed. This is related to number 4. The main point being that eventually, all the last tags in each series should merge forward cleanly. What we don't want to do is tag them without making them merge cleanly first... that would be VERY frustrating when doing bugfixes in older versions. 6. Should pre-date 5 Number 5 would create some more... unless you're including branch cleanup as part of the tagging process, then we're thinking similarly.
        Hide
        Josh Elser added a comment -

        I'm attaching ctubbsii-git-suggestions.v1.txt with branching scenarios, based on conversations with Josh Elser and Keith Turner.

        I like most of this. Thanks for taking the time to write it down.

        My first concern was being crystal clear about when people can rebase/cherry-pick and when they must merge. Perhaps this is beating a dead horse though, "perform local development" should be sufficient.

        I'm attaching ctubbsii-git-proposed-actions.v1.txt as a rough guide to the transition, assuming the previous attachment represents the target branching model.

        Questions:
        1. Billie Rinaldi was correct when she said the site must stay in SVN to use the CMS
        2. Contribs move to their own repositories since they are separately versioned. See the number of Cordova repositories here.
        3. Need to verify this one. Not sure if the infrastructure itself enforces ASF policy (cannot delete tags, cannot git push --force and rewrite history).

        Actions:
        1. Need to remember to request this
        4. Probably/Maybe? I'm not sure how robust git+svn clone is here. Verification/validation before the transition is complete would be necessary.
        5. Not sure I follow this one. SVN branches will appear as git branches, and SVN tags as git tags. Verification/validation again.
        6. Should pre-date 5
        7. I hope to roll the existing source guide into the WIP doc I already started.

        Show
        Josh Elser added a comment - I'm attaching ctubbsii-git-suggestions.v1.txt with branching scenarios, based on conversations with Josh Elser and Keith Turner. I like most of this. Thanks for taking the time to write it down. My first concern was being crystal clear about when people can rebase/cherry-pick and when they must merge. Perhaps this is beating a dead horse though, "perform local development" should be sufficient. I'm attaching ctubbsii-git-proposed-actions.v1.txt as a rough guide to the transition, assuming the previous attachment represents the target branching model. Questions: 1. Billie Rinaldi was correct when she said the site must stay in SVN to use the CMS 2. Contribs move to their own repositories since they are separately versioned. See the number of Cordova repositories here . 3. Need to verify this one. Not sure if the infrastructure itself enforces ASF policy (cannot delete tags, cannot git push --force and rewrite history). Actions: 1. Need to remember to request this 4. Probably/Maybe? I'm not sure how robust git+svn clone is here. Verification/validation before the transition is complete would be necessary. 5. Not sure I follow this one. SVN branches will appear as git branches, and SVN tags as git tags. Verification/validation again. 6. Should pre-date 5 7. I hope to roll the existing source guide into the WIP doc I already started.
        Hide
        Christopher Tubbs added a comment -

        I'm attaching ctubbsii-git-proposed-actions.v1.txt as a rough guide to the transition, assuming the previous attachment represents the target branching model.

        Show
        Christopher Tubbs added a comment - I'm attaching ctubbsii-git-proposed-actions.v1.txt as a rough guide to the transition, assuming the previous attachment represents the target branching model.
        Hide
        Christopher Tubbs added a comment -

        I'm attaching ctubbsii-git-suggestions.v1.txt with branching scenarios, based on conversations with Josh Elser and Keith Turner.

        Show
        Christopher Tubbs added a comment - I'm attaching ctubbsii-git-suggestions.v1.txt with branching scenarios, based on conversations with Josh Elser and Keith Turner .
        Hide
        ASF subversion and git services added a comment -

        Commit 1490109 from Josh Elser
        [ https://svn.apache.org/r1490109 ]

        ACCUMULO-1498 First draft at infrastructure and implementation (sans release management) taken primarily from suggestions on the mailaing list.

        Show
        ASF subversion and git services added a comment - Commit 1490109 from Josh Elser [ https://svn.apache.org/r1490109 ] ACCUMULO-1498 First draft at infrastructure and implementation (sans release management) taken primarily from suggestions on the mailaing list.
        Hide
        ASF subversion and git services added a comment -

        Commit 1490096 from Josh Elser
        [ https://svn.apache.org/r1490096 ]

        ACCUMULO-1498 Update the section regarding what and how to request the change from INFRA

        Show
        ASF subversion and git services added a comment - Commit 1490096 from Josh Elser [ https://svn.apache.org/r1490096 ] ACCUMULO-1498 Update the section regarding what and how to request the change from INFRA
        Hide
        ASF subversion and git services added a comment -

        Commit 1490088 from Josh Elser
        [ https://svn.apache.org/r1490088 ]

        ACCUMULO-1498 Copy of the site's trunk with a start to the Git WIP document

        Show
        ASF subversion and git services added a comment - Commit 1490088 from Josh Elser [ https://svn.apache.org/r1490088 ] ACCUMULO-1498 Copy of the site's trunk with a start to the Git WIP document

          People

          • Assignee:
            Josh Elser
            Reporter:
            Josh Elser
          • Votes:
            0 Vote for this issue
            Watchers:
            2 Start watching this issue

            Dates

            • Created:
              Updated:
              Resolved:

              Development