Menu

Commit [r18962]  Maximize  Restore  History

Next block of the manual merger of the frame_order_testing branch.

The commands used were:
svn merge -r15300:15301 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15301:15302 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15302:15303 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15303:15304 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15304:15305 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15305:15306 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15306:15307 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15307:15308 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15308:15309 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15309:15310 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .

The console messages were:
[edau@... relax-trunk]$ svn merge -r15300:15301 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15301 into '.':
U maths_fns/frame_order_matrix_ops.py
[edau@... relax-trunk]$ svn merge -r15301:15302 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15302 into '.':
U test_suite/system_tests/scripts/frame_order/cam/base_script.py
[edau@... relax-trunk]$ svn merge -r15302:15303 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15303 into '.':
U test_suite/system_tests/frame_order.py
[edau@... relax-trunk]$ svn merge -r15303:15304 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15304 into '.':
U test_suite/system_tests/scripts/frame_order/cam/iso_cone.py
[edau@... relax-trunk]$ svn merge -r15304:15305 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15305 into '.':
G test_suite/system_tests/frame_order.py
[edau@... relax-trunk]$ svn merge -r15305:15306 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15306 into '.':
U test_suite/shared_data/frame_order/cam/pseudo_ellipse_torsionless/README
U test_suite/shared_data/frame_order/cam/rotor2/README
U test_suite/shared_data/frame_order/cam/free_rotor2/README
U test_suite/shared_data/frame_order/cam/iso_cone/README
U test_suite/shared_data/frame_order/cam/iso_cone_torsionless/README
U test_suite/shared_data/frame_order/cam/pseudo_ellipse_free_rotor/README
U test_suite/shared_data/frame_order/cam/rotor/README
U test_suite/shared_data/frame_order/cam/iso_cone_free_rotor2/README
U test_suite/shared_data/frame_order/cam/free_rotor/README
U test_suite/shared_data/frame_order/cam/pseudo_ellipse/README
[edau@... relax-trunk]$ svn merge -r15306:15307 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15307 into '.':
A test_suite/shared_data/frame_order/cam/opt_stats
[edau@... relax-trunk]$ svn merge -r15307:15308 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15308 into '.':
U test_suite/shared_data/frame_order/cam/opt_stats
[edau@... relax-trunk]$ svn merge -r15308:15309 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15309 into '.':
G test_suite/shared_data/frame_order/cam/opt_stats
[edau@... relax-trunk]$ svn merge -r15309:15310 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15310 into '.':
U test_suite/shared_data/frame_order/cam/iso_cone/frame_order.bz2
U test_suite/shared_data/frame_order/cam/iso_cone/cone.pdb
U test_suite/shared_data/frame_order/cam/iso_cone/ave_pos.pdb
U test_suite/shared_data/frame_order/cam/iso_cone/frame_order.log.bz2
[edau@... relax-trunk]$

bugman 2013-03-22

copied /branches/frame_order_testing/test_suite/shared_data/frame_order/cam/opt_stats -> /trunk/test_suite/shared_data/frame_order/cam/opt_stats
changed /trunk/maths_fns/frame_order_matrix_ops.py
changed /trunk/test_suite/shared_data/frame_order/cam/free_rotor/README
changed /trunk/test_suite/shared_data/frame_order/cam/free_rotor2/README
changed /trunk/test_suite/shared_data/frame_order/cam/iso_cone/README
changed /trunk/test_suite/shared_data/frame_order/cam/iso_cone/ave_pos.pdb
changed /trunk/test_suite/shared_data/frame_order/cam/iso_cone/cone.pdb
changed /trunk/test_suite/shared_data/frame_order/cam/iso_cone/frame_order.bz2
changed /trunk/test_suite/shared_data/frame_order/cam/iso_cone/frame_order.log.bz2
changed /trunk/test_suite/shared_data/frame_order/cam/iso_cone_free_rotor2/README
changed /trunk/test_suite/shared_data/frame_order/cam/iso_cone_torsionless/README
changed /trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse/README
changed /trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse_free_rotor/README
changed /trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse_torsionless/README
changed /trunk/test_suite/shared_data/frame_order/cam/rotor/README
changed /trunk/test_suite/shared_data/frame_order/cam/rotor2/README
changed /trunk/test_suite/system_tests/frame_order.py
changed /trunk/test_suite/system_tests/scripts/frame_order/cam/base_script.py
changed /trunk/test_suite/system_tests/scripts/frame_order/cam/iso_cone.py
/trunk/maths_fns/frame_order_matrix_ops.py Diff Switch to side-by-side view
Loading...
/trunk/test_suite/shared_data/frame_order/cam/free_rotor/README Diff Switch to side-by-side view
Loading...
/trunk/test_suite/shared_data/frame_order/cam/free_rotor2/README Diff Switch to side-by-side view
Loading...
/trunk/test_suite/shared_data/frame_order/cam/iso_cone/README Diff Switch to side-by-side view
Loading...
/trunk/test_suite/shared_data/frame_order/cam/iso_cone/ave_pos.pdb Diff Switch to side-by-side view
Loading...
/trunk/test_suite/shared_data/frame_order/cam/iso_cone/cone.pdb Diff Switch to side-by-side view
Loading...
/trunk/test_suite/shared_data/frame_order/cam/iso_cone_free_rotor2/README Diff Switch to side-by-side view
Loading...
/trunk/test_suite/shared_data/frame_order/cam/iso_cone_torsionless/README Diff Switch to side-by-side view
Loading...
/trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse/README Diff Switch to side-by-side view
Loading...
/trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse_free_rotor/README Diff Switch to side-by-side view
Loading...
/trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse_torsionless/README Diff Switch to side-by-side view
Loading...
/trunk/test_suite/shared_data/frame_order/cam/rotor/README Diff Switch to side-by-side view
Loading...
/trunk/test_suite/shared_data/frame_order/cam/rotor2/README Diff Switch to side-by-side view
Loading...
/trunk/test_suite/system_tests/frame_order.py Diff Switch to side-by-side view
Loading...
/trunk/test_suite/system_tests/scripts/frame_order/cam/base_script.py Diff Switch to side-by-side view
Loading...
/trunk/test_suite/system_tests/scripts/frame_order/cam/iso_cone.py Diff Switch to side-by-side view
Loading...
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.