mailr18979 - in /trunk: data/ generic_fns/ maths_fns/ sample_scripts/n_state_model/ test_suite/shared_data/frame_order/cam/free_...


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

Header


Content

Posted by edward on March 22, 2013 - 16:44:
Author: bugman
Date: Fri Mar 22 16:44:07 2013
New Revision: 18979

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

The commands used were:
svn merge -r17310:17311 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r17311:17312 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r17312:17313 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r17313:17314 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r17314:17315 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r17315:17316 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r17316:17317 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r17317:17318 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r17318:17319 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r17319:17320 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .

The console messages were:
[edau@localhost relax-trunk]$ svn merge -r17310:17311 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r17311 into '.':
U    data/align_tensor.py
[edau@localhost relax-trunk]$ svn merge -r17311:17312 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r17312 into '.':
U    generic_fns/align_tensor.py
[edau@localhost relax-trunk]$ svn merge -r17312:17313 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r17313 into '.':
U    sample_scripts/n_state_model/two_domain.py
[edau@localhost relax-trunk]$ svn merge -r17313:17314 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r17314 into '.':
U    test_suite/system_tests/scripts/n_state_model/A_to_chi.py
U    test_suite/system_tests/scripts/n_state_model/5_state_xz.py
U    test_suite/system_tests/align_tensor.py
[edau@localhost relax-trunk]$ svn merge -r17314:17315 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r17315 into '.':
G    generic_fns/align_tensor.py
[edau@localhost relax-trunk]$ svn merge -r17315:17316 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
Conflict discovered in 'user_functions/rdc.py'.
Select: (p) postpone, (df) diff-full, (e) edit,
        (mc) mine-conflict, (tc) theirs-conflict,
        (s) show all options: p
--- Merging r17316 into '.':
C    user_functions/rdc.py
Conflict discovered in 'user_functions/pcs.py'.
Select: (p) postpone, (df) diff-full, (e) edit,
        (mc) mine-conflict, (tc) theirs-conflict,
        (s) show all options: p
C    user_functions/pcs.py
Summary of conflicts:
  Text conflicts: 2
[edau@localhost relax-trunk]$ svn merge -r17316:17317 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r17317 into '.':
U    user_functions/align_tensor.py
[edau@localhost relax-trunk]$ svn merge -r17317:17318 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r17318 into '.':
U    test_suite/unit_tests/_prompt/test_align_tensor.py
U    test_suite/unit_tests/align_tensor_testing_base.py
[edau@localhost relax-trunk]$ svn merge -r17318:17319 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r17319 into '.':
U    
test_suite/shared_data/frame_order/cam/pseudo_ellipse_torsionless/frame_order.py
U    test_suite/shared_data/frame_order/cam/iso_cone_free_rotor/frame_order.py
U    test_suite/shared_data/frame_order/cam/rotor_2_state/frame_order.py
U    test_suite/shared_data/frame_order/cam/rotor2/frame_order.py
U    test_suite/shared_data/frame_order/cam/free_rotor2/frame_order.py
U    test_suite/shared_data/frame_order/cam/rigid/frame_order.py
U    test_suite/shared_data/frame_order/cam/iso_cone/frame_order.py
U    test_suite/shared_data/frame_order/cam/pseudo_ellipse2/frame_order.py
U    
test_suite/shared_data/frame_order/cam/pseudo_ellipse_free_rotor/frame_order.py
U    
test_suite/shared_data/frame_order/cam/iso_cone_torsionless/frame_order.py
U    test_suite/shared_data/frame_order/cam/rotor/frame_order.py
U    
test_suite/shared_data/frame_order/cam/iso_cone_free_rotor2/frame_order.py
U    test_suite/shared_data/frame_order/cam/free_rotor/frame_order.py
U    test_suite/shared_data/frame_order/cam/pseudo_ellipse/frame_order.py
[edau@localhost relax-trunk]$ svn merge -r17319:17320 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r17320 into '.':
U    maths_fns/frame_order_matrix_ops.py
U    maths_fns/frame_order.py
[edau@localhost relax-trunk]$


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/sample_scripts/n_state_model/two_domain.py
    trunk/test_suite/shared_data/frame_order/cam/free_rotor/frame_order.py
    trunk/test_suite/shared_data/frame_order/cam/free_rotor2/frame_order.py
    trunk/test_suite/shared_data/frame_order/cam/iso_cone/frame_order.py
    
