<div dir="ltr">Hi,<div><br></div><div style>we already fixed the whitespace for all files both in 4.6 and master. See <a href="http://redmine.gromacs.org/issues/845">http://redmine.gromacs.org/issues/845</a> for details.</div>
<div style>If you use the script/config in <a href="https://gerrit.gromacs.org/#/c/2155/">https://gerrit.gromacs.org/#/c/2155/</a> (either by manually running the script on your branch before merging or using the gitattributes) you should have no problem with merging. </div>
<div style><br></div><div style>Roland</div></div><div class="gmail_extra"><br><br><div class="gmail_quote">On Sat, Mar 16, 2013 at 5:02 PM, David van der Spoel <span dir="ltr"><<a href="mailto:spoel@xray.bmc.uu.se" target="_blank">spoel@xray.bmc.uu.se</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 just merged the master branch in one of my development branches and<br>
had to do a look of fixes due to "cleaning up" in the master branch of<br>
files that I had edited as well. The problem is extra indentation etc.,<br>
renaming of variables from using underscores to Capitals etc. Such<br>
changes are then hard to distinguish from the real code changes, which<br>
usually is minute.<br>
<br>
Since there are quite a few branches out there I suspect more people<br>
have this problem. So the question here is whether we can<br>
<br>
A) install a policy where we do NOT change the indentation of code and<br>
spacing in general just for better looks. One more reason for this is<br>
that it makes tracking history difficult.<br>
<br>
or<br>
<br>
B) update the indentation of all code at once to make it comply with the<br>
4 spaces indentation that is to be the new standard. Drawback is that<br>
history tracking becomes more difficult, but at least we'll get it over<br>
and done with.<br>
<br>
(changes were in physics.[ch], pdb2top.[ch], gen_ad.[ch], atomprop.[ch]<br>
and maybe more)<br>
<br>
Comments?<br>
<span class="HOEnZb"><font color="#888888">--<br>
David van der Spoel, Ph.D., Professor of Biology<br>
Dept. of Cell & Molec. Biol., Uppsala University.<br>
Box 596, 75124 Uppsala, Sweden. Phone: <a href="tel:%2B46184714205" value="+46184714205">+46184714205</a>.<br>
<a href="mailto:spoel@xray.bmc.uu.se">spoel@xray.bmc.uu.se</a> <a href="http://folding.bmc.uu.se" target="_blank">http://folding.bmc.uu.se</a><br>
--<br>
gmx-developers mailing list<br>
<a href="mailto:gmx-developers@gromacs.org">gmx-developers@gromacs.org</a><br>
<a href="http://lists.gromacs.org/mailman/listinfo/gmx-developers" target="_blank">http://lists.gromacs.org/mailman/listinfo/gmx-developers</a><br>
Please don't post (un)subscribe requests to the list. Use the<br>
www interface or send it to <a href="mailto:gmx-developers-request@gromacs.org">gmx-developers-request@gromacs.org</a>.<br>
<br>
<br>
<br>
<br>
</font></span></blockquote></div><br><br clear="all"><div><br></div>-- <br>ORNL/UT Center for Molecular Biophysics <a href="http://cmb.ornl.gov">cmb.ornl.gov</a><br>865-241-1537, ORNL PO BOX 2008 MS6309
</div>