r18949 - in /trunk: maths_fns/ specific_fns/ test_suite/shared_data/frame_order/free_rotor/ test_suite/shared_data/frame_ord... -- March 22, 2013 - 12:05

Author: bugman
Date: Fri Mar 22 12:05:23 2013
New Revision: 18949

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

The commands used were:
svn merge -r15090:15091 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r15091:15092 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r15092:15093 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r15093:15094 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r15094:15095 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r15095:15096 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r15096:15097 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r15097:15098 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r15098:15099 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r15099:15100 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .

The console messages were:
[edau@localhost relax-trunk]$ svn merge -r15090:15091 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r15091 into '.':
U    maths_fns/frame_order.py
[edau@localhost relax-trunk]$ svn merge -r15091:15092 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r15092 into '.':
U    maths_fns/frame_order_matrix_ops.py
G    maths_fns/frame_order.py
[edau@localhost relax-trunk]$ svn merge -r15092:15093 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r15093 into '.':
G    maths_fns/frame_order_matrix_ops.py
G    maths_fns/frame_order.py
[edau@localhost relax-trunk]$ svn merge -r15093:15094 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r15094 into '.':
G    maths_fns/frame_order_matrix_ops.py
[edau@localhost relax-trunk]$ svn merge -r15094:15095 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r15095 into '.':
G    maths_fns/frame_order_matrix_ops.py
G    maths_fns/frame_order.py
[edau@localhost relax-trunk]$ svn merge -r15095:15096 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r15096 into '.':
U    test_suite/shared_data/frame_order/iso_cone_free_rotor/back_calc.py
U    test_suite/shared_data/frame_order/rotor_2_state/back_calc.py
U    test_suite/shared_data/frame_order/rotor2/back_calc.py
U    test_suite/shared_data/frame_order/free_rotor2/back_calc.py
U    test_suite/shared_data/frame_order/iso_cone/back_calc.py
U    test_suite/shared_data/frame_order/rigid/back_calc.py
U    test_suite/shared_data/frame_order/rotor/back_calc.py
U    test_suite/shared_data/frame_order/iso_cone_free_rotor2/back_calc.py
U    test_suite/shared_data/frame_order/free_rotor/back_calc.py
[edau@localhost relax-trunk]$ svn merge -r15096:15097 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r15097 into '.':
G    maths_fns/frame_order.py
[edau@localhost relax-trunk]$ svn merge -r15097:15098 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r15098 into '.':
G    maths_fns/frame_order.py
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
C    specific_fns/frame_order.py
Summary of conflicts:
  Text conflicts: 1
[edau@localhost relax-trunk]$ svn merge -r15098:15099 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r15099 into '.':
G    specific_fns/frame_order.py
[edau@localhost relax-trunk]$ svn merge -r15099:15100 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r15100 into '.':
G    maths_fns/frame_order_matrix_ops.py
[edau@localhost relax-trunk]$


Modified:
    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/free_rotor/back_calc.py
    trunk/test_suite/shared_data/frame_order/free_rotor2/back_calc.py
    trunk/test_suite/shared_data/frame_order/iso_cone/back_calc.py
    trunk/test_suite/shared_data/frame_order/iso_cone_free_rotor/back_calc.py
    trunk/test_suite/shared_data/frame_order/iso_cone_free_rotor2/back_calc.py
    trunk/test_suite/shared_data/frame_order/rigid/back_calc.py
    trunk/test_suite/shared_data/frame_order/rotor/back_calc.py
    trunk/test_suite/shared_data/frame_order/rotor2/back_calc.py
    trunk/test_suite/shared_data/frame_order/rotor_2_state/back_calc.py

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

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

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

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

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

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

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

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

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

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

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

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