mailr18952 - in /trunk: generic_fns/ generic_fns/structure/ prompt/ specific_fns/ test_suite/unit_tests/_generic_fns/_structure/...


Others Months | Index by Date | Thread Index
>>   [Date Prev] [Date Next] [Thread Prev] [Thread Next]

Header


Content

Posted by edward on March 22, 2013 - 12:21:
Author: bugman
Date: Fri Mar 22 12:21:56 2013
New Revision: 18952

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

The commands used were:
svn merge -r15120:15121 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r15121:15122 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r15122:15123 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r15123:15124 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r15124:15125 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r15125:15126 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r15126:15127 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r15127:15128 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r15128:15129 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r15129:15130 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .

The console messages were:
[edau@localhost relax-trunk]$ svn merge -r15120:15121 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
Conflict discovered in 'generic_fns/structure/scientific.py'.
Select: (p) postpone, (df) diff-full, (e) edit,
        (mc) mine-conflict, (tc) theirs-conflict,
        (s) show all options: p
--- Merging r15121 into '.':
C    generic_fns/structure/scientific.py
Conflict discovered in 'generic_fns/structure/api_base.py'.
Select: (p) postpone, (df) diff-full, (e) edit,
        (mc) mine-conflict, (tc) theirs-conflict,
        (s) show all options: p
C    generic_fns/structure/api_base.py
Summary of conflicts:
  Text conflicts: 2
[edau@localhost relax-trunk]$ svn merge -r15121:15122 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r15122 into '.':
U    specific_fns/frame_order.py
[edau@localhost relax-trunk]$ svn merge -r15122:15123 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
Conflict discovered in 'generic_fns/align_tensor.py'.
Select: (p) postpone, (df) diff-full, (e) edit,
        (mc) mine-conflict, (tc) theirs-conflict,
        (s) show all options: p
--- Merging r15123 into '.':
C    generic_fns/align_tensor.py
Summary of conflicts:
  Text conflicts: 1
[edau@localhost relax-trunk]$ svn merge -r15123:15124 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
Conflict discovered in 
'test_suite/unit_tests/_generic_fns/_structure/test_internal.py'.
Select: (p) postpone, (df) diff-full, (e) edit,
        (mc) mine-conflict, (tc) theirs-conflict,
        (s) show all options: p
--- Merging r15124 into '.':
C    test_suite/unit_tests/_generic_fns/_structure/test_internal.py
Conflict discovered in 
'test_suite/unit_tests/_generic_fns/_structure/test_scientific.py'.
Select: (p) postpone, (df) diff-full, (e) edit,
        (mc) mine-conflict, (tc) theirs-conflict,
        (s) show all options: p
C    test_suite/unit_tests/_generic_fns/_structure/test_scientific.py
Summary of conflicts:
  Text conflicts: 2
[edau@localhost relax-trunk]$ svn merge -r15124:15125 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
Conflict discovered in 'generic_fns/structure/main.py'.
Select: (p) postpone, (df) diff-full, (e) edit,
        (mc) mine-conflict, (tc) theirs-conflict,
        (s) show all options: p
--- Merging r15125 into '.':
C    generic_fns/structure/main.py
Summary of conflicts:
  Text conflicts: 1
[edau@localhost relax-trunk]$ svn merge -r15125:15126 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r15126 into '.':
G    generic_fns/align_tensor.py
[edau@localhost relax-trunk]$ svn merge -r15126:15127 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r15127 into '.':
G    test_suite/unit_tests/_generic_fns/_structure/test_internal.py
[edau@localhost relax-trunk]$ svn merge -r15127:15128 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r15128 into '.':
U    test_suite/unit_tests/_maths_fns/test_frame_order_matrix_ops.py
[edau@localhost relax-trunk]$ svn merge -r15128:15129 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
Conflict discovered in 'generic_fns/structure/scientific.py'.
Select: (p) postpone, (df) diff-full, (e) edit,
        (mc) mine-conflict, (tc) theirs-conflict,
        (s) show all options: p
--- Merging r15129 into '.':
C    generic_fns/structure/scientific.py
Summary of conflicts:
  Text conflicts: 1
[edau@localhost relax-trunk]$ svn merge -r15129:15130 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r15130 into '.':
U    prompt/domain.py
[edau@localhost relax-trunk]$


Modified:
    trunk/generic_fns/align_tensor.py
    trunk/generic_fns/structure/api_base.py
    trunk/generic_fns/structure/main.py
    trunk/generic_fns/structure/scientific.py
    trunk/prompt/domain.py
    trunk/specific_fns/frame_order.py
    trunk/test_suite/unit_tests/_generic_fns/_structure/test_internal.py
    trunk/test_suite/unit_tests/_generic_fns/_structure/test_scientific.py
    trunk/test_suite/unit_tests/_maths_fns/test_frame_order_matrix_ops.py

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

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

Modified: trunk/generic_fns/structure/api_base.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/generic_fns/structure/api_base.py?rev=18952&r1=18951&r2=18952&view=diff

Modified: trunk/generic_fns/structure/main.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/generic_fns/structure/main.py?rev=18952&r1=18951&r2=18952&view=diff

Modified: trunk/generic_fns/structure/scientific.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/generic_fns/structure/scientific.py?rev=18952&r1=18951&r2=18952&view=diff

Modified: trunk/prompt/domain.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/prompt/domain.py?rev=18952&r1=18951&r2=18952&view=diff

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

Modified: trunk/test_suite/unit_tests/_generic_fns/_structure/test_internal.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/test_suite/unit_tests/_generic_fns/_structure/test_internal.py?rev=18952&r1=18951&r2=18952&view=diff

Modified: 
trunk/test_suite/unit_tests/_generic_fns/_structure/test_scientific.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/test_suite/unit_tests/_generic_fns/_structure/test_scientific.py?rev=18952&r1=18951&r2=18952&view=diff

Modified: 
trunk/test_suite/unit_tests/_maths_fns/test_frame_order_matrix_ops.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/test_suite/unit_tests/_maths_fns/test_frame_order_matrix_ops.py?rev=18952&r1=18951&r2=18952&view=diff

Related Messages


Powered by MHonArc, Updated Fri Mar 22 12:40:01 2013