The command was:
svn merge -r27325:r27324 .
The 'Bus Error' on Mac OS X due to this test is no longer an issue, as the spin viewer window is now
destroyed after each GUI test.
.....
r27325 | bugman | 2015-01-27 11:35:39 +0100 (Tue, 27 Jan 2015) | 6 lines
Changed paths:
M /trunk/test_suite/gui_tests/general.py
Disabled the General.test_bug_23187_residue_delete_gui GUI test.
This is essential as a wxPython bug in Mac OS X systems causes this test to trigger a 'Bus Error'
every time the GUI tests are run, killing relax.
.....
