mailr18948 - in /trunk: maths_fns/ specific_fns/ test_suite/shared_data/frame_order/free_rotor/ test_suite/shared_data/frame_ord...


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

Header


Content

Posted by edward on March 22, 2013 - 12:01:
Author: bugman
Date: Fri Mar 22 12:01:21 2013
New Revision: 18948

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

The commands used were:
svn merge -r15080:15081 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r15081:15082 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r15082:15083 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r15083:15084 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r15084:15085 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r15085:15086 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r15086:15087 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r15087:15088 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r15088:15089 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r15089:15090 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .

The console messages were:
[edau@localhost relax-trunk]$ svn merge -r15080:15081 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r15081 into '.':
U    specific_fns/frame_order.py
[edau@localhost relax-trunk]$ svn merge -r15081:15082 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r15082 into '.':
U    test_suite/shared_data/frame_order/rotor/frame_order.bz2
U    test_suite/shared_data/frame_order/rotor/cone.pdb
U    test_suite/shared_data/frame_order/rotor/ave_pos.pdb
U    test_suite/shared_data/frame_order/rotor/frame_order.log.bz2
U    test_suite/shared_data/frame_order/rotor/frame_order.py
[edau@localhost relax-trunk]$ svn merge -r15082:15083 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r15083 into '.':
U    test_suite/shared_data/frame_order/rotor2/frame_order.bz2
U    test_suite/shared_data/frame_order/rotor2/ave_pos.pdb
U    test_suite/shared_data/frame_order/rotor2/cone.pdb.gz
U    test_suite/shared_data/frame_order/rotor2/frame_order.py
[edau@localhost relax-trunk]$ svn merge -r15083:15084 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r15084 into '.':
U    maths_fns/frame_order_matrix_ops.py
U    maths_fns/frame_order.py
[edau@localhost relax-trunk]$ svn merge -r15084:15085 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r15085 into '.':
U    test_suite/shared_data/frame_order/free_rotor/frame_order.bz2
U    test_suite/shared_data/frame_order/free_rotor/cone.pdb
U    test_suite/shared_data/frame_order/free_rotor/ave_pos.pdb
U    test_suite/shared_data/frame_order/free_rotor/frame_order.log.bz2
U    test_suite/shared_data/frame_order/free_rotor/frame_order.py
[edau@localhost relax-trunk]$ svn merge -r15085:15086 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r15086 into '.':
U    test_suite/shared_data/frame_order/free_rotor2/frame_order.bz2
U    test_suite/shared_data/frame_order/free_rotor2/cone.pdb
U    test_suite/shared_data/frame_order/free_rotor2/ave_pos.pdb
U    test_suite/shared_data/frame_order/free_rotor2/frame_order.log.bz2
U    test_suite/shared_data/frame_order/free_rotor2/frame_order.py
[edau@localhost relax-trunk]$ svn merge -r15086:15087 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r15087 into '.':
U    test_suite/shared_data/frame_order/iso_cone_free_rotor/frame_order.py
[edau@localhost relax-trunk]$ svn merge -r15087:15088 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r15088 into '.':
G    maths_fns/frame_order_matrix_ops.py
G    maths_fns/frame_order.py
[edau@localhost relax-trunk]$ svn merge -r15088:15089 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r15089 into '.':
A    test_suite/shared_data/frame_order/iso_cone
A    test_suite/shared_data/frame_order/iso_cone/generate_distribution.py
A    test_suite/shared_data/frame_order/iso_cone/frame_order.bz2
A    test_suite/shared_data/frame_order/iso_cone/rdc_dy.txt
A    test_suite/shared_data/frame_order/iso_cone/tensors.py
A    test_suite/shared_data/frame_order/iso_cone/rdc_tm.txt
A    test_suite/shared_data/frame_order/iso_cone/tensor_fit.log.bz2
A    test_suite/shared_data/frame_order/iso_cone/cone.pdb
A    test_suite/shared_data/frame_order/iso_cone/pcs_tb.txt
A    test_suite/shared_data/frame_order/iso_cone/pcs_er.txt
A    test_suite/shared_data/frame_order/iso_cone/README
A    test_suite/shared_data/frame_order/iso_cone/pcs_dy.txt
A    test_suite/shared_data/frame_order/iso_cone/ave_pos.pdb
A    test_suite/shared_data/frame_order/iso_cone/frame_order.log.bz2
A    test_suite/shared_data/frame_order/iso_cone/tensor_fit.py
A    test_suite/shared_data/frame_order/iso_cone/pcs_tm.txt
A    test_suite/shared_data/frame_order/iso_cone/generate_distribution.log.bz2
A    test_suite/shared_data/frame_order/iso_cone/animate.py
A    test_suite/shared_data/frame_order/iso_cone/axis.pdb
A    test_suite/shared_data/frame_order/iso_cone/back_calc.py
A    test_suite/shared_data/frame_order/iso_cone/rdc_tb.txt
A    test_suite/shared_data/frame_order/iso_cone/frame_order.py
A    test_suite/shared_data/frame_order/iso_cone/rdc_er.txt
[edau@localhost relax-trunk]$ svn merge -r15089:15090 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r15090 into '.':
U    test_suite/shared_data/frame_order/iso_cone_free_rotor2/frame_order.py
[edau@localhost relax-trunk]$


Added:
    trunk/test_suite/shared_data/frame_order/iso_cone/
      - copied from r15089, 
