The commands used were:
svn merge -r18570:18571 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18571:18572 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18594:18595 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18595:18596 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18596:18597 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18597:18598 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18598:18599 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18599:18600 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
The console messages were:
[edau@... relax-trunk]$ svn merge -r18570:18571 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18571 into '.':
U specific_fns/frame_order.py
[edau@... relax-trunk]$ svn merge -r18571:18572 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18572 into '.':
G specific_fns/frame_order.py
[edau@... relax-trunk]$ svn merge -r18594:18595 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18595 into '.':
G specific_fns/frame_order.py
[edau@... relax-trunk]$ svn merge -r18595:18596 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18596 into '.':
G specific_fns/frame_order.py
[edau@... relax-trunk]$ svn merge -r18596:18597 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18597 into '.':
G specific_fns/frame_order.py
[edau@... relax-trunk]$ svn merge -r18597:18598 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18598 into '.':
U maths_fns/frame_order/__init__.py
G specific_fns/frame_order.py
U user_functions/frame_order.py
U auto_analyses/frame_order.py
[edau@... relax-trunk]$ svn merge -r18598:18599 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18599 into '.':
U test_suite/shared_data/frame_order/cam/full_analysis.py
[edau@... relax-trunk]$ svn merge -r18599:18600 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18600 into '.':
U generic_fns/structure/mass.py
[edau@... relax-trunk]$
