The commands used were:
svn merge -r15262:15263 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15263:15264 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15264:15265 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15265:15266 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15266:15267 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15267:15268 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15268:15269 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15269:15270 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
The console messages were:
[edau@... relax-trunk]$ svn merge -r15262:15263 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15263 into '.':
U test_suite/system_tests/scripts/frame_order/cam/free_rotor.py
[edau@... relax-trunk]$ svn merge -r15263:15264 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15264 into '.':
U specific_fns/api_common.py
[edau@... relax-trunk]$ svn merge -r15264:15265 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15265 into '.':
U specific_fns/frame_order.py
[edau@... relax-trunk]$ svn merge -r15265:15266 svn+ssh://bugman@.../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@... relax-trunk]$ svn merge -r15266:15267 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15267 into '.':
G test_suite/system_tests/frame_order.py
[edau@... relax-trunk]$ svn merge -r15267:15268 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15268 into '.':
G test_suite/system_tests/frame_order.py
[edau@... relax-trunk]$ svn merge -r15268:15269 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15269 into '.':
G test_suite/system_tests/frame_order.py
[edau@... relax-trunk]$ svn merge -r15269:15270 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15270 into '.':
G test_suite/system_tests/frame_order.py
[edau@... relax-trunk]$
