The commands used were:
svn merge -r17300:17301 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r17301:17302 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r17302:17303 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r17303:17304 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r17304:17305 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r17305:17306 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r17306:17307 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r17307:17308 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r17308:17309 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r17309:17310 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
The console messages were:
[edau@... relax-trunk]$ svn merge -r17300:17301 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
[edau@... relax-trunk]$ svn merge -r17301:17302 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r17302 into '.':
U test_suite/shared_data/frame_order/cam/opt_stats
[edau@... relax-trunk]$ svn merge -r17302:17303 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r17303 into '.':
G test_suite/shared_data/frame_order/cam/opt_stats
U test_suite/shared_data/frame_order/cam/free_rotor/frame_order.py
[edau@... relax-trunk]$ svn merge -r17303:17304 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r17304 into '.':
G test_suite/shared_data/frame_order/cam/opt_stats
U test_suite/shared_data/frame_order/cam/rotor2/frame_order.py
U test_suite/shared_data/frame_order/cam/rotor/frame_order.py
[edau@... relax-trunk]$ svn merge -r17304:17305 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r17305 into '.':
G test_suite/shared_data/frame_order/cam/opt_stats
[edau@... relax-trunk]$ svn merge -r17305:17306 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r17306 into '.':
U test_suite/system_tests/frame_order.py
[edau@... relax-trunk]$ svn merge -r17306:17307 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r17307 into '.':
G test_suite/shared_data/frame_order/cam/opt_stats
[edau@... relax-trunk]$ svn merge -r17307:17308 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r17308 into '.':
U test_suite/shared_data/frame_order/cam/generate_base.py
[edau@... relax-trunk]$ svn merge -r17308:17309 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r17309 into '.':
U test_suite/system_tests/scripts/n_state_model/5_state_xz.py
[edau@... relax-trunk]$ svn merge -r17309:17310 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r17310 into '.':
U generic_fns/align_tensor.py
U user_functions/align_tensor.py
[edau@... relax-trunk]$
