r18996 - in /trunk: maths_fns/frame_order/ specific_fns/ test_suite/shared_data/frame_order/cam/ test_suite/shared_data/fram... -- March 22, 2013 - 17:23

Author: bugman
Date: Fri Mar 22 17:23:00 2013
New Revision: 18996

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

The commands used were:
svn merge -r18600:18601 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r18601:18602 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r18602:18603 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r18610:18611 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r18613:18614 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r18614:18615 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r18615:18616 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r18616:18617 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r18617:18618 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r18618:18619 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .

The console messages were:
[edau@localhost relax-trunk]$ svn merge -r18600:18601 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r18601 into '.':
U    test_suite/shared_data/frame_order/cam/full_analysis.py
[edau@localhost relax-trunk]$ svn merge -r18601:18602 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r18602 into '.':
A    test_suite/shared_data/frame_order/cam/1J7P_1st_NH_rot_trans.pdb
[edau@localhost relax-trunk]$ svn merge -r18602:18603 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r18603 into '.':
A    test_suite/shared_data/frame_order/cam/displacements.py
[edau@localhost relax-trunk]$ svn merge -r18610:18611 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r18611 into '.':
A    test_suite/shared_data/frame_order/displacements
A    test_suite/shared_data/frame_order/displacements/create_pdb.py
A    test_suite/shared_data/frame_order/displacements/rdc_yb.txt
A    test_suite/shared_data/frame_order/displacements/rdc_dy.txt
A    test_suite/shared_data/frame_order/displacements/rdc_tm.txt
A    test_suite/shared_data/frame_order/displacements/pcs_tb.txt
A    test_suite/shared_data/frame_order/displacements/pcs_er.txt
A    test_suite/shared_data/frame_order/displacements/pcs_ho.txt
A    test_suite/shared_data/frame_order/displacements/displaced.pdb
A    test_suite/shared_data/frame_order/displacements/pcs_yb.txt
A    test_suite/shared_data/frame_order/displacements/pcs_dy.txt
A    test_suite/shared_data/frame_order/displacements/pcs_tm.txt
A    test_suite/shared_data/frame_order/displacements/generate_data.py
A    test_suite/shared_data/frame_order/displacements/displace.py
A    test_suite/shared_data/frame_order/displacements/fancy_mol.pdb
A    test_suite/shared_data/frame_order/displacements/rdc_tb.txt
A    test_suite/shared_data/frame_order/displacements/rdc_ho.txt
A    test_suite/shared_data/frame_order/displacements/rdc_er.txt
[edau@localhost relax-trunk]$ svn merge -r18613:18614 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r18614 into '.':
U    test_suite/shared_data/frame_order/displacements/rdc_yb.txt
U    test_suite/shared_data/frame_order/displacements/rdc_dy.txt
U    test_suite/shared_data/frame_order/displacements/rdc_tm.txt
U    test_suite/shared_data/frame_order/displacements/pcs_tb.txt
U    test_suite/shared_data/frame_order/displacements/pcs_er.txt
U    test_suite/shared_data/frame_order/displacements/pcs_ho.txt
U    test_suite/shared_data/frame_order/displacements/pcs_yb.txt
U    test_suite/shared_data/frame_order/displacements/pcs_dy.txt
U    test_suite/shared_data/frame_order/displacements/pcs_tm.txt
U    test_suite/shared_data/frame_order/displacements/generate_data.py
U    test_suite/shared_data/frame_order/displacements/rdc_tb.txt
U    test_suite/shared_data/frame_order/displacements/rdc_ho.txt
U    test_suite/shared_data/frame_order/displacements/rdc_er.txt
[edau@localhost relax-trunk]$ svn merge -r18614:18615 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r18615 into '.':
U    test_suite/shared_data/frame_order/displacements/displace.py
[edau@localhost relax-trunk]$ svn merge -r18615:18616 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r18616 into '.':
A    test_suite/shared_data/frame_order/displacements/rigid_test.py
[edau@localhost relax-trunk]$ svn merge -r18616:18617 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r18617 into '.':
U    test_suite/shared_data/frame_order/displacements/rigid_test.py
[edau@localhost relax-trunk]$ svn merge -r18617:18618 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r18618 into '.':
U    maths_fns/frame_order/__init__.py
U    specific_fns/frame_order.py
[edau@localhost relax-trunk]$ svn merge -r18618:18619 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r18619 into '.':
G    maths_fns/frame_order/__init__.py
[edau@localhost relax-trunk]$


Added:
    trunk/test_suite/shared_data/frame_order/cam/1J7P_1st_NH_rot_trans.pdb
      - copied unchanged from r18602, 
branches/frame_order_testing/test_suite/shared_data/frame_order/cam/1J7P_1st_NH_rot_trans.pdb
    trunk/test_suite/shared_data/frame_order/cam/displacements.py
      - copied unchanged from r18603, 
branches/frame_order_testing/test_suite/shared_data/frame_order/cam/displacements.py
    trunk/test_suite/shared_data/frame_order/displacements/
      - copied from r18611, 
branches/frame_order_testing/test_suite/shared_data/frame_order/displacements/
    trunk/test_suite/shared_data/frame_order/displacements/rigid_test.py
      - copied, changed from r18616, 
