The command used was:
svn merge -r16865:r16866 svn+ssh://bugman@.../svn/relax/trunk .
.....
r16866 | bugman | 2012-06-11 21:05:16 +0200 (Mon, 11 Jun 2012) | 6 lines
Changed paths:
M /trunk/test_suite/gui_tests/model_free.py
Bug fix for a segmentation fault occurring during the model-free GUI test.
Flushing of the interpreter queue object is needed as some parts of the interface use asynchronous
user function calls.
.....