The command used was:
svn merge -r15412:r15411 .
.....
r15412 | bugman | 2012-02-29 16:16:59 +0100 (Wed, 29 Feb 2012) | 7 lines
Changed paths:
M /1.3/multi/api.py
M /1.3/multi/multi_processor_base.py
M /1.3/multi/uni_processor.py
M /1.3/specific_fns/model_free/multi_processor_commands.py
Simplification and abstraction of the Slave_command.run() method.
The Processor now calls the _run() method of the Slave_command base class. This is a wrapper for
run() which performs the exception handling. Therefore the program code, such as
MF_minimise_command, is no longer required to handle the multi-processor specific error handling.
.....