mailr18962 - in /trunk: maths_fns/ test_suite/shared_data/frame_order/cam/ test_suite/shared_data/frame_order/cam/free_rotor/ te...


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

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

The commands used were:
svn merge -r15300:15301 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r15301:15302 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r15302:15303 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r15303:15304 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r15304:15305 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r15305:15306 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r15306:15307 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r15307:15308 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r15308:15309 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r15309:15310 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .

The console messages were:
[edau@localhost relax-trunk]$ svn merge -r15300:15301 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r15301 into '.':
U    maths_fns/frame_order_matrix_ops.py
[edau@localhost relax-trunk]$ svn merge -r15301:15302 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r15302 into '.':
U    test_suite/system_tests/scripts/frame_order/cam/base_script.py
[edau@localhost relax-trunk]$ svn merge -r15302:15303 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r15303 into '.':
U    test_suite/system_tests/frame_order.py
[edau@localhost relax-trunk]$ svn merge -r15303:15304 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r15304 into '.':
U    test_suite/system_tests/scripts/frame_order/cam/iso_cone.py
[edau@localhost relax-trunk]$ svn merge -r15304:15305 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r15305 into '.':
G    test_suite/system_tests/frame_order.py
[edau@localhost relax-trunk]$ svn merge -r15305:15306 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r15306 into '.':
U    test_suite/shared_data/frame_order/cam/pseudo_ellipse_torsionless/README
U    test_suite/shared_data/frame_order/cam/rotor2/README
U    test_suite/shared_data/frame_order/cam/free_rotor2/README
U    test_suite/shared_data/frame_order/cam/iso_cone/README
U    test_suite/shared_data/frame_order/cam/iso_cone_torsionless/README
U    test_suite/shared_data/frame_order/cam/pseudo_ellipse_free_rotor/README
U    test_suite/shared_data/frame_order/cam/rotor/README
U    test_suite/shared_data/frame_order/cam/iso_cone_free_rotor2/README
U    test_suite/shared_data/frame_order/cam/free_rotor/README
U    test_suite/shared_data/frame_order/cam/pseudo_ellipse/README
[edau@localhost relax-trunk]$ svn merge -r15306:15307 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r15307 into '.':
A    test_suite/shared_data/frame_order/cam/opt_stats
[edau@localhost relax-trunk]$ svn merge -r15307:15308 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r15308 into '.':
U    test_suite/shared_data/frame_order/cam/opt_stats
[edau@localhost relax-trunk]$ svn merge -r15308:15309 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r15309 into '.':
G    test_suite/shared_data/frame_order/cam/opt_stats
[edau@localhost relax-trunk]$ svn merge -r15309:15310 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r15310 into '.':
U    test_suite/shared_data/frame_order/cam/iso_cone/frame_order.bz2
U    test_suite/shared_data/frame_order/cam/iso_cone/cone.pdb
U    test_suite/shared_data/frame_order/cam/iso_cone/ave_pos.pdb
U    test_suite/shared_data/frame_order/cam/iso_cone/frame_order.log.bz2
[edau@localhost relax-trunk]$


Added:
    trunk/test_suite/shared_data/frame_order/cam/opt_stats
      - copied, changed from r15307, 
branches/frame_order_testing/test_suite/shared_data/frame_order/cam/opt_stats
Modified:
    trunk/maths_fns/frame_order_matrix_ops.py
    trunk/test_suite/shared_data/frame_order/cam/free_rotor/README
    trunk/test_suite/shared_data/frame_order/cam/free_rotor2/README
    trunk/test_suite/shared_data/frame_order/cam/iso_cone/README
    trunk/test_suite/shared_data/frame_order/cam/iso_cone/ave_pos.pdb
    trunk/test_suite/shared_data/frame_order/cam/iso_cone/cone.pdb
    trunk/test_suite/shared_data/frame_order/cam/iso_cone/frame_order.bz2
    trunk/test_suite/shared_data/frame_order/cam/iso_cone/frame_order.log.bz2
    trunk/test_suite/shared_data/frame_order/cam/iso_cone_free_rotor2/README
    trunk/test_suite/shared_data/frame_order/cam/iso_cone_torsionless/README
    trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse/README
    
trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse_free_rotor/README
    
trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse_torsionless/README
    trunk/test_suite/shared_data/frame_order/cam/rotor/README
    trunk/test_suite/shared_data/frame_order/cam/rotor2/README
    trunk/test_suite/system_tests/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.py

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

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=18962&r1=18961&r2=18962&view=diff

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

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

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

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

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

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

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

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

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

Copied: trunk/test_suite/shared_data/frame_order/cam/opt_stats (from r15307, 
branches/frame_order_testing/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?p2=trunk/test_suite/shared_data/frame_order/cam/opt_stats&p1=branches/frame_order_testing/test_suite/shared_data/frame_order/cam/opt_stats&r1=15307&r2=18962&rev=18962&view=diff

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

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

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

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

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

Related Messages


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