mailr18961 - in /trunk: maths_fns/ specific_fns/ test_suite/system_tests/ test_suite/system_tests/scripts/frame_order/cam/


Others Months | Index by Date | Thread Index
>>   [Date Prev] [Date Next] [Thread Prev] [Thread Next]

Header


Content

Posted by edward on March 22, 2013 - 15:29:
Author: bugman
Date: Fri Mar 22 15:29:40 2013
New Revision: 18961

URL: http://svn.gna.org/viewcvs/relax?rev=18961&view=rev
Log:
Next block of the manual merger of the frame_order_testing branch.

The commands used were:
svn merge -r15290:15291 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r15291:15292 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r15292:15293 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r15293:15294 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r15294:15295 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r15295:15296 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r15296:15297 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r15297:15298 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r15298:15299 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r15299:15300 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .

The console messages were:
[edau@localhost relax-trunk]$ svn merge -r15290:15291 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r15291 into '.':
U    maths_fns/frame_order.py
U    specific_fns/frame_order.py
[edau@localhost relax-trunk]$ svn merge -r15291:15292 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r15292 into '.':
U    test_suite/system_tests/scripts/frame_order/cam/base_script.py
U    test_suite/system_tests/scripts/frame_order/cam/rotor.py
[edau@localhost relax-trunk]$ svn merge -r15292:15293 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r15293 into '.':
U    test_suite/system_tests/frame_order.py
[edau@localhost relax-trunk]$ svn merge -r15293:15294 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r15294 into '.':
U    maths_fns/frame_order_matrix_ops.py
G    maths_fns/frame_order.py
[edau@localhost relax-trunk]$ svn merge -r15294:15295 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r15295 into '.':
G    maths_fns/frame_order.py
[edau@localhost relax-trunk]$ svn merge -r15295:15296 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r15296 into '.':
U    test_suite/system_tests/scripts/frame_order/cam/free_rotor2.py
U    test_suite/system_tests/scripts/frame_order/cam/pseudo_ellipse.py
U    test_suite/system_tests/scripts/frame_order/cam/iso_cone.py
U    test_suite/system_tests/scripts/frame_order/cam/rigid.py
U    
test_suite/system_tests/scripts/frame_order/cam/pseudo_ellipse_torsionless.py
U    test_suite/system_tests/scripts/frame_order/cam/iso_cone_torsionless.py
U    
test_suite/system_tests/scripts/frame_order/cam/pseudo_ellipse_free_rotor.py
U    test_suite/system_tests/scripts/frame_order/cam/iso_cone_free_rotor.py
U    test_suite/system_tests/scripts/frame_order/cam/free_rotor.py
U    test_suite/system_tests/scripts/frame_order/cam/iso_cone_free_rotor2.py
U    test_suite/system_tests/scripts/frame_order/cam/rotor2.py
[edau@localhost relax-trunk]$ svn merge -r15296:15297 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r15297 into '.':
G    maths_fns/frame_order.py
[edau@localhost relax-trunk]$ svn merge -r15297:15298 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r15298 into '.':
G    maths_fns/frame_order.py
[edau@localhost relax-trunk]$ svn merge -r15298:15299 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r15299 into '.':
G    maths_fns/frame_order_matrix_ops.py
[edau@localhost relax-trunk]$ svn merge -r15299:15300 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r15300 into '.':
G    specific_fns/frame_order.py
[edau@localhost relax-trunk]$


Modified:
    trunk/maths_fns/frame_order.py
    trunk/maths_fns/frame_order_matrix_ops.py
    trunk/specific_fns/frame_order.py
    trunk/test_suite/system_tests/frame_order.py
    trunk/test_suite/system_tests/scripts/frame_order/cam/base_script.py
    trunk/test_suite/system_tests/scripts/frame_order/cam/free_rotor.py
    trunk/test_suite/system_tests/scripts/frame_order/cam/free_rotor2.py
    trunk/test_suite/system_tests/scripts/frame_order/cam/iso_cone.py
    
trunk/test_suite/system_tests/scripts/frame_order/cam/iso_cone_free_rotor.py
    
trunk/test_suite/system_tests/scripts/frame_order/cam/iso_cone_free_rotor2.py
    
trunk/test_suite/system_tests/scripts/frame_order/cam/iso_cone_torsionless.py
    trunk/test_suite/system_tests/scripts/frame_order/cam/pseudo_ellipse.py
    
