The commands used were:
svn merge -r15372:15373 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15373:15374 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15374:15375 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15375:15376 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15376:15377 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15377:15378 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15378:15379 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
The console messages were:
[edau@... relax-trunk]$ svn merge -r15372:15373 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15373 into '.':
U test_suite/shared_data/frame_order/cam/opt_stats
U test_suite/system_tests/scripts/frame_order/cam/free_rotor2.py
U test_suite/system_tests/frame_order.py
[edau@... relax-trunk]$ svn merge -r15373:15374 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15374 into '.':
G test_suite/system_tests/scripts/frame_order/cam/free_rotor2.py
[edau@... relax-trunk]$ svn merge -r15374:15375 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15375 into '.':
G test_suite/system_tests/frame_order.py
[edau@... relax-trunk]$ svn merge -r15375:15376 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15376 into '.':
G test_suite/shared_data/frame_order/cam/opt_stats
U test_suite/system_tests/scripts/frame_order/cam/iso_cone_free_rotor2.py
G test_suite/system_tests/frame_order.py
svn merge -r15376:15377 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
[edau@... relax-trunk]$ svn merge -r15376:15377 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15377 into '.':
G test_suite/system_tests/scripts/frame_order/cam/free_rotor2.py
[edau@... relax-trunk]$ svn merge -r15377:15378 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15378 into '.':
G test_suite/system_tests/frame_order.py
[edau@... relax-trunk]$ svn merge -r15378:15379 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15379 into '.':
G test_suite/system_tests/frame_order.py
[edau@... relax-trunk]$
