The commands used were:
svn merge -r18001:18002 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18002:18003 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18003:18004 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18004:18005 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18005:18006 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18006:18007 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18007:18008 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18008:18009 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18009:18010 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
The console messages were:
[edau@... relax-trunk]$ svn merge -r18001:18002 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18002 into '.':
U specific_fns/frame_order.py
[edau@... relax-trunk]$ svn merge -r18002:18003 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18003 into '.':
G specific_fns/frame_order.py
[edau@... relax-trunk]$ svn merge -r18003:18004 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18004 into '.':
A test_suite/shared_data/frame_order/cam/full_analysis.py
[edau@... relax-trunk]$ svn merge -r18004:18005 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18005 into '.':
U auto_analyses/frame_order.py
[edau@... relax-trunk]$ svn merge -r18005:18006 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18006 into '.':
G auto_analyses/frame_order.py
[edau@... relax-trunk]$ svn merge -r18006:18007 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18007 into '.':
G auto_analyses/frame_order.py
[edau@... relax-trunk]$ svn merge -r18007:18008 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18008 into '.':
G auto_analyses/frame_order.py
[edau@... relax-trunk]$ svn merge -r18008:18009 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18009 into '.':
G auto_analyses/frame_order.py
[edau@... relax-trunk]$ svn merge -r18009:18010 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18010 into '.':
G auto_analyses/frame_order.py
[edau@... relax-trunk]$
