The commands used were:
svn merge -r15320:15321 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15323:15324 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15324:15325 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15327:15328 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15328:15329 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15329:15330 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
The console messages were:
[edau@... relax-trunk]$ svn merge -r15320:15321 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15321 into '.':
U test_suite/system_tests/frame_order.py
[edau@... relax-trunk]$ svn merge -r15323:15324 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15324 into '.':
U test_suite/system_tests/scripts/frame_order/cam/iso_cone.py
U test_suite/system_tests/scripts/frame_order/cam/iso_cone_torsionless.py
[edau@... relax-trunk]$ svn merge -r15324:15325 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15325 into '.':
U test_suite/system_tests/scripts/frame_order/cam/base_script.py
G test_suite/system_tests/frame_order.py
[edau@... relax-trunk]$ svn merge -r15327:15328 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15328 into '.':
U test_suite/shared_data/frame_order/cam/opt_stats
G test_suite/system_tests/frame_order.py
[edau@... relax-trunk]$ svn merge -r15328:15329 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15329 into '.':
G test_suite/system_tests/frame_order.py
[edau@... relax-trunk]$ svn merge -r15329:15330 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15330 into '.':
U specific_fns/frame_order.py
[edau@... relax-trunk]$
