The commands used were:
svn merge -r18650:18651 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18651:18652 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18652:18653 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18653:18654 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18654:18655 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18655:18656 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18657:18658 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18719:18720 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18729:18730 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
The console messages were:
[edau@... relax-trunk]$ svn merge -r18650:18651 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
[edau@... relax-trunk]$ svn merge -r18651:18652 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18652 into '.':
U auto_analyses/frame_order.py
[edau@... relax-trunk]$ svn merge -r18652:18653 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18653 into '.':
G auto_analyses/frame_order.py
[edau@... relax-trunk]$ svn merge -r18653:18654 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18654 into '.':
G auto_analyses/frame_order.py
[edau@... relax-trunk]$ svn merge -r18654:18655 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18655 into '.':
U maths_fns/frame_order/__init__.py
[edau@... relax-trunk]$ svn merge -r18655:18656 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18656 into '.':
U test_suite/system_tests/frame_order.py
[edau@... relax-trunk]$ svn merge -r18657:18658 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18658 into '.':
A test_suite/shared_data/frame_order/displacements/optimisation.log.bz2
[edau@... relax-trunk]$ svn merge -r18719:18720 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18720 into '.':
A sample_scripts/frame_order
[edau@... relax-trunk]$ svn merge -r18729:18730 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18730 into '.':
U specific_fns/frame_order.py
[edau@... relax-trunk]$
