r18958 - in /trunk: specific_fns/ test_suite/system_tests/ test_suite/system_tests/scripts/frame_order/cam/ -- March 22, 2013 - 12:49

Author: bugman
Date: Fri Mar 22 12:49:41 2013
New Revision: 18958

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

The commands used were:
svn merge -r15262:15263 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r15263:15264 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r15264:15265 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r15265:15266 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r15266:15267 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r15267:15268 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r15268:15269 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r15269:15270 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .

The console messages were:
[edau@localhost relax-trunk]$ svn merge -r15262:15263 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r15263 into '.':
U    test_suite/system_tests/scripts/frame_order/cam/free_rotor.py
[edau@localhost relax-trunk]$ svn merge -r15263:15264 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r15264 into '.':
U    specific_fns/api_common.py
[edau@localhost relax-trunk]$ svn merge -r15264:15265 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r15265 into '.':
U    specific_fns/frame_order.py
[edau@localhost relax-trunk]$ svn merge -r15265:15266 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
Conflict discovered in 
'test_suite/system_tests/scripts/frame_order/cam/free_rotor2.py'.
Select: (p) postpone, (df) diff-full, (e) edit,
        (mc) mine-conflict, (tc) theirs-conflict,
        (s) show all options: p
--- Merging r15266 into '.':
C    test_suite/system_tests/scripts/frame_order/cam/free_rotor2.py
U    test_suite/system_tests/frame_order.py
Summary of conflicts:
  Text conflicts: 1
[edau@localhost relax-trunk]$ svn merge -r15266:15267 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r15267 into '.':
G    test_suite/system_tests/frame_order.py
[edau@localhost relax-trunk]$ svn merge -r15267:15268 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r15268 into '.':
G    test_suite/system_tests/frame_order.py
[edau@localhost relax-trunk]$ svn merge -r15268:15269 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r15269 into '.':
G    test_suite/system_tests/frame_order.py
[edau@localhost relax-trunk]$ svn merge -r15269:15270 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r15270 into '.':
G    test_suite/system_tests/frame_order.py
[edau@localhost relax-trunk]$


Modified:
    trunk/specific_fns/api_common.py
    trunk/specific_fns/frame_order.py
    trunk/test_suite/system_tests/frame_order.py
    trunk/test_suite/system_tests/scripts/frame_order/cam/free_rotor.py
    trunk/test_suite/system_tests/scripts/frame_order/cam/free_rotor2.py

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

Modified: trunk/specific_fns/api_common.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/specific_fns/api_common.py?rev=18958&r1=18957&r2=18958&view=diff

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

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

Modified: trunk/test_suite/system_tests/scripts/frame_order/cam/free_rotor.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/test_suite/system_tests/scripts/frame_order/cam/free_rotor.py?rev=18958&r1=18957&r2=18958&view=diff

Modified: trunk/test_suite/system_tests/scripts/frame_order/cam/free_rotor2.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/test_suite/system_tests/scripts/frame_order/cam/free_rotor2.py?rev=18958&r1=18957&r2=18958&view=diff