The command used was:
svn merge -r14394:14395 svn+ssh://bugman@.../svn/relax/branches/gui_testing .
.....
r14395 | bugman | 2011-08-17 09:02:54 +0200 (Wed, 17 Aug 2011) | 6 lines
Changed paths:
M /branches/gui_testing/gui/controller.py
Created Redirect_text.flush() for the relax controller for compatibility with the multi-processor code.
The multi-processor code calls sys.stdout.flush() and sys.stderr.flush(), so these need to be
mimicked in the Redirect_text pseudo file object class.
.....
