The commands used were:
svn merge -r15100:15101 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15101:15102 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15102:15103 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15103:15104 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15104:15105 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15105:15106 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15106:15107 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15107:15108 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15108:15109 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15109:15110 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
The console messages were:
[edau@... relax-trunk]$ svn merge -r15100:15101 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15101 into '.':
U test_suite/shared_data/frame_order/iso_cone/frame_order.bz2
U test_suite/shared_data/frame_order/iso_cone/rdc_dy.txt
U test_suite/shared_data/frame_order/iso_cone/tensors.py
U test_suite/shared_data/frame_order/iso_cone/rdc_tm.txt
U test_suite/shared_data/frame_order/iso_cone/tensor_fit.log.bz2
U test_suite/shared_data/frame_order/iso_cone/cone.pdb
U test_suite/shared_data/frame_order/iso_cone/pcs_tb.txt
U test_suite/shared_data/frame_order/iso_cone/pcs_er.txt
U test_suite/shared_data/frame_order/iso_cone/pcs_dy.txt
U test_suite/shared_data/frame_order/iso_cone/ave_pos.pdb
U test_suite/shared_data/frame_order/iso_cone/pcs_tm.txt
U test_suite/shared_data/frame_order/iso_cone/animate.py
U test_suite/shared_data/frame_order/iso_cone/rdc_tb.txt
U test_suite/shared_data/frame_order/iso_cone/frame_order.py
U test_suite/shared_data/frame_order/iso_cone/rdc_er.txt
[edau@... relax-trunk]$ svn merge -r15101:15102 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15102 into '.':
U relax.py
[edau@... relax-trunk]$ svn merge -r15102:15103 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15103 into '.':
U dep_check.py
[edau@... relax-trunk]$ svn merge -r15103:15104 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15104 into '.':
U maths_fns/frame_order_matrix_ops.py
U maths_fns/frame_order.py
[edau@... relax-trunk]$ svn merge -r15104:15105 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15105 into '.':
G maths_fns/frame_order_matrix_ops.py
G maths_fns/frame_order.py
[edau@... relax-trunk]$ svn merge -r15105:15106 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15106 into '.':
G maths_fns/frame_order.py
[edau@... relax-trunk]$ svn merge -r15106:15107 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15107 into '.':
U specific_fns/frame_order.py
[edau@... relax-trunk]$ svn merge -r15107:15108 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15108 into '.':
A test_suite/shared_data/frame_order/pseudo_ellipse
A test_suite/shared_data/frame_order/pseudo_ellipse/generate_distribution.py
A test_suite/shared_data/frame_order/pseudo_ellipse/frame_order.bz2
A test_suite/shared_data/frame_order/pseudo_ellipse/rdc_dy.txt
A test_suite/shared_data/frame_order/pseudo_ellipse/tensors.py
A test_suite/shared_data/frame_order/pseudo_ellipse/rdc_tm.txt
A test_suite/shared_data/frame_order/pseudo_ellipse/tensor_fit.log.bz2
A test_suite/shared_data/frame_order/pseudo_ellipse/cone.pdb
A test_suite/shared_data/frame_order/pseudo_ellipse/pcs_tb.txt
A test_suite/shared_data/frame_order/pseudo_ellipse/pcs_er.txt
A test_suite/shared_data/frame_order/pseudo_ellipse/README
A test_suite/shared_data/frame_order/pseudo_ellipse/pcs_dy.txt
A test_suite/shared_data/frame_order/pseudo_ellipse/ave_pos.pdb
A test_suite/shared_data/frame_order/pseudo_ellipse/frame_order.log.bz2
A test_suite/shared_data/frame_order/pseudo_ellipse/tensor_fit.py
A test_suite/shared_data/frame_order/pseudo_ellipse/pcs_tm.txt
A test_suite/shared_data/frame_order/pseudo_ellipse/generate_distribution.log.bz2
A test_suite/shared_data/frame_order/pseudo_ellipse/animate.py
A test_suite/shared_data/frame_order/pseudo_ellipse/axis.pdb
A test_suite/shared_data/frame_order/pseudo_ellipse/back_calc.py
A test_suite/shared_data/frame_order/pseudo_ellipse/rdc_tb.txt
A test_suite/shared_data/frame_order/pseudo_ellipse/frame_order.py
A test_suite/shared_data/frame_order/pseudo_ellipse/rdc_er.txt
[edau@... relax-trunk]$ svn merge -r15108:15109 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15109 into '.':
G maths_fns/frame_order.py
[edau@... relax-trunk]$ svn merge -r15109:15110 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15110 into '.':
G maths_fns/frame_order.py
[edau@... relax-trunk]$
