The commands used were:
svn merge -r15360:15361 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15361:15362 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15362:15363 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15363:15364 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15364:15365 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15365:15366 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15366:15367 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15367:15368 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15368:15369 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
The console messages were:
[edau@... relax-trunk]$ svn merge -r15360:15361 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15361 into '.':
U test_suite/shared_data/frame_order/cam/rotor/generate_distribution.py
[edau@... relax-trunk]$ svn merge -r15361:15362 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15362 into '.':
U test_suite/shared_data/frame_order/cam/free_rotor2/generate_distribution.py
U test_suite/shared_data/frame_order/cam/iso_cone_free_rotor2/generate_distribution.py
U test_suite/shared_data/frame_order/cam/generate_base.py
[edau@... relax-trunk]$ svn merge -r15362:15363 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15363 into '.':
U test_suite/shared_data/frame_order/cam/rotor2/generate_distribution.py
G test_suite/shared_data/frame_order/cam/free_rotor2/generate_distribution.py
G test_suite/shared_data/frame_order/cam/rotor/generate_distribution.py
U test_suite/shared_data/frame_order/cam/free_rotor/generate_distribution.py
[edau@... relax-trunk]$ svn merge -r15363:15364 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15364 into '.':
A test_suite/system_tests/scripts/frame_order/cam/rotor_2_state.py
U test_suite/system_tests/frame_order.py
[edau@... relax-trunk]$ svn merge -r15364:15365 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15365 into '.':
U test_suite/shared_data/frame_order/cam/opt_stats
[edau@... relax-trunk]$ svn merge -r15365:15366 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15366 into '.':
G test_suite/system_tests/frame_order.py
[edau@... relax-trunk]$ svn merge -r15366:15367 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15367 into '.':
A test_suite/shared_data/frame_order/cam/pseudo_ellipse2
A test_suite/shared_data/frame_order/cam/pseudo_ellipse2/generate_distribution.py
A test_suite/shared_data/frame_order/cam/pseudo_ellipse2/frame_order.bz2
A test_suite/shared_data/frame_order/cam/pseudo_ellipse2/rdc_dy.txt
A test_suite/shared_data/frame_order/cam/pseudo_ellipse2/tensors.py
A test_suite/shared_data/frame_order/cam/pseudo_ellipse2/rdc_tm.txt
A test_suite/shared_data/frame_order/cam/pseudo_ellipse2/tensor_fit.log.bz2
A test_suite/shared_data/frame_order/cam/pseudo_ellipse2/cone.pdb
A test_suite/shared_data/frame_order/cam/pseudo_ellipse2/pcs_tb.txt
A test_suite/shared_data/frame_order/cam/pseudo_ellipse2/pcs_er.txt
A test_suite/shared_data/frame_order/cam/pseudo_ellipse2/pcs_dy.txt
A test_suite/shared_data/frame_order/cam/pseudo_ellipse2/ave_pos.pdb
A test_suite/shared_data/frame_order/cam/pseudo_ellipse2/frame_order.log.bz2
A test_suite/shared_data/frame_order/cam/pseudo_ellipse2/tensor_fit.py
A test_suite/shared_data/frame_order/cam/pseudo_ellipse2/pcs_tm.txt
A test_suite/shared_data/frame_order/cam/pseudo_ellipse2/animate.py
A test_suite/shared_data/frame_order/cam/pseudo_ellipse2/generate_distribution.log.bz2
A test_suite/shared_data/frame_order/cam/pseudo_ellipse2/axis_system
A test_suite/shared_data/frame_order/cam/pseudo_ellipse2/axis.pdb
A test_suite/shared_data/frame_order/cam/pseudo_ellipse2/frame_order_matrix
A test_suite/shared_data/frame_order/cam/pseudo_ellipse2/rdc_tb.txt
A test_suite/shared_data/frame_order/cam/pseudo_ellipse2/frame_order.py
A test_suite/shared_data/frame_order/cam/pseudo_ellipse2/rdc_er.txt
A test_suite/system_tests/scripts/frame_order/cam/pseudo_ellipse2.py
G test_suite/system_tests/frame_order.py
[edau@... relax-trunk]$ svn merge -r15367:15368 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15368 into '.':
U test_suite/shared_data/frame_order/cam/pseudo_ellipse2/rdc_dy.txt
U test_suite/shared_data/frame_order/cam/pseudo_ellipse2/rdc_tm.txt
U test_suite/shared_data/frame_order/cam/pseudo_ellipse2/pcs_tb.txt
U test_suite/shared_data/frame_order/cam/pseudo_ellipse2/pcs_er.txt
U test_suite/shared_data/frame_order/cam/pseudo_ellipse2/pcs_dy.txt
U test_suite/shared_data/frame_order/cam/pseudo_ellipse2/pcs_tm.txt
U test_suite/shared_data/frame_order/cam/pseudo_ellipse2/generate_distribution.log.bz2
U test_suite/shared_data/frame_order/cam/pseudo_ellipse2/frame_order_matrix
U test_suite/shared_data/frame_order/cam/pseudo_ellipse2/rdc_tb.txt
U test_suite/shared_data/frame_order/cam/pseudo_ellipse2/rdc_er.txt
[edau@... relax-trunk]$ svn merge -r15368:15369 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15369 into '.':
G test_suite/shared_data/frame_order/cam/opt_stats
[edau@... relax-trunk]$