The command used was:
svn merge -r25927:r25926 .
.....
r25927 | bugman | 2014-09-19 18:29:51 +0200 (Fri, 19 Sep 2014) | 6 lines
Changed paths:
M /trunk/auto_analyses/frame_order.py
Updated the frame order auto-analysis to call the new frame_order.simulate user function.
Although not implemented yet, this allows the user function to create the simulation PDB file in the
future.
.....