[cctbxbb] Not wishing to raise this again but...

markus.gerstel at diamond.ac.uk markus.gerstel at diamond.ac.uk
Tue Jun 14 01:06:56 PDT 2016

Just would like to add to this that a git cctbx is actually the only way we can do stable DIALS releases.
Which is why we already maintain a complete git copy of the cctbx repository* for that purpose.
Moving to git proper would make it a lot easier to copy over patches from trunk/master to the release branch.

With regards to seeing which commit broke the build – we already run Jenkins for each cctbx commit, so if this causes test failures I will know straightaway. I think it was decided to not send the notification mails to this list, so at the moment only I get to see them. We could set up a separate spam list for these. I found that by testing early and often there is little need for historic investigations.

To retrospectively investigate when something was broken and you do not want to use git bisect but find commit hashes cumbersome there are two generic shortcuts you may find useful:
You can use git checkout HEAD^^^ to go three commits back from wherever you are at the moment. You can append ^^s to branch and tag names as well.
Obviously this does not scale nicely, so instead of master^^^^^^^(..) you can use git checkout master~20 to go to the 20th most recent commit.
And once you are done git checkout master brings you back home.


*This is also true for bitshuffle, HDF5Plugin, eigen, tntbx, scons, gui_resources, clipper, ccp4io_adaptbx, ccp4io, boost, annlib_adaptbx, annlib, cbflib and even a repository containing all external dependency downloads.

From: cctbxbb-bounces at phenix-online.org [mailto:cctbxbb-bounces at phenix-online.org] On Behalf Of Luc Bourhis
Sent: 13 June 2016 16:52
To: cctbx mailing list
Subject: Re: [cctbxbb] Not wishing to raise this again but...

On 13 Jun 2016, at 17:09, Graeme.Winter at Diamond.ac.uk<mailto:Graeme.Winter at diamond.ac.uk> wrote:

… is there any enthusiasm out there for moving cctbx to git? The more I work with git the more I wish this existed properly for cctbx.

I’ve raised this a bunch of times and always it is “not right now” however “a good idea” – this’ll be the last time I ask…

Could we move to git, please? I note the bootstrap script for Windows now has a git dependency even!


… and time to share some thoughts! It would be great if we could get the cctbx up and running by just cloning, configuring and building without needing to download anything else.

That could be done by adding SCons, Boost, and ccp4io as  submodules in the cctbx repository. And I reckon ccp4io_adaptbx should be added as a subtree since it is developed by the same people as the cctbx.

Just an idea to think about as I haven’t not worked out the details at all.

Best wishes,


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
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://phenix-online.org/pipermail/cctbxbb/attachments/20160614/16100561/attachment-0001.htm>

More information about the cctbxbb mailing list