r18973 - in /trunk: auto_analyses/ extern/sobol/ generic_fns/ prompt/ specific_fns/ test_suite/shared_data/frame_order/cam/ ...r18973 - in /trunk: auto_analyses/ extern/sobol/ generic_fns/ prompt/ specific_fns/ test_suite/shared_data/frame_order/cam/ ...Author: bugman Date: Fri Mar 22 16:27:35 2013 New Revision: 18973 URL: http://svn.gna.org/viewcvs/relax?rev=18973&view=rev Log: Next block of the manual merger of the frame_order_testing branch. The commands used were: svn merge -r17250:17251 svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing . svn merge -r17255:17256 svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing . svn merge -r17257:17258 svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing . svn merge -r17258:17259 svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing . svn merge -r17259:17260 svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing . The console messages were: [edau@localhost relax-trunk]$ svn merge -r17250:17251 svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing . --- Merging r17251 into '.': U prompt/domain.py U generic_fns/domain.py U test_suite/shared_data/frame_order/cam/generate_base.py U test_suite/system_tests/scripts/frame_order/cam/free_rotor2.py U test_suite/system_tests/scripts/frame_order/cam/base_script.py U test_suite/system_tests/scripts/frame_order/cam/iso_cone.py U test_suite/system_tests/scripts/frame_order/cam/pseudo_ellipse2.py U test_suite/system_tests/scripts/frame_order/cam/rigid.py U test_suite/system_tests/scripts/frame_order/cam/__init__.py U test_suite/system_tests/scripts/frame_order/cam/iso_cone_torsionless.py U test_suite/system_tests/scripts/frame_order/cam/pseudo_ellipse_free_rotor.py U test_suite/system_tests/scripts/frame_order/cam/rotor.py U test_suite/system_tests/scripts/frame_order/cam/free_rotor.py U test_suite/system_tests/scripts/frame_order/cam/iso_cone_free_rotor2.py U test_suite/system_tests/scripts/frame_order/cam/pseudo_ellipse.py U test_suite/system_tests/scripts/frame_order/cam/pseudo_ellipse_torsionless.py U test_suite/system_tests/scripts/frame_order/cam/iso_cone_free_rotor.py U test_suite/system_tests/scripts/frame_order/cam/rotor_2_state.py U test_suite/system_tests/scripts/frame_order/cam/rotor2.py U test_suite/system_tests/scripts/frame_order/__init__.py U test_suite/system_tests/scripts/__init__.py U extern/sobol/__init__.py U auto_analyses/frame_order.py [edau@localhost relax-trunk]$ svn merge -r17255:17256 svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing . --- Merging r17256 into '.': U specific_fns/frame_order.py [edau@localhost relax-trunk]$ svn merge -r17257:17258 svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing . --- Merging r17258 into '.': U test_suite/shared_data/frame_order/cam/rotor/rdc_dy.txt U test_suite/shared_data/frame_order/cam/rotor/rdc_tm.txt U test_suite/shared_data/frame_order/cam/rotor/rdc_tb.txt U test_suite/shared_data/frame_order/cam/rotor/rdc_er.txt [edau@localhost relax-trunk]$ svn merge -r17258:17259 svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing . --- Merging r17259 into '.': D prompt/domain.py U user_functions/__init__.py A user_functions/domain.py [edau@localhost relax-trunk]$ svn merge -r17259:17260 svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing . Conflict discovered in 'test_suite/system_tests/scripts/frame_order/cam/base_script.py'. Select: (p) postpone, (df) diff-full, (e) edit, (mc) mine-conflict, (tc) theirs-conflict, (s) show all options: p --- Merging r17260 into '.': C test_suite/system_tests/scripts/frame_order/cam/base_script.py Summary of conflicts: Text conflicts: 1 [edau@localhost relax-trunk]$ Added: trunk/user_functions/domain.py - copied unchanged from r17259, branches/frame_order_testing/user_functions/domain.py Removed: trunk/prompt/domain.py Modified: trunk/auto_analyses/frame_order.py trunk/extern/sobol/__init__.py trunk/generic_fns/domain.py trunk/specific_fns/frame_order.py trunk/test_suite/shared_data/frame_order/cam/generate_base.py trunk/test_suite/shared_data/frame_order/cam/rotor/rdc_dy.txt trunk/test_suite/shared_data/frame_order/cam/rotor/rdc_er.txt trunk/test_suite/shared_data/frame_order/cam/rotor/rdc_tb.txt trunk/test_suite/shared_data/frame_order/cam/rotor/rdc_tm.txt trunk/test_suite/system_tests/scripts/__init__.py trunk/test_suite/system_tests/scripts/frame_order/__init__.py trunk/test_suite/system_tests/scripts/frame_order/cam/__init__.py trunk/test_suite/system_tests/scripts/frame_order/cam/base_script.py trunk/test_suite/system_tests/scripts/frame_order/cam/free_rotor.py trunk/test_suite/system_tests/scripts/frame_order/cam/free_rotor2.py trunk/test_suite/system_tests/scripts/frame_order/cam/iso_cone.py trunk/test_suite/system_tests/scripts/frame_order/cam/iso_cone_free_rotor.py trunk/test_suite/system_tests/scripts/frame_order/cam/iso_cone_free_rotor2.py trunk/test_suite/system_tests/scripts/frame_order/cam/iso_cone_torsionless.py trunk/test_suite/system_tests/scripts/frame_order/cam/pseudo_ellipse.py trunk/test_suite/system_tests/scripts/frame_order/cam/pseudo_ellipse2.py trunk/test_suite/system_tests/scripts/frame_order/cam/pseudo_ellipse_free_rotor.py trunk/test_suite/system_tests/scripts/frame_order/cam/pseudo_ellipse_torsionless.py trunk/test_suite/system_tests/scripts/frame_order/cam/rigid.py trunk/test_suite/system_tests/scripts/frame_order/cam/rotor.py trunk/test_suite/system_tests/scripts/frame_order/cam/rotor2.py trunk/test_suite/system_tests/scripts/frame_order/cam/rotor_2_state.py trunk/user_functions/__init__.py [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/auto_analyses/frame_order.py URL: http://svn.gna.org/viewcvs/relax/trunk/auto_analyses/frame_order.py?rev=18973&r1=18972&r2=18973&view=diff Modified: trunk/extern/sobol/__init__.py URL: http://svn.gna.org/viewcvs/relax/trunk/extern/sobol/__init__.py?rev=18973&r1=18972&r2=18973&view=diff Modified: trunk/generic_fns/domain.py URL: http://svn.gna.org/viewcvs/relax/trunk/generic_fns/domain.py?rev=18973&r1=18972&r2=18973&view=diff Removed: trunk/prompt/domain.py URL: http://svn.gna.org/viewcvs/relax/trunk/prompt/domain.py?rev=18972&view=auto Modified: trunk/specific_fns/frame_order.py URL: http://svn.gna.org/viewcvs/relax/trunk/specific_fns/frame_order.py?rev=18973&r1=18972&r2=18973&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=18973&r1=18972&r2=18973&view=diff Modified: trunk/test_suite/shared_data/frame_order/cam/rotor/rdc_dy.txt URL: http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/cam/rotor/rdc_dy.txt?rev=18973&r1=18972&r2=18973&view=diff Modified: trunk/test_suite/shared_data/frame_order/cam/rotor/rdc_er.txt URL: http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/cam/rotor/rdc_er.txt?rev=18973&r1=18972&r2=18973&view=diff Modified: trunk/test_suite/shared_data/frame_order/cam/rotor/rdc_tb.txt URL: http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/cam/rotor/rdc_tb.txt?rev=18973&r1=18972&r2=18973&view=diff Modified: trunk/test_suite/shared_data/frame_order/cam/rotor/rdc_tm.txt URL: http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/cam/rotor/rdc_tm.txt?rev=18973&r1=18972&r2=18973&view=diff Modified: trunk/test_suite/system_tests/scripts/__init__.py URL: http://svn.gna.org/viewcvs/relax/trunk/test_suite/system_tests/scripts/__init__.py?rev=18973&r1=18972&r2=18973&view=diff Modified: trunk/test_suite/system_tests/scripts/frame_order/__init__.py URL: http://svn.gna.org/viewcvs/relax/trunk/test_suite/system_tests/scripts/frame_order/__init__.py?rev=18973&r1=18972&r2=18973&view=diff Modified: trunk/test_suite/system_tests/scripts/frame_order/cam/__init__.py URL: http://svn.gna.org/viewcvs/relax/trunk/test_suite/system_tests/scripts/frame_order/cam/__init__.py?rev=18973&r1=18972&r2=18973&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=18973&r1=18972&r2=18973&view=diff Modified: trunk/test_suite/system_tests/scripts/frame_order/cam/free_rotor.py URL: http://svn.gna.org/viewcvs/relax/trunk/test_suite/system_tests/scripts/frame_order/cam/free_rotor.py?rev=18973&r1=18972&r2=18973&view=diff Modified: trunk/test_suite/system_tests/scripts/frame_order/cam/free_rotor2.py URL: http://svn.gna.org/viewcvs/relax/trunk/test_suite/system_tests/scripts/frame_order/cam/free_rotor2.py?rev=18973&r1=18972&r2=18973&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=18973&r1=18972&r2=18973&view=diff Modified: trunk/test_suite/system_tests/scripts/frame_order/cam/iso_cone_free_rotor.py URL: http://svn.gna.org/viewcvs/relax/trunk/test_suite/system_tests/scripts/frame_order/cam/iso_cone_free_rotor.py?rev=18973&r1=18972&r2=18973&view=diff Modified: trunk/test_suite/system_tests/scripts/frame_order/cam/iso_cone_free_rotor2.py URL: http://svn.gna.org/viewcvs/relax/trunk/test_suite/system_tests/scripts/frame_order/cam/iso_cone_free_rotor2.py?rev=18973&r1=18972&r2=18973&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=18973&r1=18972&r2=18973&view=diff Modified: trunk/test_suite/system_tests/scripts/frame_order/cam/pseudo_ellipse.py URL: http://svn.gna.org/viewcvs/relax/trunk/test_suite/system_tests/scripts/frame_order/cam/pseudo_ellipse.py?rev=18973&r1=18972&r2=18973&view=diff Modified: trunk/test_suite/system_tests/scripts/frame_order/cam/pseudo_ellipse2.py URL: http://svn.gna.org/viewcvs/relax/trunk/test_suite/system_tests/scripts/frame_order/cam/pseudo_ellipse2.py?rev=18973&r1=18972&r2=18973&view=diff Modified: trunk/test_suite/system_tests/scripts/frame_order/cam/pseudo_ellipse_free_rotor.py URL: http://svn.gna.org/viewcvs/relax/trunk/test_suite/system_tests/scripts/frame_order/cam/pseudo_ellipse_free_rotor.py?rev=18973&r1=18972&r2=18973&view=diff Modified: trunk/test_suite/system_tests/scripts/frame_order/cam/pseudo_ellipse_torsionless.py URL: http://svn.gna.org/viewcvs/relax/trunk/test_suite/system_tests/scripts/frame_order/cam/pseudo_ellipse_torsionless.py?rev=18973&r1=18972&r2=18973&view=diff Modified: trunk/test_suite/system_tests/scripts/frame_order/cam/rigid.py URL: http://svn.gna.org/viewcvs/relax/trunk/test_suite/system_tests/scripts/frame_order/cam/rigid.py?rev=18973&r1=18972&r2=18973&view=diff Modified: trunk/test_suite/system_tests/scripts/frame_order/cam/rotor.py URL: http://svn.gna.org/viewcvs/relax/trunk/test_suite/system_tests/scripts/frame_order/cam/rotor.py?rev=18973&r1=18972&r2=18973&view=diff Modified: trunk/test_suite/system_tests/scripts/frame_order/cam/rotor2.py URL: http://svn.gna.org/viewcvs/relax/trunk/test_suite/system_tests/scripts/frame_order/cam/rotor2.py?rev=18973&r1=18972&r2=18973&view=diff Modified: trunk/test_suite/system_tests/scripts/frame_order/cam/rotor_2_state.py URL: http://svn.gna.org/viewcvs/relax/trunk/test_suite/system_tests/scripts/frame_order/cam/rotor_2_state.py?rev=18973&r1=18972&r2=18973&view=diff Modified: trunk/user_functions/__init__.py URL: http://svn.gna.org/viewcvs/relax/trunk/user_functions/__init__.py?rev=18973&r1=18972&r2=18973&view=diff