mailr19001 - in /trunk: auto_analyses/ extern/sobol/ generic_fns/ specific_fns/ test_suite/shared_data/frame_order/cam/ test_sui...


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

Header


Content

Posted by edward on March 22, 2013 - 17:31:
Author: bugman
Date: Fri Mar 22 17:31:38 2013
New Revision: 19001

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

The commands used were:
svn merge -r18761:18762 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r18769:18770 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r18803:18804 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r18804:18805 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r18829:18830 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r18830:18831 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r18831:18832 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r18832:18833 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r18833:18834 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r18834:18835 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r18835:18836 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .

The console messages were:
[edau@localhost relax-trunk]$ svn merge -r18761:18762 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
[edau@localhost relax-trunk]$ svn merge -r18769:18770 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r18770 into '.':
U    test_suite/system_tests/scripts/frame_order/rigid_test.py
[edau@localhost relax-trunk]$ svn merge -r18803:18804 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r18804 into '.':
U    generic_fns/domain.py
U    specific_fns/frame_order.py
U    
test_suite/shared_data/frame_order/cam/pseudo_ellipse_torsionless/generate_distribution.py
U    
test_suite/shared_data/frame_order/cam/iso_cone_free_rotor/generate_distribution.py
U    
test_suite/shared_data/frame_order/cam/rotor_2_state/generate_distribution.py
U    test_suite/shared_data/frame_order/cam/rotor2/generate_distribution.py
U    test_suite/shared_data/frame_order/cam/rotor2/pcs_only/frame_order.py
U    
test_suite/shared_data/frame_order/cam/free_rotor2/generate_distribution.py
U    
test_suite/shared_data/frame_order/cam/free_rotor_missing_data/generate_distribution.py
U    test_suite/shared_data/frame_order/cam/iso_cone/generate_distribution.py
U    
test_suite/shared_data/frame_order/cam/pseudo_ellipse2/generate_distribution.py
U    
test_suite/shared_data/frame_order/cam/iso_cone_torsionless/generate_distribution.py
U    
test_suite/shared_data/frame_order/cam/pseudo_ellipse_free_rotor/rotation_matrices.py
U    
test_suite/shared_data/frame_order/cam/pseudo_ellipse_free_rotor/generate_distribution.py
U    test_suite/shared_data/frame_order/cam/rotor/generate_distribution.py
U    
test_suite/shared_data/frame_order/cam/iso_cone_free_rotor2/generate_distribution.py
U    
test_suite/shared_data/frame_order/cam/free_rotor/generate_distribution.py
U    test_suite/shared_data/frame_order/cam/generate_base.py
U    
test_suite/shared_data/frame_order/cam/pseudo_ellipse/generate_distribution.py
U    extern/sobol/sobol_lib-not_tested.py
U    extern/sobol/sobol_test.py
U    extern/sobol/sobol_lib.py
[edau@localhost relax-trunk]$ svn merge -r18804:18805 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r18805 into '.':
G    extern/sobol/sobol_test.py
U    extern/sobol/test.py
[edau@localhost relax-trunk]$ svn merge -r18829:18830 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r18830 into '.':
G    specific_fns/frame_order.py
[edau@localhost relax-trunk]$ svn merge -r18830:18831 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r18831 into '.':
G    specific_fns/frame_order.py
[edau@localhost relax-trunk]$ svn merge -r18831:18832 
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 r18832 into '.':
C    specific_fns/frame_order.py
U    user_functions/frame_order.py
Summary of conflicts:
  Text conflicts: 1
[edau@localhost relax-trunk]$ svn merge -r18832:18833 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r18833 into '.':
G    specific_fns/frame_order.py
G    user_functions/frame_order.py
[edau@localhost relax-trunk]$ svn merge -r18833:18834 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r18834 into '.':
U    auto_analyses/frame_order.py
[edau@localhost relax-trunk]$ svn merge -r18834:18835 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r18835 into '.':
G    specific_fns/frame_order.py
[edau@localhost relax-trunk]$ svn merge -r18835:18836 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r18836 into '.':
G    specific_fns/frame_order.py
G    user_functions/frame_order.py
[edau@localhost relax-trunk]$


Modified:
    trunk/auto_analyses/frame_order.py
    trunk/extern/sobol/sobol_lib-not_tested.py
    trunk/extern/sobol/sobol_lib.py
    trunk/extern/sobol/sobol_test.py
    trunk/extern/sobol/test.py
    trunk/generic_fns/domain.py
    trunk/specific_fns/frame_order.py
    
trunk/test_suite/shared_data/frame_order/cam/free_rotor/generate_distribution.py
    
trunk/test_suite/shared_data/frame_order/cam/free_rotor2/generate_distribution.py
    
trunk/test_suite/shared_data/frame_order/cam/free_rotor_missing_data/generate_distribution.py
    trunk/test_suite/shared_data/frame_order/cam/generate_base.py
    
trunk/test_suite/shared_data/frame_order/cam/iso_cone/generate_distribution.py
    
trunk/test_suite/shared_data/frame_order/cam/iso_cone_free_rotor/generate_distribution.py
    
trunk/test_suite/shared_data/frame_order/cam/iso_cone_free_rotor2/generate_distribution.py
    
trunk/test_suite/shared_data/frame_order/cam/iso_cone_torsionless/generate_distribution.py
    
trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse/generate_distribution.py
    
trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse2/generate_distribution.py
    
trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse_free_rotor/generate_distribution.py
    
trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse_free_rotor/rotation_matrices.py
    
trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse_torsionless/generate_distribution.py
    
trunk/test_suite/shared_data/frame_order/cam/rotor/generate_distribution.py
    
trunk/test_suite/shared_data/frame_order/cam/rotor2/generate_distribution.py
    
trunk/test_suite/shared_data/frame_order/cam/rotor2/pcs_only/frame_order.py
    
trunk/test_suite/shared_data/frame_order/cam/rotor_2_state/generate_distribution.py
    trunk/test_suite/system_tests/scripts/frame_order/rigid_test.py
    trunk/user_functions/frame_order.py

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

Modified: trunk/auto_analyses/frame_order.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/auto_analyses/frame_order.py?rev=19001&r1=19000&r2=19001&view=diff

Modified: trunk/extern/sobol/sobol_lib-not_tested.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/extern/sobol/sobol_lib-not_tested.py?rev=19001&r1=19000&r2=19001&view=diff

Modified: trunk/extern/sobol/sobol_lib.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/extern/sobol/sobol_lib.py?rev=19001&r1=19000&r2=19001&view=diff

Modified: trunk/extern/sobol/sobol_test.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/extern/sobol/sobol_test.py?rev=19001&r1=19000&r2=19001&view=diff

Modified: trunk/extern/sobol/test.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/extern/sobol/test.py?rev=19001&r1=19000&r2=19001&view=diff

Modified: trunk/generic_fns/domain.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/generic_fns/domain.py?rev=19001&r1=19000&r2=19001&view=diff

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

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

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

Modified: 
trunk/test_suite/shared_data/frame_order/cam/free_rotor_missing_data/generate_distribution.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/cam/free_rotor_missing_data/generate_distribution.py?rev=19001&r1=19000&r2=19001&view=diff

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

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

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

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

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

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

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

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

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

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

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

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

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

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

Modified: trunk/test_suite/system_tests/scripts/frame_order/rigid_test.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/test_suite/system_tests/scripts/frame_order/rigid_test.py?rev=19001&r1=19000&r2=19001&view=diff

Modified: trunk/user_functions/frame_order.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/user_functions/frame_order.py?rev=19001&r1=19000&r2=19001&view=diff

Related Messages


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