The commands used were:
svn merge -r18640:18641 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18641:18642 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18642:18643 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18643:18644 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18644:18645 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18647:18648 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18648:18649 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18649:18650 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
The console messages were:
[edau@... relax-trunk]$ svn merge -r18640:18641 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
[edau@... relax-trunk]$ svn merge -r18641:18642 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18642 into '.':
U test_suite/system_tests/scripts/frame_order/cam/pseudo_ellipse.py
[edau@... relax-trunk]$ svn merge -r18642:18643 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18643 into '.':
A test_suite/shared_data/frame_order/displacements/optimisation.py
[edau@... relax-trunk]$ svn merge -r18643:18644 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18644 into '.':
U test_suite/shared_data/frame_order/cam/full_analysis.py
[edau@... relax-trunk]$ svn merge -r18644:18645 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18645 into '.':
U test_suite/system_tests/frame_order.py
[edau@... relax-trunk]$ svn merge -r18647:18648 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18648 into '.':
U test_suite/shared_data/frame_order/cam/generate_base.py
[edau@... relax-trunk]$ svn merge -r18648:18649 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18649 into '.':
G test_suite/shared_data/frame_order/cam/generate_base.py
[edau@... relax-trunk]$ svn merge -r18649:18650 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18650 into '.':
G test_suite/system_tests/frame_order.py
[edau@... relax-trunk]$
