The commands used were:
svn merge -r18630:18631 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18631:18632 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18632:18633 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18633:18634 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18634:18635 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18635:18636 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18636:18637 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18637:18638 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18638:18639 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18639:18640 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
The console messages were:
[edau@... relax-trunk]$ svn merge -r18630:18631 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18631 into '.':
U maths_fns/frame_order/__init__.py
U specific_fns/frame_order.py
[edau@... relax-trunk]$ svn merge -r18631:18632 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18632 into '.':
G specific_fns/frame_order.py
[edau@... relax-trunk]$ svn merge -r18632:18633 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18633 into '.':
G specific_fns/frame_order.py
[edau@... relax-trunk]$ svn merge -r18633:18634 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18634 into '.':
U auto_analyses/frame_order.py
[edau@... relax-trunk]$ svn merge -r18634:18635 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
[edau@... relax-trunk]$ svn merge -r18635:18636 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18636 into '.':
G maths_fns/frame_order/__init__.py
[edau@... relax-trunk]$ svn merge -r18636:18637 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18637 into '.':
G maths_fns/frame_order/__init__.py
[edau@... relax-trunk]$ svn merge -r18637:18638 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18638 into '.':
U test_suite/system_tests/scripts/frame_order/rigid_test.py
[edau@... relax-trunk]$ svn merge -r18638:18639 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18639 into '.':
U test_suite/system_tests/scripts/frame_order/cam/free_rotor2.py
U test_suite/system_tests/scripts/frame_order/cam/free_rotor_missing_data.py
U test_suite/system_tests/scripts/frame_order/cam/iso_cone.py
U test_suite/system_tests/scripts/frame_order/cam/pseudo_ellipse2.py
U test_suite/system_tests/scripts/frame_order/cam/rigid.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/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/pseudo_ellipse.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_free_rotor.py
U test_suite/system_tests/scripts/frame_order/cam/rotor_2_state.py
U test_suite/system_tests/scripts/frame_order/cam/rotor2.py
[edau@... relax-trunk]$ svn merge -r18639:18640 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18640 into '.':
U test_suite/system_tests/frame_order.py
[edau@... relax-trunk]$