The commands used were:
svn merge -r18860:18861 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18861:18862 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18862:18863 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18863:18864 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18864:18865 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
The console messages were:
[edau@... relax-trunk]$ svn merge -r18860:18861 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18861 into '.':
U auto_analyses/frame_order.py
[edau@... relax-trunk]$ svn merge -r18861:18862 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18862 into '.':
G auto_analyses/frame_order.py
[edau@... relax-trunk]$ svn merge -r18862:18863 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18863 into '.':
U specific_fns/frame_order.py
U user_functions/frame_order.py
[edau@... relax-trunk]$ svn merge -r18863:18864 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18864 into '.':
G specific_fns/frame_order.py
[edau@... relax-trunk]$ svn merge -r18864:18865 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18865 into '.':
G specific_fns/frame_order.py
[edau@... relax-trunk]$
