mailr18976 - in /trunk: maths_fns/ specific_fns/ test_suite/shared_data/frame_order/cam/ test_suite/shared_data/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 - 16:37:
Author: bugman
Date: Fri Mar 22 16:37:50 2013
New Revision: 18976

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

The commands used were:
svn merge -r17280:17281 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r17281:17282 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r17282:17283 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r17283:17284 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r17284:17285 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r17285:17286 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r17286:17287 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r17287:17288 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r17288:17289 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r17289:17290 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .

The console messages were:
[edau@localhost relax-trunk]$ svn merge -r17280:17281 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r17281 into '.':
U    maths_fns/frame_order.py
U    specific_fns/frame_order.py
[edau@localhost relax-trunk]$ svn merge -r17281:17282 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r17282 into '.':
G    maths_fns/frame_order.py
[edau@localhost relax-trunk]$ svn merge -r17282:17283 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r17283 into '.':
U    
test_suite/shared_data/frame_order/cam/pseudo_ellipse_torsionless/tensor_fit.py
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/tensor_fit.py
U    test_suite/shared_data/frame_order/cam/iso_cone_free_rotor/frame_order.py
U    test_suite/shared_data/frame_order/cam/rotor_2_state/tensor_fit.py
U    test_suite/shared_data/frame_order/cam/rotor2/tensor_fit.py
U    test_suite/shared_data/frame_order/cam/rotor2/frame_order.py
U    test_suite/shared_data/frame_order/cam/free_rotor2/tensor_fit.py
U    test_suite/shared_data/frame_order/cam/free_rotor2/frame_order.py
U    test_suite/shared_data/frame_order/cam/rigid/tensor_fit.py
U    test_suite/shared_data/frame_order/cam/rigid/frame_order.py
U    test_suite/shared_data/frame_order/cam/iso_cone/tensor_fit.py
U    test_suite/shared_data/frame_order/cam/iso_cone/frame_order.py
U    test_suite/shared_data/frame_order/cam/pseudo_ellipse2/tensor_fit.py
U    test_suite/shared_data/frame_order/cam/pseudo_ellipse2/frame_order.py
U    
test_suite/shared_data/frame_order/cam/pseudo_ellipse_free_rotor/tensor_fit.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
U    test_suite/shared_data/frame_order/cam/iso_cone_torsionless/tensor_fit.py
U    
test_suite/shared_data/frame_order/cam/iso_cone_torsionless/frame_order.py
U    test_suite/shared_data/frame_order/cam/rotor/tensor_fit.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/tensor_fit.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/tensor_fit.py
U    test_suite/shared_data/frame_order/cam/free_rotor/frame_order.py
U    test_suite/shared_data/frame_order/cam/pseudo_ellipse/tensor_fit.py
U    test_suite/shared_data/frame_order/cam/pseudo_ellipse/frame_order.py
[edau@localhost relax-trunk]$ svn merge -r17283:17284 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r17284 into '.':
G    maths_fns/frame_order.py
[edau@localhost relax-trunk]$ svn merge -r17284:17285 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r17285 into '.':
G    maths_fns/frame_order.py
[edau@localhost relax-trunk]$ svn merge -r17285:17286 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r17286 into '.':
G    maths_fns/frame_order.py
[edau@localhost relax-trunk]$ svn merge -r17286:17287 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r17287 into '.':
U    test_suite/shared_data/frame_order/cam/generate_base.py
[edau@localhost relax-trunk]$ svn merge -r17287:17288 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r17288 into '.':
G    
test_suite/shared_data/frame_order/cam/pseudo_ellipse_torsionless/frame_order.py
G    test_suite/shared_data/frame_order/cam/iso_cone_free_rotor/frame_order.py
G    test_suite/shared_data/frame_order/cam/rotor2/frame_order.py
G    test_suite/shared_data/frame_order/cam/free_rotor2/frame_order.py
G    test_suite/shared_data/frame_order/cam/rigid/frame_order.py
G    test_suite/shared_data/frame_order/cam/iso_cone/frame_order.py
G    test_suite/shared_data/frame_order/cam/pseudo_ellipse2/frame_order.py
G    
test_suite/shared_data/frame_order/cam/pseudo_ellipse_free_rotor/frame_order_pseudo_ellipse.py
G    
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
G    test_suite/shared_data/frame_order/cam/rotor/frame_order.py
G    
test_suite/shared_data/frame_order/cam/iso_cone_free_rotor2/frame_order.py
G    test_suite/shared_data/frame_order/cam/free_rotor/frame_order.py
G    test_suite/shared_data/frame_order/cam/pseudo_ellipse/frame_order.py
[edau@localhost relax-trunk]$ svn merge -r17288:17289 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r17289 into '.':
G    
test_suite/shared_data/frame_order/cam/pseudo_ellipse_torsionless/frame_order.py
G    test_suite/shared_data/frame_order/cam/iso_cone_free_rotor/frame_order.py
G    test_suite/shared_data/frame_order/cam/rotor2/frame_order.py
G    test_suite/shared_data/frame_order/cam/free_rotor2/frame_order.py
G    test_suite/shared_data/frame_order/cam/iso_cone/frame_order.py
G    test_suite/shared_data/frame_order/cam/pseudo_ellipse2/frame_order.py
G    
test_suite/shared_data/frame_order/cam/pseudo_ellipse_free_rotor/frame_order_pseudo_ellipse.py
G    
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
G    test_suite/shared_data/frame_order/cam/rotor/frame_order.py
G    
test_suite/shared_data/frame_order/cam/iso_cone_free_rotor2/frame_order.py
G    test_suite/shared_data/frame_order/cam/free_rotor/frame_order.py
G    test_suite/shared_data/frame_order/cam/pseudo_ellipse/frame_order.py
[edau@localhost relax-trunk]$ svn merge -r17289:17290 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r17290 into '.':
G    
test_suite/shared_data/frame_order/cam/iso_cone_free_rotor2/frame_order.py
[edau@localhost relax-trunk]$


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_rotor/tensor_fit.py
    trunk/test_suite/shared_data/frame_order/cam/free_rotor2/frame_order.py
    trunk/test_suite/shared_data/frame_order/cam/free_rotor2/tensor_fit.py
    trunk/test_suite/shared_data/frame_order/cam/generate_base.py
    trunk/test_suite/shared_data/frame_order/cam/iso_cone/frame_order.py
    trunk/test_suite/shared_data/frame_order/cam/iso_cone/tensor_fit.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_rotor/tensor_fit.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_free_rotor2/tensor_fit.py
    
