The command used was:
svn merge -r19283:19284 svn+ssh://bugman@.../svn/relax/branches/2.2 .
.....
r19284 | bugman | 2013-04-02 11:02:34 +0200 (Tue, 02 Apr 2013) | 10 lines
Changed paths:
M /branches/2.2/specific_analyses/consistency_tests.py
Fix for bug #20674 (https://gna.org/bugs/?20674) - the failure of the consistency testing analysis.
This was reported by Mengjun Xue <mengjun dott xue att mailbox dott tu-berlin dot de>.
The problem was that the first residue did not have a single proton 'H' in the PDB file, and
therefore the dipolar relaxation interaction was not set up. The overfit_deselect() method of the
consistency testing specific API was not checking for this. The method is now much more like that
of the model-free specific analysis.
.....