The commands used were:
svn merge -r18460:18461 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18466:18467 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18467:18468 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18468:18469 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18469:18470 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18472:18473 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18546:18547 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18547:18548 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
The console messages were:
[edau@... relax-trunk]$ svn merge -r18460:18461 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18461 into '.':
U specific_fns/frame_order.py
[edau@... relax-trunk]$ svn merge -r18466:18467 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
Conflict discovered in 'generic_fns/structure/main.py'.
Select: (p) postpone, (df) diff-full, (e) edit,
(mc) mine-conflict, (tc) theirs-conflict,
(s) show all options: p
--- Merging r18467 into '.':
C generic_fns/structure/main.py
Summary of conflicts:
Text conflicts: 1
[edau@... relax-trunk]$ svn merge -r18467:18468 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18468 into '.':
G specific_fns/frame_order.py
[edau@... relax-trunk]$ svn merge -r18468:18469 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18469 into '.':
G specific_fns/frame_order.py
[edau@... relax-trunk]$ svn merge -r18469:18470 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18470 into '.':
U test_suite/shared_data/frame_order/cam/full_analysis.py
[edau@... relax-trunk]$ svn merge -r18472:18473 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18473 into '.':
U auto_analyses/frame_order.py
[edau@... relax-trunk]$ svn merge -r18546:18547 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
Conflict discovered in 'generic_fns/structure/main.py'.
Select: (p) postpone, (df) diff-full, (e) edit,
(mc) mine-conflict, (tc) theirs-conflict,
(s) show all options: p
--- Merging r18547 into '.':
C generic_fns/structure/main.py
Summary of conflicts:
Text conflicts: 1
[edau@... relax-trunk]$ svn merge -r18547:18548 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18548 into '.':
G specific_fns/frame_order.py
[edau@... relax-trunk]$
