[sakai-core-team] Subversion -> Github Migration

[Neal Caidin]

We might need to ask Wush to link our Git to Jira (I presume)?

Happy to create a Confluence page. Will look tomorrow morning if nobody has
suggestions of where to place it.

Thanks,
Neal


On Fri, Dec 26, 2014 at 12:33 PM, Charles Severance <csev at umich.edu> wrote:

> It occurs to me that we need a very simple page of how trunk committers
> are to behave the "day after the move to git".  A quick scan of Confluence
> suggests we do not yet have such a page as most of our work has been
> getting ready.
>
> I am not talking about a whole gitflow explanation.  Just how to work with
> trunk for the next weeks.  Something with the following outline:
>
> So you are a Sakai Trunk Committer and Need to Use GIT:
>
> (0) Make sure you have git setup and have a github account and have your
> name and email properly set as git global variables on your workstation.
>
> (1) Fork the central Sakai repository to your own github account
>
> (2) Use your own copy of git to make your changes and test, etc.  You can
> commit and push as to your own repo as much as you like.
>
> (3) When you are ready to "commit to trunk" send a pull request from your
> repo to the sakai master repo.
>
> (4) If the changes are code you would have committed to the old SVN trunk
> (i.e. just normal development) - merge your own pull request in to Sakai's
> master
>
> (5) If the changes you are making are worthy of further review or touching
> an are of Sakai that you do not generally work in - have someone else
> review and merge your pull request.
>
> In general we trust Sakai committers to know the difference between (4)
> and (5) - as time progresses, we will get better at this.  We will be
> giving trunk committers broad access to the  sakai master repo and will
> rely on the fact that we know when to merge our own requests and when to
> request someone else to merge the requests.
>
> The super great news is that now folks who do not have trunk commit can
> issue pull requests to the sakai master repo and we can get those changes
> merged in a more natural way.
>
> We are continuing to use JIRA to do issue tracking - we will not be using
> the github issue tracking.
>
> (Or similar)
>
> /Chuck
>
> On Dec 24, 2014, at 6:09 AM, Matthew Buckett <matthew.buckett at it.ox.ac.uk>
> wrote:
>
> > I'll send this out to sakai-dev in a few of hours unless anyone has
> > anything to add:
> >
> > Morning,
> >
> > We're planning on moving the trunk code of Sakai from SVN to GitHub on
> > Monday the 29th of December. Work on the 10.x and 2.9.x branches will
> > continue in SVN and nothing will be removed from SVN. The steps
> > involved in this will be:
> >
> > - Monday 29th December
> > -  SVN trunk folders in the main Subversion repository[1] go
> > read-only. We will make all the paths with /{folder}/trunk/ in them
> > read only so people can't make commits to these locations (also this
> > won't include msub). This allows us to take a consistent snapshot for
> > the transition to git and prevents commits getting left in SVN.
> > - A conversion of read-only trunk folders is done and it is merged
> > into one large project. The authors are updated with the details
> > captured from [2]. Once a satisfactory conversion is achieved it is
> > published on GitHub[3].
> >
> > - Tuesday 30th December
> > - Everyone can check that that the conversion looks ok and things
> > haven't got lost in the process. At this point we decide if new work
> > continues in GitHub or if there are problems we have the option to
> > rollback and continue to work in SVN by making the trunk folders
> > writeable again and attempt a another conversion in the future.
> >
> >
> > [1] - https://source.sakaiproject.org/svn/
> > [2] -
> https://confluence.sakaiproject.org/pages/viewpage.action?title=Migrating+from+SVN+to+Git%3A+SVN+trunk+committers+-%3E+Git+authors&spaceKey=PMC
> > [3] - https://github.com/sakaiproject/sakai
> >
> > --
> >  Matthew Buckett, VLE Developer, IT Services, University of Oxford
> > _______________________________________________
> > sakai-core-team mailing list
> > sakai-core-team at collab.sakaiproject.org
> > http://collab.sakaiproject.org/mailman/listinfo/sakai-core-team
>
> _______________________________________________
> sakai-core-team mailing list
> sakai-core-team at collab.sakaiproject.org
> http://collab.sakaiproject.org/mailman/listinfo/sakai-core-team
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://collab.sakaiproject.org/pipermail/sakai-core-team/attachments/20141228/0a963cdf/attachment.html