mailr18977 - in /trunk: maths_fns/ specific_fns/ test_suite/shared_data/frame_order/cam/free_rotor/ test_suite/shared_data/frame...


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:40:
Author: bugman
Date: Fri Mar 22 16:40:06 2013
New Revision: 18977

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

The commands used were:
svn merge -r17290:17291 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r17291:17292 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r17292:17293 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r17293:17294 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r17295:17296 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r17296:17297 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r17297:17298 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r17298:17299 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r17299:17300 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .

The console messages were:
[edau@localhost relax-trunk]$ svn merge -r17290:17291 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r17291 into '.':
U    maths_fns/frame_order.py
[edau@localhost relax-trunk]$ svn merge -r17291:17292 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r17292 into '.':
U    specific_fns/frame_order.py
U    user_functions/frame_order.py
[edau@localhost relax-trunk]$ svn merge -r17292:17293 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r17293 into '.':
G    specific_fns/frame_order.py
G    user_functions/frame_order.py
[edau@localhost relax-trunk]$ svn merge -r17293:17294 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r17294 into '.':
G    specific_fns/frame_order.py
[edau@localhost relax-trunk]$ svn merge -r17295:17296 
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 r17296 into '.':
C    specific_fns/frame_order.py
Summary of conflicts:
  Text conflicts: 1
[edau@localhost relax-trunk]$ svn merge -r17296:17297 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r17297 into '.':
G    specific_fns/frame_order.py
[edau@localhost relax-trunk]$ svn merge -r17297:17298 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r17298 into '.':
G    specific_fns/frame_order.py
[edau@localhost relax-trunk]$ svn merge -r17298:17299 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r17299 into '.':
G    specific_fns/frame_order.py
[edau@localhost relax-trunk]$ svn merge -r17299:17300 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r17300 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]$


Modified:
    trunk/maths_fns/frame_order.py
    trunk/specific_fns/frame_order.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/user_functions/frame_order.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=18977&r1=18976&r2=18977&view=diff

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

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

Related Messages


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