mailr18998 - in /trunk: auto_analyses/ maths_fns/frame_order/ specific_fns/ test_suite/system_tests/ test_suite/system_tests/scr...


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

Header


Content

Posted by edward on March 22, 2013 - 17:26:
Author: bugman
Date: Fri Mar 22 17:26:16 2013
New Revision: 18998

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

The commands used were:
svn merge -r18630:18631 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r18631:18632 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r18632:18633 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r18633:18634 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r18634:18635 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r18635:18636 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r18636:18637 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r18637:18638 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r18638:18639 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r18639:18640 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .

The console messages were:
[edau@localhost relax-trunk]$ svn merge -r18630:18631 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r18631 into '.':
U    maths_fns/frame_order/__init__.py
U    specific_fns/frame_order.py
[edau@localhost relax-trunk]$ svn merge -r18631:18632 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r18632 into '.':
G    specific_fns/frame_order.py
[edau@localhost relax-trunk]$ svn merge -r18632:18633 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r18633 into '.':
G    specific_fns/frame_order.py
[edau@localhost relax-trunk]$ svn merge -r18633:18634 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r18634 into '.':
U    auto_analyses/frame_order.py
[edau@localhost relax-trunk]$ svn merge -r18634:18635 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
[edau@localhost relax-trunk]$ svn merge -r18635:18636 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r18636 into '.':
G    maths_fns/frame_order/__init__.py
[edau@localhost relax-trunk]$ svn merge -r18636:18637 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r18637 into '.':
G    maths_fns/frame_order/__init__.py
[edau@localhost relax-trunk]$ svn merge -r18637:18638 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r18638 into '.':
U    test_suite/system_tests/scripts/frame_order/rigid_test.py
[edau@localhost relax-trunk]$ svn merge -r18638:18639 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r18639 into '.':
U    test_suite/system_tests/scripts/frame_order/cam/free_rotor2.py
U    
test_suite/system_tests/scripts/frame_order/cam/free_rotor_missing_data.py
U    test_suite/system_tests/scripts/frame_order/cam/iso_cone.py
U    test_suite/system_tests/scripts/frame_order/cam/pseudo_ellipse2.py
U    test_suite/system_tests/scripts/frame_order/cam/rigid.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/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/pseudo_ellipse.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_free_rotor.py
U    test_suite/system_tests/scripts/frame_order/cam/rotor_2_state.py
U    test_suite/system_tests/scripts/frame_order/cam/rotor2.py
[edau@localhost relax-trunk]$ svn merge -r18639:18640 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r18640 into '.':
U    test_suite/system_tests/frame_order.py
[edau@localhost relax-trunk]$


Modified:
    trunk/auto_analyses/frame_order.py
    trunk/maths_fns/frame_order/__init__.py
    trunk/specific_fns/frame_order.py
    trunk/test_suite/system_tests/frame_order.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/free_rotor_missing_data.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_ellipse2.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
    trunk/test_suite/system_tests/scripts/frame_order/cam/rotor_2_state.py
    trunk/test_suite/system_tests/scripts/frame_order/rigid_test.py

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

Modified: trunk/auto_analyses/frame_order.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/auto_analyses/frame_order.py?rev=18998&r1=18997&r2=18998&view=diff

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

Modified: trunk/specific_fns/frame_order.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/specific_fns/frame_order.py?rev=18998&r1=18997&r2=18998&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=18998&r1=18997&r2=18998&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=18998&r1=18997&r2=18998&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=18998&r1=18997&r2=18998&view=diff

Modified: 
trunk/test_suite/system_tests/scripts/frame_order/cam/free_rotor_missing_data.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/test_suite/system_tests/scripts/frame_order/cam/free_rotor_missing_data.py?rev=18998&r1=18997&r2=18998&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=18998&r1=18997&r2=18998&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=18998&r1=18997&r2=18998&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=18998&r1=18997&r2=18998&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=18998&r1=18997&r2=18998&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=18998&r1=18997&r2=18998&view=diff

Modified: 
trunk/test_suite/system_tests/scripts/frame_order/cam/pseudo_ellipse2.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/test_suite/system_tests/scripts/frame_order/cam/pseudo_ellipse2.py?rev=18998&r1=18997&r2=18998&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=18998&r1=18997&r2=18998&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=18998&r1=18997&r2=18998&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=18998&r1=18997&r2=18998&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=18998&r1=18997&r2=18998&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=18998&r1=18997&r2=18998&view=diff

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

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

Related Messages


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