The 2 commands used were:
svn merge -r3242:3243 svn+ssh://bugman@.../svn/relax/branches/multi_processor .
svn merge -r3242:3243 svn+ssh://bugman@.../svn/relax/branches/multi_processor/specific_fns/model_free.py specific_fns/model_free/mf_minimise.py
This code is becoming horribly broken. This can't be fixed yet as it will make porting impossible!
.....
r3243 | varioustoxins | 2007-03-29 11:45:22 +0200 (Thu, 29 Mar 2007) | 4 lines
Changed paths:
M /branches/multi_processor/multi/mpi4py_processor.py
M /branches/multi_processor/multi/uni_processor.py
M /branches/multi_processor/prompt/interpreter.py
M /branches/multi_processor/relax
M /branches/multi_processor/specific_fns/model_free.py
First fully working multi branch with both uniprocessor and mpi4py support
communication overhead for 18 residues (test_short.py from chris) with
in memory io ~25%
.....