Author: bugman Date: Fri Mar 22 15:37:30 2013 New Revision: 18966 URL: http://svn.gna.org/viewcvs/relax?rev=18966&view=rev Log: Next block of the manual merger of the frame_order_testing branch. The commands used were: svn merge -r15340:15341 svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing . svn merge -r15341:15342 svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing . svn merge -r15342:15343 svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing . svn merge -r15343:15344 svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing . svn merge -r15344:15345 svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing . svn merge -r15345:15346 svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing . svn merge -r15346:15347 svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing . svn merge -r15347:15348 svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing . svn merge -r15348:15349 svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing . svn merge -r15349:15350 svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing . The console messages were: [edau@localhost relax-trunk]$ svn merge -r15340:15341 svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing . --- Merging r15341 into '.': U test_suite/shared_data/frame_order/cam/iso_cone_free_rotor/generate_distribution.py U test_suite/shared_data/frame_order/cam/iso_cone_free_rotor/rdc_dy.txt U test_suite/shared_data/frame_order/cam/iso_cone_free_rotor/rdc_tm.txt U test_suite/shared_data/frame_order/cam/iso_cone_free_rotor/pcs_tb.txt U test_suite/shared_data/frame_order/cam/iso_cone_free_rotor/pcs_er.txt U test_suite/shared_data/frame_order/cam/iso_cone_free_rotor/pcs_dy.txt U test_suite/shared_data/frame_order/cam/iso_cone_free_rotor/pcs_tm.txt U test_suite/shared_data/frame_order/cam/iso_cone_free_rotor/generate_distribution.log.bz2 U test_suite/shared_data/frame_order/cam/iso_cone_free_rotor/frame_order_matrix U test_suite/shared_data/frame_order/cam/iso_cone_free_rotor/rdc_tb.txt U test_suite/shared_data/frame_order/cam/iso_cone_free_rotor/rdc_er.txt [edau@localhost relax-trunk]$ svn merge -r15341:15342 svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing . --- Merging r15342 into '.': U test_suite/shared_data/frame_order/cam/opt_stats [edau@localhost relax-trunk]$ svn merge -r15342:15343 svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing . --- Merging r15343 into '.': U test_suite/system_tests/scripts/frame_order/cam/iso_cone.py U test_suite/system_tests/scripts/frame_order/cam/iso_cone_free_rotor.py [edau@localhost relax-trunk]$ svn merge -r15343:15344 svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing . --- Merging r15344 into '.': U test_suite/shared_data/frame_order/cam/iso_cone_free_rotor2/generate_distribution.py U test_suite/shared_data/frame_order/cam/iso_cone_free_rotor2/rdc_dy.txt U test_suite/shared_data/frame_order/cam/iso_cone_free_rotor2/rdc_tm.txt U test_suite/shared_data/frame_order/cam/iso_cone_free_rotor2/pcs_tb.txt U test_suite/shared_data/frame_order/cam/iso_cone_free_rotor2/pcs_er.txt U test_suite/shared_data/frame_order/cam/iso_cone_free_rotor2/pcs_dy.txt U test_suite/shared_data/frame_order/cam/iso_cone_free_rotor2/pcs_tm.txt U test_suite/shared_data/frame_order/cam/iso_cone_free_rotor2/generate_distribution.log.bz2 U test_suite/shared_data/frame_order/cam/iso_cone_free_rotor2/frame_order_matrix U test_suite/shared_data/frame_order/cam/iso_cone_free_rotor2/rdc_tb.txt U test_suite/shared_data/frame_order/cam/iso_cone_free_rotor2/rdc_er.txt [edau@localhost relax-trunk]$ svn merge -r15344:15345 svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing . --- Merging r15345 into '.': U test_suite/shared_data/frame_order/cam/free_rotor/generate_distribution.py U test_suite/shared_data/frame_order/cam/free_rotor/rdc_dy.txt U test_suite/shared_data/frame_order/cam/free_rotor/rdc_tm.txt U test_suite/shared_data/frame_order/cam/free_rotor/pcs_tb.txt U test_suite/shared_data/frame_order/cam/free_rotor/pcs_er.txt U test_suite/shared_data/frame_order/cam/free_rotor/pcs_dy.txt U test_suite/shared_data/frame_order/cam/free_rotor/pcs_tm.txt A test_suite/shared_data/frame_order/cam/free_rotor/generate_distribution.log.bz2 U test_suite/shared_data/frame_order/cam/free_rotor/frame_order_matrix U test_suite/shared_data/frame_order/cam/free_rotor/rdc_tb.txt U test_suite/shared_data/frame_order/cam/free_rotor/rdc_er.txt D test_suite/shared_data/frame_order/cam/free_rotor/generate_distribution.log [edau@localhost relax-trunk]$ svn merge -r15345:15346 svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing . --- Merging r15346 into '.': U test_suite/shared_data/frame_order/cam/free_rotor2/generate_distribution.py U test_suite/shared_data/frame_order/cam/free_rotor2/rdc_dy.txt U test_suite/shared_data/frame_order/cam/free_rotor2/rdc_tm.txt U test_suite/shared_data/frame_order/cam/free_rotor2/pcs_tb.txt U test_suite/shared_data/frame_order/cam/free_rotor2/pcs_er.txt U test_suite/shared_data/frame_order/cam/free_rotor2/pcs_dy.txt U test_suite/shared_data/frame_order/cam/free_rotor2/pcs_tm.txt A test_suite/shared_data/frame_order/cam/free_rotor2/generate_distribution.log.bz2 A test_suite/shared_data/frame_order/cam/free_rotor2/axis_system U test_suite/shared_data/frame_order/cam/free_rotor2/axis.pdb A test_suite/shared_data/frame_order/cam/free_rotor2/frame_order_matrix U test_suite/shared_data/frame_order/cam/free_rotor2/rdc_tb.txt U test_suite/shared_data/frame_order/cam/free_rotor2/rdc_er.txt [edau@localhost relax-trunk]$ svn merge -r15346:15347 svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing . --- Merging r15347 into '.': U test_suite/shared_data/frame_order/cam/rotor/generate_distribution.py 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/pcs_tb.txt U test_suite/shared_data/frame_order/cam/rotor/pcs_er.txt U test_suite/shared_data/frame_order/cam/rotor/pcs_dy.txt U test_suite/shared_data/frame_order/cam/rotor/pcs_tm.txt A test_suite/shared_data/frame_order/cam/rotor/generate_distribution.log.bz2 A test_suite/shared_data/frame_order/cam/rotor/axis_system U test_suite/shared_data/frame_order/cam/rotor/axis.pdb A test_suite/shared_data/frame_order/cam/rotor/frame_order_matrix U test_suite/shared_data/frame_order/cam/rotor/rdc_tb.txt U test_suite/shared_data/frame_order/cam/rotor/rdc_er.txt D test_suite/shared_data/frame_order/cam/rotor/generate_distribution.log [edau@localhost relax-trunk]$ svn merge -r15347:15348 svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing . --- Merging r15348 into '.': A extern/sobol/test.log A extern/sobol/test.py [edau@localhost relax-trunk]$ svn merge -r15348:15349 svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing . --- Merging r15349 into '.': G test_suite/shared_data/frame_order/cam/rotor/generate_distribution.py [edau@localhost relax-trunk]$ svn merge -r15349:15350 svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing . --- Merging r15350 into '.': G test_suite/shared_data/frame_order/cam/free_rotor2/generate_distribution.py [edau@localhost relax-trunk]$ Added: trunk/extern/sobol/test.log - copied unchanged from r15348, branches/frame_order_testing/extern/sobol/test.log trunk/extern/sobol/test.py - copied unchanged from r15348, branches/frame_order_testing/extern/sobol/test.py trunk/test_suite/shared_data/frame_order/cam/free_rotor/generate_distribution.log.bz2 - copied unchanged from r15345, branches/frame_order_testing/test_suite/shared_data/frame_order/cam/free_rotor/generate_distribution.log.bz2 trunk/test_suite/shared_data/frame_order/cam/free_rotor2/axis_system - copied unchanged from r15346, branches/frame_order_testing/test_suite/shared_data/frame_order/cam/free_rotor2/axis_system trunk/test_suite/shared_data/frame_order/cam/free_rotor2/frame_order_matrix - copied unchanged from r15346, branches/frame_order_testing/test_suite/shared_data/frame_order/cam/free_rotor2/frame_order_matrix trunk/test_suite/shared_data/frame_order/cam/free_rotor2/generate_distribution.log.bz2 - copied unchanged from r15346, branches/frame_order_testing/test_suite/shared_data/frame_order/cam/free_rotor2/generate_distribution.log.bz2 trunk/test_suite/shared_data/frame_order/cam/rotor/axis_system - copied unchanged from r15347, branches/frame_order_testing/test_suite/shared_data/frame_order/cam/rotor/axis_system trunk/test_suite/shared_data/frame_order/cam/rotor/frame_order_matrix - copied unchanged from r15347, branches/frame_order_testing/test_suite/shared_data/frame_order/cam/rotor/frame_order_matrix trunk/test_suite/shared_data/frame_order/cam/rotor/generate_distribution.log.bz2 - copied unchanged from r15347, branches/frame_order_testing/test_suite/shared_data/frame_order/cam/rotor/generate_distribution.log.bz2 Removed: trunk/test_suite/shared_data/frame_order/cam/free_rotor/generate_distribution.log trunk/test_suite/shared_data/frame_order/cam/rotor/generate_distribution.log Modified: trunk/test_suite/shared_data/frame_order/cam/free_rotor/frame_order_matrix trunk/test_suite/shared_data/frame_order/cam/free_rotor/generate_distribution.py trunk/test_suite/shared_data/frame_order/cam/free_rotor/pcs_dy.txt trunk/test_suite/shared_data/frame_order/cam/free_rotor/pcs_er.txt trunk/test_suite/shared_data/frame_order/cam/free_rotor/pcs_tb.txt trunk/test_suite/shared_data/frame_order/cam/free_rotor/pcs_tm.txt trunk/test_suite/shared_data/frame_order/cam/free_rotor/rdc_dy.txt trunk/test_suite/shared_data/frame_order/cam/free_rotor/rdc_er.txt trunk/test_suite/shared_data/frame_order/cam/free_rotor/rdc_tb.txt trunk/test_suite/shared_data/frame_order/cam/free_rotor/rdc_tm.txt trunk/test_suite/shared_data/frame_order/cam/free_rotor2/axis.pdb trunk/test_suite/shared_data/frame_order/cam/free_rotor2/generate_distribution.py trunk/test_suite/shared_data/frame_order/cam/free_rotor2/pcs_dy.txt trunk/test_suite/shared_data/frame_order/cam/free_rotor2/pcs_er.txt trunk/test_suite/shared_data/frame_order/cam/free_rotor2/pcs_tb.txt trunk/test_suite/shared_data/frame_order/cam/free_rotor2/pcs_tm.txt trunk/test_suite/shared_data/frame_order/cam/free_rotor2/rdc_dy.txt trunk/test_suite/shared_data/frame_order/cam/free_rotor2/rdc_er.txt trunk/test_suite/shared_data/frame_order/cam/free_rotor2/rdc_tb.txt trunk/test_suite/shared_data/frame_order/cam/free_rotor2/rdc_tm.txt trunk/test_suite/shared_data/frame_order/cam/iso_cone_free_rotor/frame_order_matrix trunk/test_suite/shared_data/frame_order/cam/iso_cone_free_rotor/generate_distribution.log.bz2 trunk/test_suite/shared_data/frame_order/cam/iso_cone_free_rotor/generate_distribution.py trunk/test_suite/shared_data/frame_order/cam/iso_cone_free_rotor/pcs_dy.txt trunk/test_suite/shared_data/frame_order/cam/iso_cone_free_rotor/pcs_er.txt trunk/test_suite/shared_data/frame_order/cam/iso_cone_free_rotor/pcs_tb.txt trunk/test_suite/shared_data/frame_order/cam/iso_cone_free_rotor/pcs_tm.txt trunk/test_suite/shared_data/frame_order/cam/iso_cone_free_rotor/rdc_dy.txt trunk/test_suite/shared_data/frame_order/cam/iso_cone_free_rotor/rdc_er.txt trunk/test_suite/shared_data/frame_order/cam/iso_cone_free_rotor/rdc_tb.txt trunk/test_suite/shared_data/frame_order/cam/iso_cone_free_rotor/rdc_tm.txt trunk/test_suite/shared_data/frame_order/cam/iso_cone_free_rotor2/frame_order_matrix trunk/test_suite/shared_data/frame_order/cam/iso_cone_free_rotor2/generate_distribution.log.bz2 trunk/test_suite/shared_data/frame_order/cam/iso_cone_free_rotor2/generate_distribution.py trunk/test_suite/shared_data/frame_order/cam/iso_cone_free_rotor2/pcs_dy.txt trunk/test_suite/shared_data/frame_order/cam/iso_cone_free_rotor2/pcs_er.txt trunk/test_suite/shared_data/frame_order/cam/iso_cone_free_rotor2/pcs_tb.txt trunk/test_suite/shared_data/frame_order/cam/iso_cone_free_rotor2/pcs_tm.txt trunk/test_suite/shared_data/frame_order/cam/iso_cone_free_rotor2/rdc_dy.txt trunk/test_suite/shared_data/frame_order/cam/iso_cone_free_rotor2/rdc_er.txt trunk/test_suite/shared_data/frame_order/cam/iso_cone_free_rotor2/rdc_tb.txt trunk/test_suite/shared_data/frame_order/cam/iso_cone_free_rotor2/rdc_tm.txt trunk/test_suite/shared_data/frame_order/cam/opt_stats trunk/test_suite/shared_data/frame_order/cam/rotor/axis.pdb trunk/test_suite/shared_data/frame_order/cam/rotor/generate_distribution.py trunk/test_suite/shared_data/frame_order/cam/rotor/pcs_dy.txt trunk/test_suite/shared_data/frame_order/cam/rotor/pcs_er.txt trunk/test_suite/shared_data/frame_order/cam/rotor/pcs_tb.txt trunk/test_suite/shared_data/frame_order/cam/rotor/pcs_tm.txt 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/frame_order/cam/iso_cone.py trunk/test_suite/system_tests/scripts/frame_order/cam/iso_cone_free_rotor.py [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/test_suite/shared_data/frame_order/cam/free_rotor/frame_order_matrix URL: http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/cam/free_rotor/frame_order_matrix?rev=18966&r1=18965&r2=18966&view=diff Removed: trunk/test_suite/shared_data/frame_order/cam/free_rotor/generate_distribution.log URL: http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/cam/free_rotor/generate_distribution.log?rev=18965&view=auto Modified: trunk/test_suite/shared_data/frame_order/cam/free_rotor/generate_distribution.py URL: http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/cam/free_rotor/generate_distribution.py?rev=18966&r1=18965&r2=18966&view=diff Modified: trunk/test_suite/shared_data/frame_order/cam/free_rotor/pcs_dy.txt URL: http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/cam/free_rotor/pcs_dy.txt?rev=18966&r1=18965&r2=18966&view=diff Modified: trunk/test_suite/shared_data/frame_order/cam/free_rotor/pcs_er.txt URL: http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/cam/free_rotor/pcs_er.txt?rev=18966&r1=18965&r2=18966&view=diff Modified: trunk/test_suite/shared_data/frame_order/cam/free_rotor/pcs_tb.txt URL: http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/cam/free_rotor/pcs_tb.txt?rev=18966&r1=18965&r2=18966&view=diff Modified: trunk/test_suite/shared_data/frame_order/cam/free_rotor/pcs_tm.txt URL: http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/cam/free_rotor/pcs_tm.txt?rev=18966&r1=18965&r2=18966&view=diff Modified: trunk/test_suite/shared_data/frame_order/cam/free_rotor/rdc_dy.txt URL: http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/cam/free_rotor/rdc_dy.txt?rev=18966&r1=18965&r2=18966&view=diff Modified: trunk/test_suite/shared_data/frame_order/cam/free_rotor/rdc_er.txt URL: http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/cam/free_rotor/rdc_er.txt?rev=18966&r1=18965&r2=18966&view=diff Modified: trunk/test_suite/shared_data/frame_order/cam/free_rotor/rdc_tb.txt URL: http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/cam/free_rotor/rdc_tb.txt?rev=18966&r1=18965&r2=18966&view=diff Modified: trunk/test_suite/shared_data/frame_order/cam/free_rotor/rdc_tm.txt URL: http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/cam/free_rotor/rdc_tm.txt?rev=18966&r1=18965&r2=18966&view=diff Modified: trunk/test_suite/shared_data/frame_order/cam/free_rotor2/axis.pdb URL: http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/cam/free_rotor2/axis.pdb?rev=18966&r1=18965&r2=18966&view=diff Modified: trunk/test_suite/shared_data/frame_order/cam/free_rotor2/generate_distribution.py URL: http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/cam/free_rotor2/generate_distribution.py?rev=18966&r1=18965&r2=18966&view=diff Modified: trunk/test_suite/shared_data/frame_order/cam/free_rotor2/pcs_dy.txt URL: http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/cam/free_rotor2/pcs_dy.txt?rev=18966&r1=18965&r2=18966&view=diff Modified: trunk/test_suite/shared_data/frame_order/cam/free_rotor2/pcs_er.txt URL: http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/cam/free_rotor2/pcs_er.txt?rev=18966&r1=18965&r2=18966&view=diff Modified: trunk/test_suite/shared_data/frame_order/cam/free_rotor2/pcs_tb.txt URL: http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/cam/free_rotor2/pcs_tb.txt?rev=18966&r1=18965&r2=18966&view=diff Modified: trunk/test_suite/shared_data/frame_order/cam/free_rotor2/pcs_tm.txt URL: http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/cam/free_rotor2/pcs_tm.txt?rev=18966&r1=18965&r2=18966&view=diff Modified: trunk/test_suite/shared_data/frame_order/cam/free_rotor2/rdc_dy.txt URL: http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/cam/free_rotor2/rdc_dy.txt?rev=18966&r1=18965&r2=18966&view=diff Modified: trunk/test_suite/shared_data/frame_order/cam/free_rotor2/rdc_er.txt URL: http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/cam/free_rotor2/rdc_er.txt?rev=18966&r1=18965&r2=18966&view=diff Modified: trunk/test_suite/shared_data/frame_order/cam/free_rotor2/rdc_tb.txt URL: http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/cam/free_rotor2/rdc_tb.txt?rev=18966&r1=18965&r2=18966&view=diff Modified: trunk/test_suite/shared_data/frame_order/cam/free_rotor2/rdc_tm.txt URL: http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/cam/free_rotor2/rdc_tm.txt?rev=18966&r1=18965&r2=18966&view=diff Modified: trunk/test_suite/shared_data/frame_order/cam/iso_cone_free_rotor/frame_order_matrix URL: http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/cam/iso_cone_free_rotor/frame_order_matrix?rev=18966&r1=18965&r2=18966&view=diff Modified: trunk/test_suite/shared_data/frame_order/cam/iso_cone_free_rotor/generate_distribution.log.bz2 URL: http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/cam/iso_cone_free_rotor/generate_distribution.log.bz2?rev=18966&r1=18965&r2=18966&view=diff Modified: trunk/test_suite/shared_data/frame_order/cam/iso_cone_free_rotor/generate_distribution.py URL: http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/cam/iso_cone_free_rotor/generate_distribution.py?rev=18966&r1=18965&r2=18966&view=diff Modified: trunk/test_suite/shared_data/frame_order/cam/iso_cone_free_rotor/pcs_dy.txt URL: http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/cam/iso_cone_free_rotor/pcs_dy.txt?rev=18966&r1=18965&r2=18966&view=diff Modified: trunk/test_suite/shared_data/frame_order/cam/iso_cone_free_rotor/pcs_er.txt URL: http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/cam/iso_cone_free_rotor/pcs_er.txt?rev=18966&r1=18965&r2=18966&view=diff Modified: trunk/test_suite/shared_data/frame_order/cam/iso_cone_free_rotor/pcs_tb.txt [... 92 lines stripped ...]