trunk/test_suite/shared_data/frame_order/cam/iso_cone_free_rotor/frame_order.py
    
trunk/test_suite/shared_data/frame_order/cam/iso_cone_free_rotor2/frame_order.py
    
trunk/test_suite/shared_data/frame_order/cam/iso_cone_torsionless/frame_order.py
    trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse/frame_order.py
    
trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse2/frame_order.py
    
trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse_free_rotor/frame_order.py
    
trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse_torsionless/frame_order.py
    trunk/test_suite/shared_data/frame_order/cam/rigid/frame_order.py
    trunk/test_suite/shared_data/frame_order/cam/rotor/frame_order.py
    trunk/test_suite/shared_data/frame_order/cam/rotor2/frame_order.py
    trunk/test_suite/shared_data/frame_order/cam/rotor_2_state/frame_order.py
    trunk/test_suite/system_tests/align_tensor.py
    trunk/test_suite/system_tests/scripts/n_state_model/5_state_xz.py
    trunk/test_suite/system_tests/scripts/n_state_model/A_to_chi.py
    trunk/test_suite/unit_tests/_prompt/test_align_tensor.py
    trunk/test_suite/unit_tests/align_tensor_testing_base.py
    trunk/user_functions/align_tensor.py
    trunk/user_functions/pcs.py
    trunk/user_functions/rdc.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=18979&r1=18978&r2=18979&view=diff

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

Modified: trunk/maths_fns/frame_order.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/maths_fns/frame_order.py?rev=18979&r1=18978&r2=18979&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=18979&r1=18978&r2=18979&view=diff

Modified: trunk/sample_scripts/n_state_model/two_domain.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/sample_scripts/n_state_model/two_domain.py?rev=18979&r1=18978&r2=18979&view=diff

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

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

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

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

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

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

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

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

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

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

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

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

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

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

Modified: trunk/test_suite/system_tests/align_tensor.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/test_suite/system_tests/align_tensor.py?rev=18979&r1=18978&r2=18979&view=diff

Modified: trunk/test_suite/system_tests/scripts/n_state_model/5_state_xz.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/test_suite/system_tests/scripts/n_state_model/5_state_xz.py?rev=18979&r1=18978&r2=18979&view=diff

Modified: trunk/test_suite/system_tests/scripts/n_state_model/A_to_chi.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/test_suite/system_tests/scripts/n_state_model/A_to_chi.py?rev=18979&r1=18978&r2=18979&view=diff

Modified: trunk/test_suite/unit_tests/_prompt/test_align_tensor.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/test_suite/unit_tests/_prompt/test_align_tensor.py?rev=18979&r1=18978&r2=18979&view=diff

Modified: trunk/test_suite/unit_tests/align_tensor_testing_base.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/test_suite/unit_tests/align_tensor_testing_base.py?rev=18979&r1=18978&r2=18979&view=diff

Modified: trunk/user_functions/align_tensor.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/user_functions/align_tensor.py?rev=18979&r1=18978&r2=18979&view=diff

Modified: trunk/user_functions/pcs.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/user_functions/pcs.py?rev=18979&r1=18978&r2=18979&view=diff

Modified: trunk/user_functions/rdc.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/user_functions/rdc.py?rev=18979&r1=18978&r2=18979&view=diff




Related Messages


Powered by MHonArc, Updated Fri Mar 22 17:00:02 2013