[cctbxbb] Branches

[Graeme.Winter at Diamond.ac.uk]

Hi Luc,

As a lone developer this would make a lot of sense - however I'm working with others on these projects so it would be a pain to go this way. However, a corollary of this is that it would be neat to be using a distributed system - is there any scope for doing that?

I suspect in the meantime a couple of well defined branches (with clearly defined merge points) would work OK…

Thanks,

Graeme



On 20 Apr 2012, at 13:27, Luc Bourhis wrote:

> Hi Graeme,
> 
>> Quick question - does anyone ever use branches with the CCTBX repository? Just at the moment I'm up to a few things which I would like to be able to commit, but I don't want to break the existing code... however as a project it does not seem CCTBX uses branches much...
> 
> There are 2 reasons for branches not being used much:
> (a) subversion branches used to be very difficult to use correctly and even nowadays I would not rule out there are still dark corners when it comes to merging
> (b) cctbx developers, and especially our beloved overseer for life, is fairly tolerant with *temporary* breakages: as long as you announce coming commits as potentially dangerous, and you have tested at least on one of the Linux test machine, and you fix any problem within a few days, then we will be more than happy to cope.
> However, if you envision that your coding adventures are going to span several dozen commits, a good fraction of which you may eventually throw away, then, the trunk may not be the right place to work. If you are unsure, feel free to discuss the matter here or directly with our beloved overseer for life. 
> 
> My personal solution to this problem is to keep a local git mirror of the subversion repository on my machine and to heavily use branches in there. In my humble opinion, this is a superior solution because git is so much better at branching and merging than subversion. Eventually I may end up pushing several dozen of commits to sourceforge in one go because I have tested on a handful of machines, using git to keep it all in sync. this is far superior a working pattern than using subversion. Note that you could substitute mercurial instead of git in that paragraph of mine without changing the conclusions.
> 
> Best wishes,
> 
> Luc
> 
> _______________________________________________
> cctbxbb mailing list
> cctbxbb at phenix-online.org
> http://phenix-online.org/mailman/listinfo/cctbxbb


-- 
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