mailr18963 - in /trunk: maths_fns/ specific_fns/ test_suite/shared_data/frame_order/cam/free_rotor/ test_suite/shared_data/frame...


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:32:
Author: bugman
Date: Fri Mar 22 15:32:31 2013
New Revision: 18963

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

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

The console messages were:
[edau@localhost relax-trunk]$ svn merge -r15310:15311 
svn+ssh://bugman@xxxxxxxxxxx/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@localhost relax-trunk]$ svn merge -r15311:15312 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r15312 into '.':
U    specific_fns/frame_order.py
[edau@localhost relax-trunk]$ svn merge -r15312:15313 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r15313 into '.':
U    maths_fns/frame_order.py
[edau@localhost relax-trunk]$ svn merge -r15313:15314 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r15314 into '.':
U    test_suite/system_tests/scripts/frame_order/cam/iso_cone_torsionless.py
[edau@localhost relax-trunk]$ svn merge -r15314:15315 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r15315 into '.':
U    
test_suite/shared_data/frame_order/cam/iso_cone_torsionless/frame_order.py
[edau@localhost relax-trunk]$ svn merge -r15315:15316 
svn+ssh://bugman@xxxxxxxxxxx/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@localhost relax-trunk]$ svn merge -r15316:15317 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r15317 into '.':
U    test_suite/system_tests/scripts/frame_order/cam/iso_cone.py
[edau@localhost relax-trunk]$ svn merge -r15317:15318 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r15318 into '.':
U    test_suite/system_tests/scripts/frame_order/cam/base_script.py
[edau@localhost relax-trunk]$ svn merge -r15318:15319 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r15319 into '.':
G    test_suite/system_tests/scripts/frame_order/cam/iso_cone.py
[edau@localhost relax-trunk]$ svn merge -r15319:15320 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r15320 into '.':
G    test_suite/system_tests/scripts/frame_order/cam/base_script.py
[edau@localhost relax-trunk]$


Added:
    
trunk/test_suite/shared_data/frame_order/cam/iso_cone_torsionless/frame_order_matrix.log
      - copied unchanged from r15311, 
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.py
      - copied unchanged from r15311, 
branches/frame_order_testing/test_suite/shared_data/frame_order/cam/iso_cone_torsionless/frame_order_matrix.py
Modified:
    trunk/maths_fns/frame_order.py
    trunk/specific_fns/frame_order.py
    trunk/test_suite/shared_data/frame_order/cam/free_rotor/frame_order.py
    trunk/test_suite/shared_data/frame_order/cam/free_rotor2/frame_order.py
    trunk/test_suite/shared_data/frame_order/cam/iso_cone/frame_order.py
    
trunk/test_suite/shared_data/frame_order/cam/iso_cone_free_rotor/frame_order.py
    
trunk/test_suite/shared_data/frame_order/cam/iso_cone_free_rotor2/frame_order.py
    
trunk/test_suite/shared_data/frame_order/cam/iso_cone_torsionless/frame_order.py
    trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse/frame_order.py
    
trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse_free_rotor/frame_order.py
    
trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse_free_rotor/frame_order_pseudo_ellipse.py
    
trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse_torsionless/frame_order.py
    trunk/test_suite/shared_data/frame_order/cam/rigid/frame_order.py
    trunk/test_suite/shared_data/frame_order/cam/rotor/frame_order.py
    trunk/test_suite/shared_data/frame_order/cam/rotor2/frame_order.py
    trunk/test_suite/system_tests/scripts/frame_order/cam/base_script.py
    
trunk/test_suite/system_tests/scripts/frame_order/cam/iso_cone_torsionless.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=18963&r1=18962&r2=18963&view=diff

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

Modified: 
trunk/test_suite/shared_data/frame_order/cam/free_rotor/frame_order.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/cam/free_rotor/frame_order.py?rev=18963&r1=18962&r2=18963&view=diff

Modified: 
trunk/test_suite/shared_data/frame_order/cam/free_rotor2/frame_order.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/cam/free_rotor2/frame_order.py?rev=18963&r1=18962&r2=18963&view=diff

Modified: trunk/test_suite/shared_data/frame_order/cam/iso_cone/frame_order.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/cam/iso_cone/frame_order.py?rev=18963&r1=18962&r2=18963&view=diff

Modified: 
trunk/test_suite/shared_data/frame_order/cam/iso_cone_free_rotor/frame_order.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/cam/iso_cone_free_rotor/frame_order.py?rev=18963&r1=18962&r2=18963&view=diff

Modified: 
trunk/test_suite/shared_data/frame_order/cam/iso_cone_free_rotor2/frame_order.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/cam/iso_cone_free_rotor2/frame_order.py?rev=18963&r1=18962&r2=18963&view=diff

Modified: 
trunk/test_suite/shared_data/frame_order/cam/iso_cone_torsionless/frame_order.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/cam/iso_cone_torsionless/frame_order.py?rev=18963&r1=18962&r2=18963&view=diff

Modified: 
trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse/frame_order.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse/frame_order.py?rev=18963&r1=18962&r2=18963&view=diff

Modified: 
trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse_free_rotor/frame_order.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse_free_rotor/frame_order.py?rev=18963&r1=18962&r2=18963&view=diff

Modified: 
trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse_free_rotor/frame_order_pseudo_ellipse.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse_free_rotor/frame_order_pseudo_ellipse.py?rev=18963&r1=18962&r2=18963&view=diff

Modified: 
trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse_torsionless/frame_order.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse_torsionless/frame_order.py?rev=18963&r1=18962&r2=18963&view=diff

Modified: trunk/test_suite/shared_data/frame_order/cam/rigid/frame_order.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/cam/rigid/frame_order.py?rev=18963&r1=18962&r2=18963&view=diff

Modified: trunk/test_suite/shared_data/frame_order/cam/rotor/frame_order.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/cam/rotor/frame_order.py?rev=18963&r1=18962&r2=18963&view=diff

Modified: trunk/test_suite/shared_data/frame_order/cam/rotor2/frame_order.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/cam/rotor2/frame_order.py?rev=18963&r1=18962&r2=18963&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=18963&r1=18962&r2=18963&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=18963&r1=18962&r2=18963&view=diff

Related Messages


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