trunk/test_suite/shared_data/frame_order/cam/iso_cone_torsionless/frame_order.py
    
trunk/test_suite/shared_data/frame_order/cam/iso_cone_torsionless/tensor_fit.py
    trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse/frame_order.py
    trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse/tensor_fit.py
    
trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse2/frame_order.py
    trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse2/tensor_fit.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_free_rotor/tensor_fit.py
    
trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse_torsionless/frame_order.py
    
trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse_torsionless/tensor_fit.py
    trunk/test_suite/shared_data/frame_order/cam/rigid/frame_order.py
    trunk/test_suite/shared_data/frame_order/cam/rigid/tensor_fit.py
    trunk/test_suite/shared_data/frame_order/cam/rotor/frame_order.py
    trunk/test_suite/shared_data/frame_order/cam/rotor/tensor_fit.py
    trunk/test_suite/shared_data/frame_order/cam/rotor2/frame_order.py
    trunk/test_suite/shared_data/frame_order/cam/rotor2/tensor_fit.py
    trunk/test_suite/shared_data/frame_order/cam/rotor_2_state/tensor_fit.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=18976&r1=18975&r2=18976&view=diff

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

Modified: trunk/test_suite/shared_data/frame_order/cam/rotor2/tensor_fit.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/cam/rotor2/tensor_fit.py?rev=18976&r1=18975&r2=18976&view=diff

Modified: 
trunk/test_suite/shared_data/frame_order/cam/rotor_2_state/tensor_fit.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/cam/rotor_2_state/tensor_fit.py?rev=18976&r1=18975&r2=18976&view=diff

Related Messages


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