r18959 - in /trunk/test_suite/system_tests: ./ scripts/ scripts/frame_order/ scripts/frame_order/cam/ -- March 22, 2013 - 12:54

Author: bugman
Date: Fri Mar 22 12:54:25 2013
New Revision: 18959

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

The commands used were:
svn merge -r15270:15271 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r15271:15272 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r15272:15273 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r15273:15274 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r15274:15275 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r15275:15276 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r15276:15277 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r15277:15278 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r15278:15279 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r15279:15280 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .

The console messages were:
[edau@localhost relax-trunk]$ svn merge -r15270:15271 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r15271 into '.':
U    test_suite/system_tests/frame_order.py
[edau@localhost relax-trunk]$ svn merge -r15271:15272 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r15272 into '.':
G    test_suite/system_tests/frame_order.py
[edau@localhost relax-trunk]$ svn merge -r15272:15273 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r15273 into '.':
G    test_suite/system_tests/frame_order.py
[edau@localhost relax-trunk]$ svn merge -r15273:15274 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
Conflict discovered in 'test_suite/system_tests/frame_order.py'.
Select: (p) postpone, (df) diff-full, (e) edit,
        (mc) mine-conflict, (tc) theirs-conflict,
        (s) show all options: p
--- Merging r15274 into '.':
C    test_suite/system_tests/frame_order.py
Summary of conflicts:
  Text conflicts: 1
[edau@localhost relax-trunk]$ svn merge -r15274:15275 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
Conflict discovered in 
'test_suite/system_tests/scripts/frame_order/cam/rigid.py'.
Select: (p) postpone, (df) diff-full, (e) edit,
        (mc) mine-conflict, (tc) theirs-conflict,
        (s) show all options: p
--- Merging r15275 into '.':
C    test_suite/system_tests/scripts/frame_order/cam/rigid.py
Summary of conflicts:
  Text conflicts: 1
[edau@localhost relax-trunk]$ svn merge -r15275:15276 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r15276 into '.':
U    test_suite/system_tests/scripts/frame_order/cam/free_rotor.py
[edau@localhost relax-trunk]$ svn merge -r15276:15277 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r15277 into '.':
A    test_suite/system_tests/scripts/__init__.py
[edau@localhost relax-trunk]$ svn merge -r15277:15278 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r15278 into '.':
A    test_suite/system_tests/scripts/frame_order/__init__.py
[edau@localhost relax-trunk]$ svn merge -r15278:15279 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r15279 into '.':
A    test_suite/system_tests/scripts/frame_order/cam/__init__.py
[edau@localhost relax-trunk]$ svn merge -r15279:15280 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
Conflict discovered in 'test_suite/system_tests/__init__.py'.
Select: (p) postpone, (df) diff-full, (e) edit,
        (mc) mine-conflict, (tc) theirs-conflict,
        (s) show all options: p
--- Merging r15280 into '.':
C    test_suite/system_tests/__init__.py
Summary of conflicts:
  Text conflicts: 1
[edau@localhost relax-trunk]$


Added:
    trunk/test_suite/system_tests/scripts/__init__.py
      - copied unchanged from r15277, 
branches/frame_order_testing/test_suite/system_tests/scripts/__init__.py
    trunk/test_suite/system_tests/scripts/frame_order/__init__.py
      - copied unchanged from r15278, 
branches/frame_order_testing/test_suite/system_tests/scripts/frame_order/__init__.py
    trunk/test_suite/system_tests/scripts/frame_order/cam/__init__.py
      - copied unchanged from r15279, 
branches/frame_order_testing/test_suite/system_tests/scripts/frame_order/cam/__init__.py
Modified:
    trunk/test_suite/system_tests/__init__.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/rigid.py

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

Modified: trunk/test_suite/system_tests/__init__.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/test_suite/system_tests/__init__.py?rev=18959&r1=18958&r2=18959&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=18959&r1=18958&r2=18959&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=18959&r1=18958&r2=18959&view=diff

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