<div dir="ltr">Guys<div><br></div><div>The chem_data SVN has a submodule (GeoStd) and it acts as a almost entirely integrated tree in SVN. I did some research during the last round of "SVN to Git move must we" and was not impressed with the support for submodules in Git. Does anyone have experience with them?</div></div><div class="gmail_extra"><br clear="all"><div><div class="gmail_signature" data-smartmail="gmail_signature"><div dir="ltr"><div><div dir="ltr"><div dir="ltr">Cheers<div><br></div><div>Nigel<div><br></div><div>---</div><div>Nigel W. Moriarty<br>Building 33R0349, Molecular Biophysics and Integrated Bioimaging</div><div>Lawrence Berkeley National Laboratory<br>Berkeley, CA 94720-8235<br>Phone : 510-486-5709 Email : NWMoriarty@LBL.gov<br>Fax : 510-486-5909 Web : <a href="http://CCI.LBL.gov" target="_blank">CCI.LBL.gov</a></div></div></div></div></div></div></div></div>
<br><div class="gmail_quote">On Thu, Jun 16, 2016 at 4:52 AM, <span dir="ltr"><<a href="mailto:markus.gerstel@diamond.ac.uk" target="_blank">markus.gerstel@diamond.ac.uk</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Hi,<br>
<br>
I'm don't really mind whether we do submodules or not, as long as bootstrap will be able to deal with older git versions that do not support submodules. If we got the development history of these modules, say ccp4io, I would be happy to convert them to git, too.<br>
It forms part of a larger debate if we want to merge modules such as ccp4io into the cctbx repository, or break them apart - for example I suspect eg. xfel could move into a separate repository. Again I can offer to merge the histories and/or separate projects. But these decisions are above my paygrade.<br>
<br>
-Markus<br>
<span class="im HOEnZb"><br>
<br>
<br>
-----Original Message-----<br>
From: <a href="mailto:cctbxbb-bounces@phenix-online.org">cctbxbb-bounces@phenix-online.org</a> [mailto:<a href="mailto:cctbxbb-bounces@phenix-online.org">cctbxbb-bounces@phenix-online.org</a>] On Behalf Of Luc Bourhis<br>
Sent: 16 June 2016 12:29<br>
To: cctbx mailing list<br>
</span><div class="HOEnZb"><div class="h5">Subject: Re: [cctbxbb] Not wishing to raise this again but...<br>
<br>
<br>
> On 16 Jun 2016, at 13:16, Marcin Wojdyr <<a href="mailto:wojdyr@gmail.com">wojdyr@gmail.com</a>> wrote:<br>
><br>
>> As for boost, SCons and ccp4io, I guess you propose to just<br>
>> incorporate their whole directory tree in one single commit<br>
><br>
> I don't have an opinion here. Submodule are fine. Do you mean making<br>
> git repositories for these three projects and adding them as<br>
> submodules?<br>
<br>
Boost has already an official git repository but SCons does not. So for SCons, the git submodule solution would indeed require creating git repositories. What about ccp4io? There is no official git repo, is there?<br>
<br>
Just to make it clear what I meant with “one single commit”: copy the whole SCons directory at the top of the cctbx hierarchy, then “git add scons” and then “git commit”.<br>
<br>
<br>
_______________________________________________<br>
cctbxbb mailing list<br>
<a href="mailto:cctbxbb@phenix-online.org">cctbxbb@phenix-online.org</a><br>
<a href="http://phenix-online.org/mailman/listinfo/cctbxbb" rel="noreferrer" target="_blank">http://phenix-online.org/mailman/listinfo/cctbxbb</a><br>
<br>
</div></div><span class="im HOEnZb">--<br>
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.<br>
Any opinions expressed within this e-mail are those of the individual and not necessarily of Diamond Light Source Ltd.<br>
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.<br>
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<br>
<br>
</span><div class="HOEnZb"><div class="h5">_______________________________________________<br>
cctbxbb mailing list<br>
<a href="mailto:cctbxbb@phenix-online.org">cctbxbb@phenix-online.org</a><br>
<a href="http://phenix-online.org/mailman/listinfo/cctbxbb" rel="noreferrer" target="_blank">http://phenix-online.org/mailman/listinfo/cctbxbb</a><br>
</div></div></blockquote></div><br></div>