The commands used were:
svn merge -r18619:18620 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18620:18621 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18621:18622 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18622:18623 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18623:18624 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18624:18625 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18625:18626 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18626:18627 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18627:18628 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18628:18629 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18629:18630 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
The console messages were:
[edau@... relax-trunk]$ svn merge -r18619:18620 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18620 into '.':
U maths_fns/frame_order/__init__.py
[edau@... relax-trunk]$ svn merge -r18620:18621 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18621 into '.':
U maths_fns/frame_order/iso_cone.py
U maths_fns/frame_order/pseudo_ellipse_torsionless.py
U maths_fns/frame_order/iso_cone_torsionless.py
U maths_fns/frame_order/pseudo_ellipse_free_rotor.py
U maths_fns/frame_order/iso_cone_free_rotor.py
U maths_fns/frame_order/rotor.py
U maths_fns/frame_order/free_rotor.py
[edau@... relax-trunk]$ svn merge -r18621:18622 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18622 into '.':
U maths_fns/frame_order/pseudo_ellipse.py
G maths_fns/frame_order/__init__.py
[edau@... relax-trunk]$ svn merge -r18622:18623 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18623 into '.':
G maths_fns/frame_order/__init__.py
U maths_fns/frame_order/matrix_ops.py
G maths_fns/frame_order/rotor.py
[edau@... relax-trunk]$ svn merge -r18623:18624 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18624 into '.':
G maths_fns/frame_order/__init__.py
[edau@... relax-trunk]$ svn merge -r18624:18625 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18625 into '.':
U test_suite/shared_data/frame_order/displacements/rigid_test.py
A test_suite/shared_data/frame_order/displacements/rigid_test.log
[edau@... relax-trunk]$ svn merge -r18625:18626 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18626 into '.':
A test_suite/system_tests/scripts/frame_order/rigid_test.py
U test_suite/system_tests/frame_order.py
[edau@... relax-trunk]$ svn merge -r18626:18627 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18627 into '.':
U specific_fns/frame_order.py
U user_functions/frame_order.py
[edau@... relax-trunk]$ svn merge -r18627:18628 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18628 into '.':
G test_suite/shared_data/frame_order/displacements/rigid_test.py
[edau@... relax-trunk]$ svn merge -r18628:18629 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18629 into '.':
U auto_analyses/frame_order.py
[edau@... relax-trunk]$ svn merge -r18629:18630 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18630 into '.':
G auto_analyses/frame_order.py
[edau@... relax-trunk]$
