r18964 - in /trunk: specific_fns/ test_suite/shared_data/frame_order/cam/ test_suite/system_tests/ test_suite/system_tests/s... -- March 22, 2013 - 15:33

Author: bugman
Date: Fri Mar 22 15:33:31 2013
New Revision: 18964

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

The commands used were:
svn merge -r15320:15321 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r15323:15324 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r15324:15325 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r15327:15328 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r15328:15329 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r15329:15330 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .

The console messages were:
[edau@localhost relax-trunk]$ svn merge -r15320:15321 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r15321 into '.':
U    test_suite/system_tests/frame_order.py
[edau@localhost relax-trunk]$ svn merge -r15323:15324 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r15324 into '.':
U    test_suite/system_tests/scripts/frame_order/cam/iso_cone.py
U    test_suite/system_tests/scripts/frame_order/cam/iso_cone_torsionless.py
[edau@localhost relax-trunk]$ svn merge -r15324:15325 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r15325 into '.':
U    test_suite/system_tests/scripts/frame_order/cam/base_script.py
G    test_suite/system_tests/frame_order.py
[edau@localhost relax-trunk]$ svn merge -r15327:15328 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r15328 into '.':
U    test_suite/shared_data/frame_order/cam/opt_stats
G    test_suite/system_tests/frame_order.py
[edau@localhost relax-trunk]$ svn merge -r15328:15329 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r15329 into '.':
G    test_suite/system_tests/frame_order.py
[edau@localhost relax-trunk]$ svn merge -r15329:15330 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r15330 into '.':
U    specific_fns/frame_order.py
[edau@localhost relax-trunk]$


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