mailr18968 - in /trunk/test_suite: shared_data/frame_order/cam/ shared_data/frame_order/cam/free_rotor/ shared_data/frame_order/...


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:18:
Author: bugman
Date: Fri Mar 22 16:18:26 2013
New Revision: 18968

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

The commands used were:
svn merge -r15360:15361 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r15361:15362 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r15362:15363 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r15363:15364 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r15364:15365 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r15365:15366 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r15366:15367 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r15367:15368 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r15368:15369 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .

The console messages were:
[edau@localhost relax-trunk]$ svn merge -r15360:15361 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r15361 into '.':
U    test_suite/shared_data/frame_order/cam/rotor/generate_distribution.py
[edau@localhost relax-trunk]$ svn merge -r15361:15362 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r15362 into '.':
U    
test_suite/shared_data/frame_order/cam/free_rotor2/generate_distribution.py
U    
test_suite/shared_data/frame_order/cam/iso_cone_free_rotor2/generate_distribution.py
U    test_suite/shared_data/frame_order/cam/generate_base.py
[edau@localhost relax-trunk]$ svn merge -r15362:15363 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r15363 into '.':
U    test_suite/shared_data/frame_order/cam/rotor2/generate_distribution.py
G    
test_suite/shared_data/frame_order/cam/free_rotor2/generate_distribution.py
G    test_suite/shared_data/frame_order/cam/rotor/generate_distribution.py
U    
test_suite/shared_data/frame_order/cam/free_rotor/generate_distribution.py
[edau@localhost relax-trunk]$ svn merge -r15363:15364 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r15364 into '.':
A    test_suite/system_tests/scripts/frame_order/cam/rotor_2_state.py
U    test_suite/system_tests/frame_order.py
[edau@localhost relax-trunk]$ svn merge -r15364:15365 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r15365 into '.':
U    test_suite/shared_data/frame_order/cam/opt_stats
[edau@localhost relax-trunk]$ svn merge -r15365:15366 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r15366 into '.':
G    test_suite/system_tests/frame_order.py
[edau@localhost relax-trunk]$ svn merge -r15366:15367 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r15367 into '.':
A    test_suite/shared_data/frame_order/cam/pseudo_ellipse2
A    
test_suite/shared_data/frame_order/cam/pseudo_ellipse2/generate_distribution.py
A    test_suite/shared_data/frame_order/cam/pseudo_ellipse2/frame_order.bz2
A    test_suite/shared_data/frame_order/cam/pseudo_ellipse2/rdc_dy.txt
A    test_suite/shared_data/frame_order/cam/pseudo_ellipse2/tensors.py
A    test_suite/shared_data/frame_order/cam/pseudo_ellipse2/rdc_tm.txt
A    test_suite/shared_data/frame_order/cam/pseudo_ellipse2/tensor_fit.log.bz2
A    test_suite/shared_data/frame_order/cam/pseudo_ellipse2/cone.pdb
A    test_suite/shared_data/frame_order/cam/pseudo_ellipse2/pcs_tb.txt
A    test_suite/shared_data/frame_order/cam/pseudo_ellipse2/pcs_er.txt
A    test_suite/shared_data/frame_order/cam/pseudo_ellipse2/pcs_dy.txt
A    test_suite/shared_data/frame_order/cam/pseudo_ellipse2/ave_pos.pdb
A    
test_suite/shared_data/frame_order/cam/pseudo_ellipse2/frame_order.log.bz2
A    test_suite/shared_data/frame_order/cam/pseudo_ellipse2/tensor_fit.py
A    test_suite/shared_data/frame_order/cam/pseudo_ellipse2/pcs_tm.txt
A    test_suite/shared_data/frame_order/cam/pseudo_ellipse2/animate.py
A    
test_suite/shared_data/frame_order/cam/pseudo_ellipse2/generate_distribution.log.bz2
A    test_suite/shared_data/frame_order/cam/pseudo_ellipse2/axis_system
A    test_suite/shared_data/frame_order/cam/pseudo_ellipse2/axis.pdb
A    test_suite/shared_data/frame_order/cam/pseudo_ellipse2/frame_order_matrix
A    test_suite/shared_data/frame_order/cam/pseudo_ellipse2/rdc_tb.txt
A    test_suite/shared_data/frame_order/cam/pseudo_ellipse2/frame_order.py
A    test_suite/shared_data/frame_order/cam/pseudo_ellipse2/rdc_er.txt
A    test_suite/system_tests/scripts/frame_order/cam/pseudo_ellipse2.py
G    test_suite/system_tests/frame_order.py
[edau@localhost relax-trunk]$ svn merge -r15367:15368 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r15368 into '.':
U    test_suite/shared_data/frame_order/cam/pseudo_ellipse2/rdc_dy.txt
U    test_suite/shared_data/frame_order/cam/pseudo_ellipse2/rdc_tm.txt
U    test_suite/shared_data/frame_order/cam/pseudo_ellipse2/pcs_tb.txt
U    test_suite/shared_data/frame_order/cam/pseudo_ellipse2/pcs_er.txt
U    test_suite/shared_data/frame_order/cam/pseudo_ellipse2/pcs_dy.txt
U    test_suite/shared_data/frame_order/cam/pseudo_ellipse2/pcs_tm.txt
U    
test_suite/shared_data/frame_order/cam/pseudo_ellipse2/generate_distribution.log.bz2
U    test_suite/shared_data/frame_order/cam/pseudo_ellipse2/frame_order_matrix
U    test_suite/shared_data/frame_order/cam/pseudo_ellipse2/rdc_tb.txt
U    test_suite/shared_data/frame_order/cam/pseudo_ellipse2/rdc_er.txt
[edau@localhost relax-trunk]$ svn merge -r15368:15369 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r15369 into '.':
G    test_suite/shared_data/frame_order/cam/opt_stats
[edau@localhost relax-trunk]$


