The command used was:
svn merge -r16878:r16879 svn+ssh://bugman@.../svn/relax/trunk .
.....
r16879 | bugman | 2012-06-12 11:34:42 +0200 (Tue, 12 Jun 2012) | 6 lines
Changed paths:
M /trunk/generic_fns/pipes.py
M /trunk/gui/misc.py
M /trunk/multi/processor.py
M /trunk/prompt/uf_docstring.py
Reverted the 2to3 changes of r16837 as these are deadly for Python 2.6!
The command used was:
svn merge -r16837:16836 .
.....