The command used was:
svn merge -r27243:r27242 .
This was discussed at http://thread.gmane.org/gmane.science.nmr.relax.devel/7502/focus=7512.
.....
r27243 | bugman | 2015-01-20 15:13:19 +0100 (Tue, 20 Jan 2015) | 6 lines
Changed paths:
M /trunk/test_suite/test_suite_runner.py
The GUI tests are now skipped for wxPython version <= 2.8 due to bugs causing fatal segfaults.
This follows from http://thread.gmane.org/gmane.science.nmr.relax.devel/7502. These wxPython
versions are simply too buggy.
.....