The command used was:
svn merge -r3268:3271 svn+ssh://bugman@.../svn/relax/branches/multi_processor .
.....
r3271 | varioustoxins | 2007-04-23 13:06:57 +0200 (Mon, 23 Apr 2007) | 3 lines
Changed paths:
M /branches/multi_processor/multi/mpi4py_processor.py
threaded results output to _TRY_ to avoid starving multiprocessor while
waiting for stdio
------------------------------------------------------------------------
r3270 | varioustoxins | 2007-04-21 03:18:39 +0200 (Sat, 21 Apr 2007) | 2 lines
Changed paths:
M /branches/multi_processor/multi/mpi4py_processor.py
forgot to remove sys.exit used in testing
------------------------------------------------------------------------
r3269 | varioustoxins | 2007-04-21 03:17:26 +0200 (Sat, 21 Apr 2007) | 2 lines
Changed paths:
M /branches/multi_processor/multi/PrependStringIO.py
M /branches/multi_processor/multi/commands.py
M /branches/multi_processor/multi/mpi4py_processor.py
M /branches/multi_processor/multi/processor.py
batched retrun results and better sys.exit and exception handling behaviour
.....