The commands used were:
svn merge -r15446:15447 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15447:15448 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15448:15449 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15449:15450 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15450:15451 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15451:15452 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15468:15469 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15469:15470 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15649:15650 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15663:15664 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
The console messages were:
[edau@... relax-trunk]$ svn merge -r15446:15447 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15447 into '.':
U maths_fns/frame_order_matrix_ops.py
U maths_fns/frame_order.py
[edau@... relax-trunk]$ svn merge -r15447:15448 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15448 into '.':
G maths_fns/frame_order.py
[edau@... relax-trunk]$ svn merge -r15448:15449 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15449 into '.':
G maths_fns/frame_order_matrix_ops.py
G maths_fns/frame_order.py
[edau@... relax-trunk]$ svn merge -r15449:15450 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15450 into '.':
G maths_fns/frame_order_matrix_ops.py
G maths_fns/frame_order.py
[edau@... relax-trunk]$ svn merge -r15450:15451 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15451 into '.':
G maths_fns/frame_order_matrix_ops.py
G maths_fns/frame_order.py
[edau@... relax-trunk]$ svn merge -r15451:15452 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15452 into '.':
G maths_fns/frame_order_matrix_ops.py
G maths_fns/frame_order.py
[edau@... relax-trunk]$ svn merge -r15468:15469 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15469 into '.':
G maths_fns/frame_order.py
[edau@... relax-trunk]$ svn merge -r15469:15470 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15470 into '.':
G maths_fns/frame_order.py
[edau@... relax-trunk]$ svn merge -r15649:15650 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15650 into '.':
U generic_fns/frame_order.py
[edau@... relax-trunk]$ svn merge -r15663:15664 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
Conflict discovered in 'docs/latex/develop.tex'.
Select: (p) postpone, (df) diff-full, (e) edit,
(mc) mine-conflict, (tc) theirs-conflict,
(s) show all options: p
--- Merging r15664 into '.':
C docs/latex/develop.tex
Summary of conflicts:
Text conflicts: 1
[edau@... relax-trunk]$
