The commands used were:
svn merge -r17270:17271 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r17275:17276 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r17276:17277 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r17277:17278 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r17278:17279 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r17279:17280 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
The console messages were:
[edau@... relax-trunk]$ svn merge -r17270:17271 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r17271 into '.':
U specific_fns/frame_order.py
[edau@... relax-trunk]$ svn merge -r17275:17276 svn+ssh://bugman@.../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 r17276 into '.':
C specific_fns/frame_order.py
Summary of conflicts:
Text conflicts: 1
[edau@... relax-trunk]$ svn merge -r17276:17277 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
Conflict discovered in 'test_suite/system_tests/scripts/frame_order/cam/base_script.py'.
Select: (p) postpone, (df) diff-full, (e) edit,
(mc) mine-conflict, (tc) theirs-conflict,
(s) show all options: p
--- Merging r17277 into '.':
C test_suite/system_tests/scripts/frame_order/cam/base_script.py
Summary of conflicts:
Text conflicts: 1
[edau@... relax-trunk]$ svn merge -r17277:17278 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r17278 into '.':
G specific_fns/frame_order.py
[edau@... relax-trunk]$ svn merge -r17278:17279 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r17279 into '.':
G specific_fns/frame_order.py
[edau@... relax-trunk]$ svn merge -r17279:17280 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r17280 into '.':
U test_suite/system_tests/frame_order.py
[edau@... relax-trunk]$
