The commands used were:
svn merge -r18552:18553 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18563:18564 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18564:18565 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18565:18566 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18566:18567 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18568:18569 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18569:18570 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
The console messages were:
[edau@... relax-trunk]$ svn merge -r18552:18553 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18553 into '.':
U generic_fns/align_tensor.py
[edau@... relax-trunk]$ svn merge -r18563:18564 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18564 into '.':
U specific_fns/frame_order.py
[edau@... relax-trunk]$ svn merge -r18564:18565 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18565 into '.':
U maths_fns/frame_order/__init__.py
[edau@... relax-trunk]$ svn merge -r18565:18566 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18566 into '.':
G specific_fns/frame_order.py
[edau@... relax-trunk]$ svn merge -r18566:18567 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18567 into '.':
G specific_fns/frame_order.py
[edau@... relax-trunk]$ svn merge -r18568:18569 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18569 into '.':
U auto_analyses/frame_order.py
[edau@... relax-trunk]$ svn merge -r18569:18570 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18570 into '.':
G specific_fns/frame_order.py
[edau@... relax-trunk]$
