r18978 - in /trunk: generic_fns/ test_suite/shared_data/frame_order/cam/ test_suite/shared_data/frame_order/cam/free_rotor/ ... -- March 22, 2013 - 16:42

Author: bugman
Date: Fri Mar 22 16:42:12 2013
New Revision: 18978

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

The commands used were:
svn merge -r17300:17301 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r17301:17302 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r17302:17303 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r17303:17304 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r17304:17305 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r17305:17306 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r17306:17307 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r17307:17308 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r17308:17309 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r17309:17310 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .

The console messages were:
[edau@localhost relax-trunk]$ svn merge -r17300:17301 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
[edau@localhost relax-trunk]$ svn merge -r17301:17302 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r17302 into '.':
U    test_suite/shared_data/frame_order/cam/opt_stats
[edau@localhost relax-trunk]$ svn merge -r17302:17303 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r17303 into '.':
G    test_suite/shared_data/frame_order/cam/opt_stats
U    test_suite/shared_data/frame_order/cam/free_rotor/frame_order.py
[edau@localhost relax-trunk]$ svn merge -r17303:17304 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r17304 into '.':
G    test_suite/shared_data/frame_order/cam/opt_stats
U    test_suite/shared_data/frame_order/cam/rotor2/frame_order.py
U    test_suite/shared_data/frame_order/cam/rotor/frame_order.py
[edau@localhost relax-trunk]$ svn merge -r17304:17305 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r17305 into '.':
G    test_suite/shared_data/frame_order/cam/opt_stats
[edau@localhost relax-trunk]$ svn merge -r17305:17306 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r17306 into '.':
U    test_suite/system_tests/frame_order.py
[edau@localhost relax-trunk]$ svn merge -r17306:17307 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r17307 into '.':
G    test_suite/shared_data/frame_order/cam/opt_stats
[edau@localhost relax-trunk]$ svn merge -r17307:17308 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r17308 into '.':
U    test_suite/shared_data/frame_order/cam/generate_base.py
[edau@localhost relax-trunk]$ svn merge -r17308:17309 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r17309 into '.':
U    test_suite/system_tests/scripts/n_state_model/5_state_xz.py
[edau@localhost relax-trunk]$ svn merge -r17309:17310 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r17310 into '.':
U    generic_fns/align_tensor.py
U    user_functions/align_tensor.py
[edau@localhost relax-trunk]$


Modified:
    trunk/generic_fns/align_tensor.py
    trunk/test_suite/shared_data/frame_order/cam/free_rotor/frame_order.py
    trunk/test_suite/shared_data/frame_order/cam/generate_base.py
    trunk/test_suite/shared_data/frame_order/cam/opt_stats
    trunk/test_suite/shared_data/frame_order/cam/rotor/frame_order.py
    trunk/test_suite/shared_data/frame_order/cam/rotor2/frame_order.py
    trunk/test_suite/system_tests/frame_order.py
    trunk/test_suite/system_tests/scripts/n_state_model/5_state_xz.py
    trunk/user_functions/align_tensor.py

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

Modified: trunk/generic_fns/align_tensor.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/generic_fns/align_tensor.py?rev=18978&r1=18977&r2=18978&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=18978&r1=18977&r2=18978&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=18978&r1=18977&r2=18978&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=18978&r1=18977&r2=18978&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=18978&r1=18977&r2=18978&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=18978&r1=18977&r2=18978&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=18978&r1=18977&r2=18978&view=diff

Modified: trunk/test_suite/system_tests/scripts/n_state_model/5_state_xz.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/test_suite/system_tests/scripts/n_state_model/5_state_xz.py?rev=18978&r1=18977&r2=18978&view=diff

Modified: trunk/user_functions/align_tensor.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/user_functions/align_tensor.py?rev=18978&r1=18977&r2=18978&view=diff