r18947 - in /trunk: maths_fns/ specific_fns/ test_suite/shared_data/frame_order/rigid/ test_suite/shared_data/frame_order/ro... -- March 22, 2013 - 11:59

Author: bugman
Date: Fri Mar 22 11:59:41 2013
New Revision: 18947

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

The commands used were:
svn merge -r15070:15071 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r15071:15072 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r15072:15073 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r15073:15074 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r15074:15075 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r15075:15076 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r15076:15077 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r15077:15078 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r15078:15079 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r15079:15080 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .

The console messages were:
[edau@localhost relax-trunk]$ svn merge -r15070:15071 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r15071 into '.':
U    specific_fns/frame_order.py
[edau@localhost relax-trunk]$ svn merge -r15071:15072 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r15072 into '.':
U    maths_fns/frame_order.py
[edau@localhost relax-trunk]$ svn merge -r15072:15073 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r15073 into '.':
U    test_suite/shared_data/frame_order/rotor2/frame_order.py
[edau@localhost relax-trunk]$ svn merge -r15073:15074 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r15074 into '.':
G    specific_fns/frame_order.py
[edau@localhost relax-trunk]$ svn merge -r15074:15075 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r15075 into '.':
G    maths_fns/frame_order.py
[edau@localhost relax-trunk]$ svn merge -r15075:15076 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
Conflict discovered in 'specific_fns/frame_order.py'.
Select: (p) postpone, (df) diff-full, (e) edit,
        (mc) mine-conflict, (tc) theirs-conflict,
        (s) show all options: p
--- Merging r15076 into '.':
C    specific_fns/frame_order.py
Summary of conflicts:
  Text conflicts: 1
[edau@localhost relax-trunk]$ svn merge -r15076:15077 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r15077 into '.':
G    specific_fns/frame_order.py
[edau@localhost relax-trunk]$ svn merge -r15077:15078 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r15078 into '.':
G    specific_fns/frame_order.py
[edau@localhost relax-trunk]$ svn merge -r15078:15079 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r15079 into '.':
G    specific_fns/frame_order.py
[edau@localhost relax-trunk]$ svn merge -r15079:15080 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r15080 into '.':
U    test_suite/shared_data/frame_order/rigid/frame_order.bz2
U    test_suite/shared_data/frame_order/rigid/ave_pos.pdb
A    test_suite/shared_data/frame_order/rigid/frame_order.log.bz2
U    test_suite/shared_data/frame_order/rigid/frame_order.py
[edau@localhost relax-trunk]$


Added:
    trunk/test_suite/shared_data/frame_order/rigid/frame_order.log.bz2
      - copied unchanged from r15080, 
branches/frame_order_testing/test_suite/shared_data/frame_order/rigid/frame_order.log.bz2
Modified:
    trunk/maths_fns/frame_order.py
    trunk/specific_fns/frame_order.py
    trunk/test_suite/shared_data/frame_order/rigid/ave_pos.pdb
    trunk/test_suite/shared_data/frame_order/rigid/frame_order.bz2
    trunk/test_suite/shared_data/frame_order/rigid/frame_order.py
    trunk/test_suite/shared_data/frame_order/rotor2/frame_order.py

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

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

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

Modified: trunk/test_suite/shared_data/frame_order/rigid/ave_pos.pdb
URL: 
http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/rigid/ave_pos.pdb?rev=18947&r1=18946&r2=18947&view=diff

Modified: trunk/test_suite/shared_data/frame_order/rigid/frame_order.bz2
URL: 
http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/rigid/frame_order.bz2?rev=18947&r1=18946&r2=18947&view=diff

Modified: trunk/test_suite/shared_data/frame_order/rigid/frame_order.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/rigid/frame_order.py?rev=18947&r1=18946&r2=18947&view=diff

Modified: trunk/test_suite/shared_data/frame_order/rotor2/frame_order.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/rotor2/frame_order.py?rev=18947&r1=18946&r2=18947&view=diff