The commands used were:
svn merge -r18033:18034 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18035:18036 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18036:18037 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18037:18038 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18041:18042 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18070:18071 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18085:18086 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
The console messages were:
[edau@... relax-trunk]$ svn merge -r18033:18034 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18034 into '.':
U specific_fns/frame_order.py
[edau@... relax-trunk]$ svn merge -r18035:18036 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18036 into '.':
G specific_fns/frame_order.py
[edau@... relax-trunk]$ svn merge -r18036:18037 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18037 into '.':
U test_suite/shared_data/frame_order/cam/pseudo_ellipse/frame_order.py
[edau@... relax-trunk]$ svn merge -r18037:18038 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18038 into '.':
A test_suite/shared_data/frame_order/cam/pseudo_ellipse_torsionless/full_analysis.py
A test_suite/shared_data/frame_order/cam/iso_cone_free_rotor/full_analysis.py
A test_suite/shared_data/frame_order/cam/rotor_2_state/full_analysis.py
A test_suite/shared_data/frame_order/cam/rotor2/full_analysis.py
A test_suite/shared_data/frame_order/cam/free_rotor2/full_analysis.py
A test_suite/shared_data/frame_order/cam/rigid/full_analysis.py
A test_suite/shared_data/frame_order/cam/iso_cone/full_analysis.py
A test_suite/shared_data/frame_order/cam/pseudo_ellipse2/full_analysis.py
A test_suite/shared_data/frame_order/cam/iso_cone_torsionless/full_analysis.py
A test_suite/shared_data/frame_order/cam/pseudo_ellipse_free_rotor/full_analysis.py
A test_suite/shared_data/frame_order/cam/rotor/full_analysis.py
A test_suite/shared_data/frame_order/cam/iso_cone_free_rotor2/full_analysis.py
A test_suite/shared_data/frame_order/cam/free_rotor/full_analysis.py
A test_suite/shared_data/frame_order/cam/pseudo_ellipse/full_analysis.py
[edau@... relax-trunk]$ svn merge -r18041:18042 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18042 into '.':
U test_suite/system_tests/frame_order.py
[edau@... relax-trunk]$ svn merge -r18070:18071 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18071 into '.':
U test_suite/system_tests/align_tensor.py
[edau@... relax-trunk]$ svn merge -r18085:18086 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18086 into '.':
U auto_analyses/frame_order.py
[edau@... relax-trunk]$