branches/frame_order_testing/test_suite/shared_data/frame_order/displacements/rigid_test.py
Modified:
    trunk/maths_fns/frame_order/__init__.py
    trunk/specific_fns/frame_order.py
    trunk/test_suite/shared_data/frame_order/cam/full_analysis.py
    trunk/test_suite/shared_data/frame_order/displacements/displace.py
    trunk/test_suite/shared_data/frame_order/displacements/generate_data.py
    trunk/test_suite/shared_data/frame_order/displacements/pcs_dy.txt
    trunk/test_suite/shared_data/frame_order/displacements/pcs_er.txt
    trunk/test_suite/shared_data/frame_order/displacements/pcs_ho.txt
    trunk/test_suite/shared_data/frame_order/displacements/pcs_tb.txt
    trunk/test_suite/shared_data/frame_order/displacements/pcs_tm.txt
    trunk/test_suite/shared_data/frame_order/displacements/pcs_yb.txt
    trunk/test_suite/shared_data/frame_order/displacements/rdc_dy.txt
    trunk/test_suite/shared_data/frame_order/displacements/rdc_er.txt
    trunk/test_suite/shared_data/frame_order/displacements/rdc_ho.txt
    trunk/test_suite/shared_data/frame_order/displacements/rdc_tb.txt
    trunk/test_suite/shared_data/frame_order/displacements/rdc_tm.txt
    trunk/test_suite/shared_data/frame_order/displacements/rdc_yb.txt

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

Modified: trunk/maths_fns/frame_order/__init__.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/maths_fns/frame_order/__init__.py?rev=18996&r1=18995&r2=18996&view=diff

Modified: trunk/specific_fns/frame_order.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/specific_fns/frame_order.py?rev=18996&r1=18995&r2=18996&view=diff

Modified: trunk/test_suite/shared_data/frame_order/cam/full_analysis.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/cam/full_analysis.py?rev=18996&r1=18995&r2=18996&view=diff

Modified: trunk/test_suite/shared_data/frame_order/displacements/displace.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/displacements/displace.py?rev=18996&r1=18611&r2=18996&view=diff

Modified: 
trunk/test_suite/shared_data/frame_order/displacements/generate_data.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/displacements/generate_data.py?rev=18996&r1=18611&r2=18996&view=diff

Modified: trunk/test_suite/shared_data/frame_order/displacements/pcs_dy.txt
URL: 
http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/displacements/pcs_dy.txt?rev=18996&r1=18611&r2=18996&view=diff

Modified: trunk/test_suite/shared_data/frame_order/displacements/pcs_er.txt
URL: 
http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/displacements/pcs_er.txt?rev=18996&r1=18611&r2=18996&view=diff

Modified: trunk/test_suite/shared_data/frame_order/displacements/pcs_ho.txt
URL: 
http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/displacements/pcs_ho.txt?rev=18996&r1=18611&r2=18996&view=diff

Modified: trunk/test_suite/shared_data/frame_order/displacements/pcs_tb.txt
URL: 
http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/displacements/pcs_tb.txt?rev=18996&r1=18611&r2=18996&view=diff

Modified: trunk/test_suite/shared_data/frame_order/displacements/pcs_tm.txt
URL: 
http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/displacements/pcs_tm.txt?rev=18996&r1=18611&r2=18996&view=diff

Modified: trunk/test_suite/shared_data/frame_order/displacements/pcs_yb.txt
URL: 
http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/displacements/pcs_yb.txt?rev=18996&r1=18611&r2=18996&view=diff

Modified: trunk/test_suite/shared_data/frame_order/displacements/rdc_dy.txt
URL: 
http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/displacements/rdc_dy.txt?rev=18996&r1=18611&r2=18996&view=diff

Modified: trunk/test_suite/shared_data/frame_order/displacements/rdc_er.txt
URL: 
http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/displacements/rdc_er.txt?rev=18996&r1=18611&r2=18996&view=diff

Modified: trunk/test_suite/shared_data/frame_order/displacements/rdc_ho.txt
URL: 
http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/displacements/rdc_ho.txt?rev=18996&r1=18611&r2=18996&view=diff

Modified: trunk/test_suite/shared_data/frame_order/displacements/rdc_tb.txt
URL: 
http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/displacements/rdc_tb.txt?rev=18996&r1=18611&r2=18996&view=diff

Modified: trunk/test_suite/shared_data/frame_order/displacements/rdc_tm.txt
URL: 
http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/displacements/rdc_tm.txt?rev=18996&r1=18611&r2=18996&view=diff

Modified: trunk/test_suite/shared_data/frame_order/displacements/rdc_yb.txt
URL: 
http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/displacements/rdc_yb.txt?rev=18996&r1=18611&r2=18996&view=diff

Copied: trunk/test_suite/shared_data/frame_order/displacements/rigid_test.py 
(from r18616, 
branches/frame_order_testing/test_suite/shared_data/frame_order/displacements/rigid_test.py)
URL: 
http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/displacements/rigid_test.py?p2=trunk/test_suite/shared_data/frame_order/displacements/rigid_test.py&p1=branches/frame_order_testing/test_suite/shared_data/frame_order/displacements/rigid_test.py&r1=18616&r2=18996&rev=18996&view=diff