The commands used were:
svn merge -r15381:15382 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15383:15384 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15386:15387 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15428:15429 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15429:15430 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15433:15434 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15436:15437 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15437:15438 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15438:15439 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
The console messages were:
[edau@... relax-trunk]$ svn merge -r15381:15382 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15382 into '.':
U test_suite/system_tests/scripts/frame_order/cam/iso_cone_torsionless.py
[edau@... relax-trunk]$ svn merge -r15383:15384 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15384 into '.':
U test_suite/shared_data/frame_order/cam/iso_cone_torsionless/generate_distribution.py
U test_suite/shared_data/frame_order/cam/iso_cone_torsionless/rdc_dy.txt
U test_suite/shared_data/frame_order/cam/iso_cone_torsionless/rdc_tm.txt
U test_suite/shared_data/frame_order/cam/iso_cone_torsionless/pcs_tb.txt
U test_suite/shared_data/frame_order/cam/iso_cone_torsionless/pcs_er.txt
U test_suite/shared_data/frame_order/cam/iso_cone_torsionless/pcs_dy.txt
U test_suite/shared_data/frame_order/cam/iso_cone_torsionless/pcs_tm.txt
U test_suite/shared_data/frame_order/cam/iso_cone_torsionless/generate_distribution.log.bz2
A test_suite/shared_data/frame_order/cam/iso_cone_torsionless/axis_system
A test_suite/shared_data/frame_order/cam/iso_cone_torsionless/frame_order_matrix
U test_suite/shared_data/frame_order/cam/iso_cone_torsionless/rdc_tb.txt
U test_suite/shared_data/frame_order/cam/iso_cone_torsionless/rdc_er.txt
[edau@... relax-trunk]$ svn merge -r15386:15387 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15387 into '.':
U test_suite/shared_data/frame_order/cam/opt_stats
U test_suite/system_tests/frame_order.py
[edau@... relax-trunk]$ svn merge -r15428:15429 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15429 into '.':
U test_suite/system_tests/scripts/frame_order/cam/iso_cone_free_rotor2.py
[edau@... relax-trunk]$ svn merge -r15429:15430 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15430 into '.':
U test_suite/shared_data/frame_order/cam/pseudo_ellipse2/frame_order.log.bz2
U test_suite/shared_data/frame_order/cam/pseudo_ellipse2/frame_order.py
[edau@... relax-trunk]$ svn merge -r15433:15434 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15434 into '.':
U maths_fns/frame_order_matrix_ops.py
[edau@... relax-trunk]$ svn merge -r15436:15437 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15437 into '.':
G maths_fns/frame_order_matrix_ops.py
[edau@... relax-trunk]$ svn merge -r15437:15438 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15438 into '.':
G test_suite/shared_data/frame_order/cam/opt_stats
U test_suite/system_tests/scripts/frame_order/cam/pseudo_ellipse.py
G test_suite/system_tests/frame_order.py
[edau@... relax-trunk]$ svn merge -r15438:15439 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15439 into '.':
G maths_fns/frame_order_matrix_ops.py
[edau@... relax-trunk]$