The commands used were:
svn merge -r18892:18893 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18916:18917 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18917:18918 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18920:18921 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18921:18922 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18933:18934 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18934:18935 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18935:18936 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
The console messages were:
[edau@... relax-trunk]$ svn merge -r18892:18893 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18893 into '.':
U specific_fns/frame_order.py
[edau@... relax-trunk]$ svn merge -r18916:18917 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
[edau@... relax-trunk]$ svn merge -r18917:18918 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18918 into '.':
G specific_fns/frame_order.py
U auto_analyses/frame_order.py
[edau@... relax-trunk]$ svn merge -r18920:18921 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18921 into '.':
G specific_fns/frame_order.py
[edau@... relax-trunk]$ svn merge -r18921:18922 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18922 into '.':
G auto_analyses/frame_order.py
[edau@... relax-trunk]$ svn merge -r18933:18934 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18934 into '.':
G specific_fns/frame_order.py
[edau@... relax-trunk]$ svn merge -r18934:18935 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18935 into '.':
U test_suite/system_tests/scripts/frame_order/rigid_test.py
[edau@... relax-trunk]$ svn merge -r18935:18936 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18936 into '.':
G specific_fns/frame_order.py
[edau@... relax-trunk]$