branches/frame_order_testing/test_suite/shared_data/frame_order/iso_cone/
Modified:
    trunk/maths_fns/frame_order.py
    trunk/maths_fns/frame_order_matrix_ops.py
    trunk/specific_fns/frame_order.py
    trunk/test_suite/shared_data/frame_order/free_rotor/ave_pos.pdb
    trunk/test_suite/shared_data/frame_order/free_rotor/cone.pdb
    trunk/test_suite/shared_data/frame_order/free_rotor/frame_order.bz2
    trunk/test_suite/shared_data/frame_order/free_rotor/frame_order.log.bz2
    trunk/test_suite/shared_data/frame_order/free_rotor/frame_order.py
    trunk/test_suite/shared_data/frame_order/free_rotor2/ave_pos.pdb
    trunk/test_suite/shared_data/frame_order/free_rotor2/cone.pdb
    trunk/test_suite/shared_data/frame_order/free_rotor2/frame_order.bz2
    trunk/test_suite/shared_data/frame_order/free_rotor2/frame_order.log.bz2
    trunk/test_suite/shared_data/frame_order/free_rotor2/frame_order.py
    
trunk/test_suite/shared_data/frame_order/iso_cone_free_rotor/frame_order.py
    
trunk/test_suite/shared_data/frame_order/iso_cone_free_rotor2/frame_order.py
    trunk/test_suite/shared_data/frame_order/rotor/ave_pos.pdb
    trunk/test_suite/shared_data/frame_order/rotor/cone.pdb
    trunk/test_suite/shared_data/frame_order/rotor/frame_order.bz2
    trunk/test_suite/shared_data/frame_order/rotor/frame_order.log.bz2
    trunk/test_suite/shared_data/frame_order/rotor/frame_order.py
    trunk/test_suite/shared_data/frame_order/rotor2/ave_pos.pdb
    trunk/test_suite/shared_data/frame_order/rotor2/cone.pdb.gz
    trunk/test_suite/shared_data/frame_order/rotor2/frame_order.bz2
    trunk/test_suite/shared_data/frame_order/rotor2/frame_order.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=18948&r1=18947&r2=18948&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=18948&r1=18947&r2=18948&view=diff

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

Modified: trunk/test_suite/shared_data/frame_order/free_rotor/ave_pos.pdb
URL: 
http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/free_rotor/ave_pos.pdb?rev=18948&r1=18947&r2=18948&view=diff

Modified: trunk/test_suite/shared_data/frame_order/free_rotor/cone.pdb
URL: 
http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/free_rotor/cone.pdb?rev=18948&r1=18947&r2=18948&view=diff

Modified: trunk/test_suite/shared_data/frame_order/free_rotor/frame_order.bz2
URL: 
http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/free_rotor/frame_order.bz2?rev=18948&r1=18947&r2=18948&view=diff

Modified: 
trunk/test_suite/shared_data/frame_order/free_rotor/frame_order.log.bz2
URL: 
http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/free_rotor/frame_order.log.bz2?rev=18948&r1=18947&r2=18948&view=diff

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

Modified: trunk/test_suite/shared_data/frame_order/free_rotor2/ave_pos.pdb
URL: 
http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/free_rotor2/ave_pos.pdb?rev=18948&r1=18947&r2=18948&view=diff

Modified: trunk/test_suite/shared_data/frame_order/free_rotor2/cone.pdb
URL: 
http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/free_rotor2/cone.pdb?rev=18948&r1=18947&r2=18948&view=diff

Modified: trunk/test_suite/shared_data/frame_order/free_rotor2/frame_order.bz2
URL: 
http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/free_rotor2/frame_order.bz2?rev=18948&r1=18947&r2=18948&view=diff

Modified: 
trunk/test_suite/shared_data/frame_order/free_rotor2/frame_order.log.bz2
URL: 
http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/free_rotor2/frame_order.log.bz2?rev=18948&r1=18947&r2=18948&view=diff

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

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

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

Modified: trunk/test_suite/shared_data/frame_order/rotor/ave_pos.pdb
URL: 
http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/rotor/ave_pos.pdb?rev=18948&r1=18947&r2=18948&view=diff

Modified: trunk/test_suite/shared_data/frame_order/rotor/cone.pdb
URL: 
http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/rotor/cone.pdb?rev=18948&r1=18947&r2=18948&view=diff

Modified: trunk/test_suite/shared_data/frame_order/rotor/frame_order.bz2
URL: 
http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/rotor/frame_order.bz2?rev=18948&r1=18947&r2=18948&view=diff

Modified: trunk/test_suite/shared_data/frame_order/rotor/frame_order.log.bz2
URL: 
http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/rotor/frame_order.log.bz2?rev=18948&r1=18947&r2=18948&view=diff

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

Modified: trunk/test_suite/shared_data/frame_order/rotor2/ave_pos.pdb
URL: 
http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/rotor2/ave_pos.pdb?rev=18948&r1=18947&r2=18948&view=diff

Modified: trunk/test_suite/shared_data/frame_order/rotor2/cone.pdb.gz
URL: 
http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/rotor2/cone.pdb.gz?rev=18948&r1=18947&r2=18948&view=diff

Modified: trunk/test_suite/shared_data/frame_order/rotor2/frame_order.bz2
URL: 
http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/rotor2/frame_order.bz2?rev=18948&r1=18947&r2=18948&view=diff

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

Related Messages


Powered by MHonArc, Updated Fri Mar 22 12:20:03 2013