[cctbxbb] Moving cctbx to git

[R.D. Oeffner]

Great work Markus,

Just a quick question. I suppose we can push our own branches on to the 
github repo besides commits to the master branch, Right?

Rob


On 23/11/2016 08:48, markus.gerstel at diamond.ac.uk wrote:
> Hello everyone,
> 
> The Sourceforge CCTBX repository history has now been migrated to
> GitHub, and all further commits should go there.
> 
> Please do NOT commit to Sourceforge anymore!
> 
> To convert your local CCTBX repository from SVN to git you can use
> these commands, which should retain any local, uncommitted changes and
> unversioned files:
> 
> cd modules # or the directory directly above your checked out copy
> 
> mv cctbx_project cctbx_project.svn
> 
> git clone git at github.com:cctbx/cctbx_project.git
> 
> # If you have not set up SSH keys with your Github account you can
> alternatively use
> 
> # git clone https://github.com/cctbx/cctbx_project.git [1]
> 
> # but then would have to enter your credentials with every commit
> 
> cd cctbx_project.svn
> 
> svn diff > ../cctbx-patches
> 
> [ "$(uname)" != "Darwin" ] && svn status | grep "^?" | cut -c 9- |
> xargs -I {} cp --parents -av {} ../cctbx_project
> 
> # This will copy over any unversioned files. This will unfortunately
> not work on macs.
> 
> cd ../cctbx_project
> 
> patch -p0 < ../cctbx-patches
> 
> git status
> 
> If you haven't done it before, now is a good time to set up your local
> installation (see my last email for more about this)
> 
> git config --global user.name "John Doe"
> 
> git config --global user.email "your_email at example.com"
> 
> git config --global pull.rebase true
> 
> To get commit notifications and test results you can subscribe to a
> separate mailing list at
> https://www.jiscmail.ac.uk/cgi-bin/webadmin?A0=CCTBX-COMMIT [2]
> 
> Happy coding.
> 
> -Markus
> 
> FROM: Gerstel, Markus (DLSLtd,RAL,LSCI)
>  SENT: 22 November 2016 15:29
>  TO: 'cctbxbb at phenix-online.org' <cctbxbb at phenix-online.org>
>  SUBJECT: RE: Moving cctbx to git
> 
> Hello everyone,
> 
> Just a friendly reminder that tomorrow morning (Europe and UK),
> tonight (US) we will complete the migration of the cctbx source
> repository to git.
> 
> At this time if you want to commit code: *KEEP COMMITTING TO
> SOURCEFORGE*.
> 
> Do not worry about leaving uncommitted changes in your SVN tree. Those
> can be migrated later, instructions for this will follow after the
> move.
> 
> The new cctbx repository lives at
> https://github.com/cctbx/cctbx_project [3], however please do not
> commit to this repository yet!
> 
> We have set up a mailing list at
> https://www.jiscmail.ac.uk/cgi-bin/webadmin?A0=CCTBX-COMMIT [2], where
> you can get commit notifications and test results.
> 
> If you haven't done it before, now is a good time to set up your local
> installation of git to use your name and mail address with
> 
> git config --global user.name "John Doe"
> 
> git config --global user.email your_email at example.com
> 
> as well as this setting to avoid merge commits:
> 
> git config --global pull.rebase true
> 
> Note that you must set these on every computer you use! You may want
> to keep a copy of those commands around in case you ever get a new
> computer.
> 
> You should use mail addresses registered with your github account, or
> - if you enable it in your github account - the anonymous address
> offered by github.
> 
> You may want to use the time to sort out your ssh access keys with
> your GitHub account, and play around with git a bit. You can test that
> everything works using the temporary sandbox repository of cctbx. Here
> are some commands to get you started:
> 
> git clone git at github.com:cctbx/cctbx-playground.git
> 
> cd cctbx-playground
> 
> echo some text >> some-file
> 
> git add some-file
> 
> git commit -m "some commit"
> 
> git push
> 
> git log
> 
> Then go to https://github.com/cctbx/cctbx-playground/commits/master
> [4] to see how other people will see your commits.
> 
> The next steps:
> 
> *TUESDAY 22ND NOVEMBER 2016, 11:59PM PACIFIC TIME*
> 
> *= WEDNESDAY 23RD NOVEMBER 2016, 07:59AM GMT:*
> 
> Sourceforge: *READ-ONLY*. GitHub: Committing allowed
> 
> Please do not commit to Sourceforge any more.
> 
> All future commits should go to GitHub only.
> 
> Instructions to migrate local developer repositories will be sent
> around.
> 
> Change any website pointers from SF to GitHub.
> 
> Remaining commits on Sourceforge will be migrated to GitHub.
> 
> -Markus
> 
> Dr Markus Gerstel MBCS
> 
> Postdoctoral Research Associate
> 
> Tel: +44 1235 778698
> 
> Diamond Light Source Ltd.
> 
> Diamond House
> 
> Harwell Science & Innovation Campus
> 
> Didcot
> 
> Oxfordshire
> 
> OX11 0DE
> 
> --
> 
> This e-mail and any attachments may contain confidential, copyright
> and or privileged material, and are for the use of the intended
> addressee only. If you are not the intended addressee or an authorised
> recipient of the addressee please notify us of receipt by returning
> the e-mail and do not use, copy, retain, distribute or disclose the
> information in or attached to the e-mail.
> Any opinions expressed within this e-mail are those of the individual
> and not necessarily of Diamond Light Source Ltd.
> Diamond Light Source Ltd. cannot guarantee that this e-mail or any
> attachments are free from viruses and we cannot accept liability for
> any damage which you may sustain as a result of software viruses which
> may be transmitted in or with the message.
> Diamond Light Source Limited (company no. 4375679). Registered in
> England and Wales with its registered office at Diamond House, Harwell
> Science and Innovation Campus, Didcot, Oxfordshire, OX11 0DE, United
> Kingdom
> 
> 
> Links:
> ------
> [1] https://github.com/cctbx/cctbx_project.git
> [2] https://www.jiscmail.ac.uk/cgi-bin/webadmin?A0=CCTBX-COMMIT
> [3] https://github.com/cctbx/cctbx_project
> [4] https://github.com/cctbx/cctbx-playground/commits/master
> 
> _______________________________________________
> cctbxbb mailing list
> cctbxbb at phenix-online.org
> http://phenix-online.org/mailman/listinfo/cctbxbb