trunk/test_suite/system_tests/scripts/frame_order/cam/pseudo_ellipse_free_rotor.py
    
trunk/test_suite/system_tests/scripts/frame_order/cam/pseudo_ellipse_torsionless.py
    trunk/test_suite/system_tests/scripts/frame_order/cam/rigid.py
    trunk/test_suite/system_tests/scripts/frame_order/cam/rotor.py
    trunk/test_suite/system_tests/scripts/frame_order/cam/rotor2.py

[This mail would be too long, it was shortened to contain the URLs only.]

Modified: trunk/maths_fns/frame_order.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/maths_fns/frame_order.py?rev=18961&r1=18960&r2=18961&view=diff

Modified: trunk/maths_fns/frame_order_matrix_ops.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/maths_fns/frame_order_matrix_ops.py?rev=18961&r1=18960&r2=18961&view=diff

Modified: trunk/specific_fns/frame_order.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/specific_fns/frame_order.py?rev=18961&r1=18960&r2=18961&view=diff

Modified: trunk/test_suite/system_tests/frame_order.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/test_suite/system_tests/frame_order.py?rev=18961&r1=18960&r2=18961&view=diff

Modified: trunk/test_suite/system_tests/scripts/frame_order/cam/base_script.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/test_suite/system_tests/scripts/frame_order/cam/base_script.py?rev=18961&r1=18960&r2=18961&view=diff

Modified: trunk/test_suite/system_tests/scripts/frame_order/cam/free_rotor.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/test_suite/system_tests/scripts/frame_order/cam/free_rotor.py?rev=18961&r1=18960&r2=18961&view=diff

Modified: trunk/test_suite/system_tests/scripts/frame_order/cam/free_rotor2.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/test_suite/system_tests/scripts/frame_order/cam/free_rotor2.py?rev=18961&r1=18960&r2=18961&view=diff

Modified: trunk/test_suite/system_tests/scripts/frame_order/cam/iso_cone.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/test_suite/system_tests/scripts/frame_order/cam/iso_cone.py?rev=18961&r1=18960&r2=18961&view=diff

Modified: 
trunk/test_suite/system_tests/scripts/frame_order/cam/iso_cone_free_rotor.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/test_suite/system_tests/scripts/frame_order/cam/iso_cone_free_rotor.py?rev=18961&r1=18960&r2=18961&view=diff

Modified: 
trunk/test_suite/system_tests/scripts/frame_order/cam/iso_cone_free_rotor2.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/test_suite/system_tests/scripts/frame_order/cam/iso_cone_free_rotor2.py?rev=18961&r1=18960&r2=18961&view=diff

Modified: 
trunk/test_suite/system_tests/scripts/frame_order/cam/iso_cone_torsionless.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/test_suite/system_tests/scripts/frame_order/cam/iso_cone_torsionless.py?rev=18961&r1=18960&r2=18961&view=diff

Modified: 
trunk/test_suite/system_tests/scripts/frame_order/cam/pseudo_ellipse.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/test_suite/system_tests/scripts/frame_order/cam/pseudo_ellipse.py?rev=18961&r1=18960&r2=18961&view=diff

Modified: 
trunk/test_suite/system_tests/scripts/frame_order/cam/pseudo_ellipse_free_rotor.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/test_suite/system_tests/scripts/frame_order/cam/pseudo_ellipse_free_rotor.py?rev=18961&r1=18960&r2=18961&view=diff

Modified: 
trunk/test_suite/system_tests/scripts/frame_order/cam/pseudo_ellipse_torsionless.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/test_suite/system_tests/scripts/frame_order/cam/pseudo_ellipse_torsionless.py?rev=18961&r1=18960&r2=18961&view=diff

Modified: trunk/test_suite/system_tests/scripts/frame_order/cam/rigid.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/test_suite/system_tests/scripts/frame_order/cam/rigid.py?rev=18961&r1=18960&r2=18961&view=diff

Modified: trunk/test_suite/system_tests/scripts/frame_order/cam/rotor.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/test_suite/system_tests/scripts/frame_order/cam/rotor.py?rev=18961&r1=18960&r2=18961&view=diff

Modified: trunk/test_suite/system_tests/scripts/frame_order/cam/rotor2.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/test_suite/system_tests/scripts/frame_order/cam/rotor2.py?rev=18961&r1=18960&r2=18961&view=diff

Related Messages


Powered by MHonArc, Updated Fri Mar 22 15:40:02 2013