Added:
    trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse2/
      - copied from r15367, 
branches/frame_order_testing/test_suite/shared_data/frame_order/cam/pseudo_ellipse2/
    trunk/test_suite/system_tests/scripts/frame_order/cam/pseudo_ellipse2.py
      - copied unchanged from r15367, 
branches/frame_order_testing/test_suite/system_tests/scripts/frame_order/cam/pseudo_ellipse2.py
    trunk/test_suite/system_tests/scripts/frame_order/cam/rotor_2_state.py
      - copied unchanged from r15364, 
branches/frame_order_testing/test_suite/system_tests/scripts/frame_order/cam/rotor_2_state.py
Modified:
    
trunk/test_suite/shared_data/frame_order/cam/free_rotor/generate_distribution.py
    
trunk/test_suite/shared_data/frame_order/cam/free_rotor2/generate_distribution.py
    trunk/test_suite/shared_data/frame_order/cam/generate_base.py
    
trunk/test_suite/shared_data/frame_order/cam/iso_cone_free_rotor2/generate_distribution.py
    trunk/test_suite/shared_data/frame_order/cam/opt_stats
    
trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse2/frame_order_matrix
    
trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse2/generate_distribution.log.bz2
    trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse2/pcs_dy.txt
    trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse2/pcs_er.txt
    trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse2/pcs_tb.txt
    trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse2/pcs_tm.txt
    trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse2/rdc_dy.txt
    trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse2/rdc_er.txt
    trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse2/rdc_tb.txt
    trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse2/rdc_tm.txt
    
trunk/test_suite/shared_data/frame_order/cam/rotor/generate_distribution.py
    
trunk/test_suite/shared_data/frame_order/cam/rotor2/generate_distribution.py
    trunk/test_suite/system_tests/frame_order.py

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

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

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

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

Modified: trunk/test_suite/shared_data/frame_order/cam/opt_stats
URL: 
http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/cam/opt_stats?rev=18968&r1=18967&r2=18968&view=diff

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

Modified: 
trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse2/generate_distribution.log.bz2
URL: 
http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse2/generate_distribution.log.bz2?rev=18968&r1=15367&r2=18968&view=diff

Modified: 
trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse2/pcs_dy.txt
URL: 
http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse2/pcs_dy.txt?rev=18968&r1=15367&r2=18968&view=diff

Modified: 
trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse2/pcs_er.txt
URL: 
http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse2/pcs_er.txt?rev=18968&r1=15367&r2=18968&view=diff

Modified: 
trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse2/pcs_tb.txt
URL: 
http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse2/pcs_tb.txt?rev=18968&r1=15367&r2=18968&view=diff

Modified: 
trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse2/pcs_tm.txt
URL: 
http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse2/pcs_tm.txt?rev=18968&r1=15367&r2=18968&view=diff

Modified: 
trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse2/rdc_dy.txt
URL: 
http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse2/rdc_dy.txt?rev=18968&r1=15367&r2=18968&view=diff

Modified: 
trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse2/rdc_er.txt
URL: 
http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse2/rdc_er.txt?rev=18968&r1=15367&r2=18968&view=diff

Modified: 
trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse2/rdc_tb.txt
URL: 
http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse2/rdc_tb.txt?rev=18968&r1=15367&r2=18968&view=diff

Modified: 
trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse2/rdc_tm.txt
URL: 
http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse2/rdc_tm.txt?rev=18968&r1=15367&r2=18968&view=diff

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

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

Related Messages


Powered by MHonArc, Updated Fri Mar 22 16:20:02 2013