The command used was:
svn merge -r3245:3246 svn+ssh://bugman@.../svn/relax/branches/multi_processor .
.....
r3246 | varioustoxins | 2007-03-29 19:43:49 +0200 (Thu, 29 Mar 2007) | 3 lines
Changed paths:
M /branches/multi_processor/multi/mpi4py_processor.py
A /branches/multi_processor/multi/processor.py
M /branches/multi_processor/multi/uni_processor.py
corrections to remove unexpected calls of from mpi4py import MPI in
mpi4py_processor from uniprocessor leading to an unexpected requirement of mpi4py
.....