The commands used were:
svn merge -r15290:15291 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15291:15292 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15292:15293 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15293:15294 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15294:15295 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15295:15296 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15296:15297 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15297:15298 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15298:15299 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15299:15300 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
The console messages were:
[edau@... relax-trunk]$ svn merge -r15290:15291 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15291 into '.':
U maths_fns/frame_order.py
U specific_fns/frame_order.py
[edau@... relax-trunk]$ svn merge -r15291:15292 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15292 into '.':
U test_suite/system_tests/scripts/frame_order/cam/base_script.py
U test_suite/system_tests/scripts/frame_order/cam/rotor.py
[edau@... relax-trunk]$ svn merge -r15292:15293 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15293 into '.':
U test_suite/system_tests/frame_order.py
[edau@... relax-trunk]$ svn merge -r15293:15294 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15294 into '.':
U maths_fns/frame_order_matrix_ops.py
G maths_fns/frame_order.py
[edau@... relax-trunk]$ svn merge -r15294:15295 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15295 into '.':
G maths_fns/frame_order.py
[edau@... relax-trunk]$ svn merge -r15295:15296 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15296 into '.':
U test_suite/system_tests/scripts/frame_order/cam/free_rotor2.py
U test_suite/system_tests/scripts/frame_order/cam/pseudo_ellipse.py
U test_suite/system_tests/scripts/frame_order/cam/iso_cone.py
U test_suite/system_tests/scripts/frame_order/cam/rigid.py
U test_suite/system_tests/scripts/frame_order/cam/pseudo_ellipse_torsionless.py
U test_suite/system_tests/scripts/frame_order/cam/iso_cone_torsionless.py
U test_suite/system_tests/scripts/frame_order/cam/pseudo_ellipse_free_rotor.py
U test_suite/system_tests/scripts/frame_order/cam/iso_cone_free_rotor.py
U test_suite/system_tests/scripts/frame_order/cam/free_rotor.py
U test_suite/system_tests/scripts/frame_order/cam/iso_cone_free_rotor2.py
U test_suite/system_tests/scripts/frame_order/cam/rotor2.py
[edau@... relax-trunk]$ svn merge -r15296:15297 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15297 into '.':
G maths_fns/frame_order.py
[edau@... relax-trunk]$ svn merge -r15297:15298 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15298 into '.':
G maths_fns/frame_order.py
[edau@... relax-trunk]$ svn merge -r15298:15299 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15299 into '.':
G maths_fns/frame_order_matrix_ops.py
[edau@... relax-trunk]$ svn merge -r15299:15300 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15300 into '.':
G specific_fns/frame_order.py
[edau@... relax-trunk]$