Hi Rob
I would say that this would be a rather dangerous default. You would lose any uncommitted changes and there is no way back. At least (assuming a git repository) do a git stash instead -- although to the unsuspecting non-expert user this would still look like the changes are lost.
How about: If changes present, warn the user and advise that they can irrevocably reset the repository with eg.
git reset --hard HEAD; git clean -dffx
-Markus
(I only ever use ‘update’ to do the initial checkout, so whatever the decision it wouldn’t affect me.)
From: [email protected] [mailto:[email protected]] On Behalf Of R.D. Oeffner
Sent: 14 February 2017 12:49
To: cctbx mailing list
Subject: [cctbxbb] bootstrap.py not overwriting modified sources
Hi all,
It appears that when bootstrap.py is invoked to update sources then unsurprisingly it doesn't overwrite existing sources if these are more recent, as in someone has modified them and not committed the changes. Occasionally this leads to broken builds.
To prevent this from happening would it not be a good idea to change bootstrap.py to default to overwrite any uncommitted changes unless some flag is set on the command line?
Rob
--
Robert Oeffner, Ph.D.
Research Associate, The Read Group
Department of Haematology,
Cambridge Institute for Medical Research
University of Cambridge
Cambridge Biomedical Campus
Wellcome Trust/MRC Building
Hills Road
Cambridge CB2 0XY
www.cimr.cam.ac.uk/investigators/read/index.htmlhttp://www.cimr.cam.ac.uk/investigators/read/index.html
tel: +44(0)1223 763234
mobile: +44(0)7712 887162
--
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
