The command used was:
svn merge -r3357:3358 svn+ssh://bugman@.../svn/relax/1.2
.....
r3358 | bugman | 2007-10-21 17:59:42 +0200 (Sun, 21 Oct 2007) | 9 lines
Changed paths:
M /1.2/sample_scripts/full_analysis.py
Doug's patch for fixing bug #10022 (https://gna.org/bugs/?10022).
The patch by Douglas Kojetin (https://gna.org/users/dkojetin) labelled as 'patch2' and attached to
the bug report has been applied without modification.
This change fixes the convergence test in the 'full_analysis.py' script which fails when one residue
has the model None associated with it. These situations are now caught and skipped.
.....
