r18945 - in /trunk: data/ generic_fns/ maths_fns/ specific_fns/ test_suite/shared_data/frame_order/ test_suite/shared_data/f... -- March 22, 2013 - 11:52

Author: bugman
Date: Fri Mar 22 11:52:14 2013
New Revision: 18945

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

The commands used were:
svn merge -r15050:15051 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r15051:15052 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r15052:15053 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r15053:15054 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r15054:15055 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r15055:15056 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r15056:15057 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r15057:15058 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r15058:15059 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r15059:15060 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .

The console messages were:

[edau@localhost relax-trunk]$ svn merge -r15050:15051 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r15051 into '.':
U    specific_fns/frame_order.py
[edau@localhost relax-trunk]$ svn merge -r15051:15052 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r15052 into '.':
G    specific_fns/frame_order.py
[edau@localhost relax-trunk]$ svn merge -r15052:15053 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r15053 into '.':
U    maths_fns/frame_order_matrix_ops.py
U    maths_fns/frame_order.py
[edau@localhost relax-trunk]$ svn merge -r15053:15054 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r15054 into '.':
G    maths_fns/frame_order_matrix_ops.py
[edau@localhost relax-trunk]$ svn merge -r15054:15055 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r15055 into '.':
G    specific_fns/frame_order.py
[edau@localhost relax-trunk]$ svn merge -r15055:15056 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r15056 into '.':
U    test_suite/shared_data/frame_order/tensors.py
[edau@localhost relax-trunk]$ svn merge -r15056:15057 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r15057 into '.':
U    generic_fns/align_tensor.py
[edau@localhost relax-trunk]$ svn merge -r15057:15058 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
Conflict discovered in 'data/align_tensor.py'.
Select: (p) postpone, (df) diff-full, (e) edit,
        (mc) mine-conflict, (tc) theirs-conflict,
        (s) show all options: p
--- Merging r15058 into '.':
C    data/align_tensor.py
Summary of conflicts:
  Text conflicts: 1
[edau@localhost relax-trunk]$ svn merge -r15058:15059 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r15059 into '.':
A    test_suite/shared_data/frame_order/rotor2/frame_order_pcs_only.py
[edau@localhost relax-trunk]$ svn merge -r15059:15060 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r15060 into '.':
A    test_suite/shared_data/frame_order/rotor2/pcs_only
[edau@localhost relax-trunk]$


Added:
    trunk/test_suite/shared_data/frame_order/rotor2/frame_order_pcs_only.py
      - copied unchanged from r15059, 
branches/frame_order_testing/test_suite/shared_data/frame_order/rotor2/frame_order_pcs_only.py
    trunk/test_suite/shared_data/frame_order/rotor2/pcs_only/
      - copied from r15060, 
branches/frame_order_testing/test_suite/shared_data/frame_order/rotor2/pcs_only/
Modified:
    trunk/data/align_tensor.py
    trunk/generic_fns/align_tensor.py
    trunk/maths_fns/frame_order.py
    trunk/maths_fns/frame_order_matrix_ops.py
    trunk/specific_fns/frame_order.py
    trunk/test_suite/shared_data/frame_order/tensors.py

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

Modified: trunk/data/align_tensor.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/data/align_tensor.py?rev=18945&r1=18944&r2=18945&view=diff

Modified: trunk/generic_fns/align_tensor.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/generic_fns/align_tensor.py?rev=18945&r1=18944&r2=18945&view=diff

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

Modified: trunk/maths_fns/frame_order_matrix_ops.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/maths_fns/frame_order_matrix_ops.py?rev=18945&r1=18944&r2=18945&view=diff

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

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