r18987 - in /trunk: auto_analyses/ generic_fns/ generic_fns/structure/ specific_fns/ test_suite/shared_data/frame_order/cam/... -- March 22, 2013 - 17:01

Author: bugman
Date: Fri Mar 22 17:01:22 2013
New Revision: 18987

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

The commands used were:
svn merge -r18010:18011 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r18011:18012 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r18012:18013 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r18013:18014 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r18014:18015 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r18015:18016 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r18016:18017 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r18017:18018 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r18018:18019 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r18019:18020 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .

The console messages were:
[edau@localhost relax-trunk]$ svn merge -r18010:18011 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r18011 into '.':
U    test_suite/shared_data/frame_order/cam/full_analysis.py
[edau@localhost relax-trunk]$ svn merge -r18011:18012 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r18012 into '.':
A    
test_suite/shared_data/frame_order/cam/pseudo_ellipse_torsionless/pcs_dy_subset.txt
A    
test_suite/shared_data/frame_order/cam/pseudo_ellipse_torsionless/pcs_tm_subset.txt
A    
test_suite/shared_data/frame_order/cam/pseudo_ellipse_torsionless/pcs_tb_subset.txt
A    
test_suite/shared_data/frame_order/cam/pseudo_ellipse_torsionless/pcs_er_subset.txt
A    test_suite/shared_data/frame_order/cam/rigid/pcs_dy_subset.txt
A    test_suite/shared_data/frame_order/cam/rigid/pcs_tm_subset.txt
A    test_suite/shared_data/frame_order/cam/rigid/pcs_tb_subset.txt
A    test_suite/shared_data/frame_order/cam/rigid/pcs_er_subset.txt
A    
test_suite/shared_data/frame_order/cam/pseudo_ellipse_free_rotor/pcs_dy_subset.txt
A    
test_suite/shared_data/frame_order/cam/pseudo_ellipse_free_rotor/pcs_tm_subset.txt
A    
test_suite/shared_data/frame_order/cam/pseudo_ellipse_free_rotor/pcs_tb_subset.txt
A    
test_suite/shared_data/frame_order/cam/pseudo_ellipse_free_rotor/pcs_er_subset.txt
[edau@localhost relax-trunk]$ svn merge -r18012:18013 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r18013 into '.':
U    auto_analyses/frame_order.py
[edau@localhost relax-trunk]$ svn merge -r18013:18014 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r18014 into '.':
U    specific_fns/frame_order.py
[edau@localhost relax-trunk]$ svn merge -r18014:18015 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r18015 into '.':
G    test_suite/shared_data/frame_order/cam/full_analysis.py
[edau@localhost relax-trunk]$ svn merge -r18015:18016 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
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
--- Merging r18016 into '.':
C    generic_fns/structure/api_base.py
Summary of conflicts:
  Text conflicts: 1
[edau@localhost relax-trunk]$ svn merge -r18016:18017 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r18017 into '.':
U    generic_fns/molmol.py
U    generic_fns/pymol_control.py
[edau@localhost relax-trunk]$ svn merge -r18017:18018 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r18018 into '.':
G    generic_fns/pymol_control.py
[edau@localhost relax-trunk]$ svn merge -r18018:18019 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
Conflict discovered in 'generic_fns/structure/internal.py'.
Select: (p) postpone, (df) diff-full, (e) edit,
        (mc) mine-conflict, (tc) theirs-conflict,
        (s) show all options: p
--- Merging r18019 into '.':
C    generic_fns/structure/internal.py
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
C    generic_fns/structure/scientific.py
Summary of conflicts:
  Text conflicts: 2
[edau@localhost relax-trunk]$ svn merge -r18019:18020 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r18020 into '.':
G    auto_analyses/frame_order.py
[edau@localhost relax-trunk]$


Added:
    
trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse_free_rotor/pcs_dy_subset.txt
      - copied unchanged from r18012, 
branches/frame_order_testing/test_suite/shared_data/frame_order/cam/pseudo_ellipse_free_rotor/pcs_dy_subset.txt
    
trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse_free_rotor/pcs_er_subset.txt
      - copied unchanged from r18012, 
branches/frame_order_testing/test_suite/shared_data/frame_order/cam/pseudo_ellipse_free_rotor/pcs_er_subset.txt
    
trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse_free_rotor/pcs_tb_subset.txt
      - copied unchanged from r18012, 
branches/frame_order_testing/test_suite/shared_data/frame_order/cam/pseudo_ellipse_free_rotor/pcs_tb_subset.txt
    
trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse_free_rotor/pcs_tm_subset.txt
      - copied unchanged from r18012, 
branches/frame_order_testing/test_suite/shared_data/frame_order/cam/pseudo_ellipse_free_rotor/pcs_tm_subset.txt
    
trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse_torsionless/pcs_dy_subset.txt
      - copied unchanged from r18012, 
branches/frame_order_testing/test_suite/shared_data/frame_order/cam/pseudo_ellipse_torsionless/pcs_dy_subset.txt
    
trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse_torsionless/pcs_er_subset.txt
      - copied unchanged from r18012, 
branches/frame_order_testing/test_suite/shared_data/frame_order/cam/pseudo_ellipse_torsionless/pcs_er_subset.txt
    
trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse_torsionless/pcs_tb_subset.txt
      - copied unchanged from r18012, 
branches/frame_order_testing/test_suite/shared_data/frame_order/cam/pseudo_ellipse_torsionless/pcs_tb_subset.txt
    
trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse_torsionless/pcs_tm_subset.txt
      - copied unchanged from r18012, 
branches/frame_order_testing/test_suite/shared_data/frame_order/cam/pseudo_ellipse_torsionless/pcs_tm_subset.txt
    trunk/test_suite/shared_data/frame_order/cam/rigid/pcs_dy_subset.txt
      - copied unchanged from r18012, 
branches/frame_order_testing/test_suite/shared_data/frame_order/cam/rigid/pcs_dy_subset.txt
    trunk/test_suite/shared_data/frame_order/cam/rigid/pcs_er_subset.txt
      - copied unchanged from r18012, 
branches/frame_order_testing/test_suite/shared_data/frame_order/cam/rigid/pcs_er_subset.txt
    trunk/test_suite/shared_data/frame_order/cam/rigid/pcs_tb_subset.txt
      - copied unchanged from r18012, 
branches/frame_order_testing/test_suite/shared_data/frame_order/cam/rigid/pcs_tb_subset.txt
    trunk/test_suite/shared_data/frame_order/cam/rigid/pcs_tm_subset.txt
      - copied unchanged from r18012, 
branches/frame_order_testing/test_suite/shared_data/frame_order/cam/rigid/pcs_tm_subset.txt
Modified:
    trunk/auto_analyses/frame_order.py
    trunk/generic_fns/molmol.py
    trunk/generic_fns/pymol_control.py
    trunk/generic_fns/structure/api_base.py
    trunk/generic_fns/structure/internal.py
    trunk/generic_fns/structure/scientific.py
    trunk/specific_fns/frame_order.py
    trunk/test_suite/shared_data/frame_order/cam/full_analysis.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=18987&r1=18986&r2=18987&view=diff

Modified: trunk/generic_fns/molmol.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/generic_fns/molmol.py?rev=18987&r1=18986&r2=18987&view=diff

Modified: trunk/generic_fns/pymol_control.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/generic_fns/pymol_control.py?rev=18987&r1=18986&r2=18987&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=18987&r1=18986&r2=18987&view=diff

Modified: trunk/generic_fns/structure/internal.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/generic_fns/structure/internal.py?rev=18987&r1=18986&r2=18987&view=diff

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

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

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