Menu

Commit [r18963]  Maximize  Restore  History

Next block of the manual merger of the frame_order_testing branch.

The commands used were:
svn merge -r15310:15311 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15311:15312 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15312:15313 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15313:15314 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15314:15315 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15315:15316 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15316:15317 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15317:15318 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15318:15319 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15319:15320 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .

The console messages were:
[edau@... relax-trunk]$ svn merge -r15310:15311 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15311 into '.':
A test_suite/shared_data/frame_order/cam/iso_cone_torsionless/frame_order_matrix.log
A test_suite/shared_data/frame_order/cam/iso_cone_torsionless/frame_order_matrix.py
[edau@... relax-trunk]$ svn merge -r15311:15312 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15312 into '.':
U specific_fns/frame_order.py
[edau@... relax-trunk]$ svn merge -r15312:15313 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15313 into '.':
U maths_fns/frame_order.py
[edau@... relax-trunk]$ svn merge -r15313:15314 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15314 into '.':
U test_suite/system_tests/scripts/frame_order/cam/iso_cone_torsionless.py
[edau@... relax-trunk]$ svn merge -r15314:15315 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15315 into '.':
U test_suite/shared_data/frame_order/cam/iso_cone_torsionless/frame_order.py
[edau@... relax-trunk]$ svn merge -r15315:15316 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15316 into '.':
U test_suite/shared_data/frame_order/cam/pseudo_ellipse_torsionless/frame_order.py
U test_suite/shared_data/frame_order/cam/iso_cone_free_rotor/frame_order.py
U test_suite/shared_data/frame_order/cam/rotor2/frame_order.py
U test_suite/shared_data/frame_order/cam/free_rotor2/frame_order.py
U test_suite/shared_data/frame_order/cam/iso_cone/frame_order.py
U test_suite/shared_data/frame_order/cam/rigid/frame_order.py
U test_suite/shared_data/frame_order/cam/pseudo_ellipse_free_rotor/frame_order_pseudo_ellipse.py
U test_suite/shared_data/frame_order/cam/pseudo_ellipse_free_rotor/frame_order.py
G test_suite/shared_data/frame_order/cam/iso_cone_torsionless/frame_order.py
U test_suite/shared_data/frame_order/cam/rotor/frame_order.py
U test_suite/shared_data/frame_order/cam/iso_cone_free_rotor2/frame_order.py
U test_suite/shared_data/frame_order/cam/free_rotor/frame_order.py
U test_suite/shared_data/frame_order/cam/pseudo_ellipse/frame_order.py
[edau@... relax-trunk]$ svn merge -r15316:15317 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15317 into '.':
U test_suite/system_tests/scripts/frame_order/cam/iso_cone.py
[edau@... relax-trunk]$ svn merge -r15317:15318 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15318 into '.':
U test_suite/system_tests/scripts/frame_order/cam/base_script.py
[edau@... relax-trunk]$ svn merge -r15318:15319 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15319 into '.':
G test_suite/system_tests/scripts/frame_order/cam/iso_cone.py
[edau@... relax-trunk]$ svn merge -r15319:15320 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15320 into '.':
G test_suite/system_tests/scripts/frame_order/cam/base_script.py
[edau@... relax-trunk]$

bugman 2013-03-22

copied /branches/frame_order_testing/test_suite/shared_data/frame_order/cam/iso_cone_torsionless/frame_order_matrix.log -> /trunk/test_suite/shared_data/frame_order/cam/iso_cone_torsionless/frame_order_matrix.log
copied /branches/frame_order_testing/test_suite/shared_data/frame_order/cam/iso_cone_torsionless/frame_order_matrix.py -> /trunk/test_suite/shared_data/frame_order/cam/iso_cone_torsionless/frame_order_matrix.py
changed /trunk/maths_fns/frame_order.py
changed /trunk/specific_fns/frame_order.py
changed /trunk/test_suite/shared_data/frame_order/cam/free_rotor/frame_order.py
changed /trunk/test_suite/shared_data/frame_order/cam/free_rotor2/frame_order.py
changed /trunk/test_suite/shared_data/frame_order/cam/iso_cone/frame_order.py
changed /trunk/test_suite/shared_data/frame_order/cam/iso_cone_free_rotor/frame_order.py
changed /trunk/test_suite/shared_data/frame_order/cam/iso_cone_free_rotor2/frame_order.py
changed /trunk/test_suite/shared_data/frame_order/cam/iso_cone_torsionless/frame_order.py
changed /trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse/frame_order.py
changed /trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse_free_rotor/frame_order.py
changed /trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse_free_rotor/frame_order_pseudo_ellipse.py
changed /trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse_torsionless/frame_order.py
changed /trunk/test_suite/shared_data/frame_order/cam/rigid/frame_order.py
changed /trunk/test_suite/shared_data/frame_order/cam/rotor/frame_order.py
changed /trunk/test_suite/shared_data/frame_order/cam/rotor2/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_torsionless.py
/trunk/maths_fns/frame_order.py Diff Switch to side-by-side view
Loading...
/trunk/specific_fns/frame_order.py Diff Switch to side-by-side view
Loading...
/trunk/test_suite/shared_data/frame_order/cam/free_rotor/frame_order.py Diff Switch to side-by-side view
Loading...
/trunk/test_suite/shared_data/frame_order/cam/free_rotor2/frame_order.py Diff Switch to side-by-side view
Loading...
/trunk/test_suite/shared_data/frame_order/cam/iso_cone/frame_order.py Diff Switch to side-by-side view
Loading...
/trunk/test_suite/shared_data/frame_order/cam/iso_cone_free_rotor/frame_order.py Diff Switch to side-by-side view
Loading...
/trunk/test_suite/shared_data/frame_order/cam/iso_cone_free_rotor2/frame_order.py Diff Switch to side-by-side view
Loading...
/trunk/test_suite/shared_data/frame_order/cam/iso_cone_torsionless/frame_order.py Diff Switch to side-by-side view
Loading...
/trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse/frame_order.py Diff Switch to side-by-side view
Loading...
/trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse_free_rotor/frame_order.py Diff Switch to side-by-side view
Loading...
/trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse_free_rotor/frame_order_pseudo_ellipse.py Diff Switch to side-by-side view
Loading...
/trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse_torsionless/frame_order.py Diff Switch to side-by-side view
Loading...
/trunk/test_suite/shared_data/frame_order/cam/rigid/frame_order.py Diff Switch to side-by-side view
Loading...
/trunk/test_suite/shared_data/frame_order/cam/rotor/frame_order.py Diff Switch to side-by-side view
Loading...
/trunk/test_suite/shared_data/frame_order/cam/rotor2/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_torsionless.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.