The commands used were:
svn merge -r15150:15151 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15151:15152 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15152:15153 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15153:15154 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15154:15155 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15155:15156 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15156:15157 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15157:15158 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15158:15159 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15159:15160 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
The console messages were:
[edau@... relax-trunk]$ svn merge -r15150:15151 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15151 into '.':
U test_suite/shared_data/frame_order/pseudo_ellipse_torsionless/frame_order.bz2
U test_suite/shared_data/frame_order/pseudo_ellipse_torsionless/rdc_dy.txt
U test_suite/shared_data/frame_order/pseudo_ellipse_torsionless/tensors.py
U test_suite/shared_data/frame_order/pseudo_ellipse_torsionless/rdc_tm.txt
U test_suite/shared_data/frame_order/pseudo_ellipse_torsionless/tensor_fit.log.bz2
U test_suite/shared_data/frame_order/pseudo_ellipse_torsionless/cone.pdb
U test_suite/shared_data/frame_order/pseudo_ellipse_torsionless/pcs_tb.txt
U test_suite/shared_data/frame_order/pseudo_ellipse_torsionless/pcs_er.txt
U test_suite/shared_data/frame_order/pseudo_ellipse_torsionless/README
U test_suite/shared_data/frame_order/pseudo_ellipse_torsionless/pcs_dy.txt
U test_suite/shared_data/frame_order/pseudo_ellipse_torsionless/ave_pos.pdb
U test_suite/shared_data/frame_order/pseudo_ellipse_torsionless/frame_order.log.bz2
U test_suite/shared_data/frame_order/pseudo_ellipse_torsionless/pcs_tm.txt
U test_suite/shared_data/frame_order/pseudo_ellipse_torsionless/rdc_tb.txt
U test_suite/shared_data/frame_order/pseudo_ellipse_torsionless/frame_order.py
U test_suite/shared_data/frame_order/pseudo_ellipse_torsionless/rdc_er.txt
[edau@... relax-trunk]$ svn merge -r15151:15152 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15152 into '.':
U test_suite/shared_data/frame_order/iso_cone_free_rotor/README
U test_suite/shared_data/frame_order/rotor_2_state/README
U test_suite/shared_data/frame_order/rotor2/README
U test_suite/shared_data/frame_order/free_rotor2/README
U test_suite/shared_data/frame_order/iso_cone/README
U test_suite/shared_data/frame_order/rotor/README
U test_suite/shared_data/frame_order/iso_cone_free_rotor2/README
A test_suite/shared_data/frame_order/free_rotor/README
[edau@... relax-trunk]$ svn merge -r15152:15153 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15153 into '.':
U maths_fns/frame_order_matrix_ops.py
[edau@... relax-trunk]$ svn merge -r15153:15154 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15154 into '.':
U maths_fns/frame_order.py
[edau@... relax-trunk]$ svn merge -r15154:15155 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15155 into '.':
G maths_fns/frame_order_matrix_ops.py
[edau@... relax-trunk]$ svn merge -r15155:15156 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15156 into '.':
U test_suite/shared_data/frame_order/rotor2/frame_order.py
U test_suite/shared_data/frame_order/rigid/frame_order.py
U test_suite/shared_data/frame_order/rotor/frame_order.py
U test_suite/shared_data/frame_order/iso_cone_free_rotor2/frame_order.py
U test_suite/shared_data/frame_order/free_rotor/frame_order.py
[edau@... relax-trunk]$ svn merge -r15156:15157 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15157 into '.':
G test_suite/shared_data/frame_order/pseudo_ellipse_torsionless/frame_order.py
U test_suite/shared_data/frame_order/iso_cone_free_rotor/frame_order.py
G test_suite/shared_data/frame_order/rotor2/frame_order.py
U test_suite/shared_data/frame_order/free_rotor2/frame_order.py
U test_suite/shared_data/frame_order/iso_cone/frame_order.py
G test_suite/shared_data/frame_order/rigid/frame_order.py
U test_suite/shared_data/frame_order/pseudo_ellipse_free_rotor/frame_order.py
G test_suite/shared_data/frame_order/rotor/frame_order.py
G test_suite/shared_data/frame_order/iso_cone_free_rotor2/frame_order.py
G test_suite/shared_data/frame_order/free_rotor/frame_order.py
U test_suite/shared_data/frame_order/pseudo_ellipse/frame_order.py
[edau@... relax-trunk]$ svn merge -r15157:15158 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15158 into '.':
U extern/__init__.py
A extern/sobol
A extern/sobol/sobol_lib-not_tested.py
A extern/sobol/sobol_test.py
A extern/sobol/__init__.py
A extern/sobol/sobol_lib.py
A extern/sobol/sobol_test_output.txt
[edau@... relax-trunk]$ svn merge -r15158:15159 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15159 into '.':
A test_suite/shared_data/frame_order/iso_cone_torsionless
A test_suite/shared_data/frame_order/iso_cone_torsionless/generate_distribution.py
A test_suite/shared_data/frame_order/iso_cone_torsionless/frame_order.bz2
A test_suite/shared_data/frame_order/iso_cone_torsionless/rdc_dy.txt
A test_suite/shared_data/frame_order/iso_cone_torsionless/tensors.py
A test_suite/shared_data/frame_order/iso_cone_torsionless/rdc_tm.txt
A test_suite/shared_data/frame_order/iso_cone_torsionless/tensor_fit.log.bz2
A test_suite/shared_data/frame_order/iso_cone_torsionless/cone.pdb
A test_suite/shared_data/frame_order/iso_cone_torsionless/pcs_tb.txt
A test_suite/shared_data/frame_order/iso_cone_torsionless/pcs_er.txt
A test_suite/shared_data/frame_order/iso_cone_torsionless/README
A test_suite/shared_data/frame_order/iso_cone_torsionless/pcs_dy.txt
A test_suite/shared_data/frame_order/iso_cone_torsionless/ave_pos.pdb
A test_suite/shared_data/frame_order/iso_cone_torsionless/frame_order.log.bz2
A test_suite/shared_data/frame_order/iso_cone_torsionless/tensor_fit.py
A test_suite/shared_data/frame_order/iso_cone_torsionless/pcs_tm.txt
A test_suite/shared_data/frame_order/iso_cone_torsionless/generate_distribution.log.bz2
A test_suite/shared_data/frame_order/iso_cone_torsionless/animate.py
A test_suite/shared_data/frame_order/iso_cone_torsionless/axis.pdb
A test_suite/shared_data/frame_order/iso_cone_torsionless/back_calc.py
A test_suite/shared_data/frame_order/iso_cone_torsionless/rdc_tb.txt
A test_suite/shared_data/frame_order/iso_cone_torsionless/frame_order.py
A test_suite/shared_data/frame_order/iso_cone_torsionless/rdc_er.txt
[edau@... relax-trunk]$ svn merge -r15159:15160 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15160 into '.':
G maths_fns/frame_order.py
[edau@... relax-trunk]$
