relax SVN archive

The commands used were:
svn merge -r17866:17867 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r17867:17868 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r17896:17897 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r17917:17918 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r17929:17930 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r17935:17936 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r17942:17943 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r17949:17950 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .

The console messages were:
[edau@... relax-trunk]$ svn merge -r17866:17867 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r17867 into '.':
U test_suite/system_tests/frame_order.py
[edau@... relax-trunk]$ svn merge -r17867:17868 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
Conflict discovered in 'specific_fns/frame_order.py'.
Select: (p) postpone, (df) diff-full, (e) edit,
(mc) mine-conflict, (tc) theirs-conflict,
(s) show all options: p
--- Merging r17868 into '.':
C specific_fns/frame_order.py
Summary of conflicts:
Text conflicts: 1
[edau@... relax-trunk]$ svn merge -r17896:17897 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
Conflict discovered in 'specific_fns/frame_order.py'.
Select: (p) postpone, (df) diff-full, (e) edit,
(mc) mine-conflict, (tc) theirs-conflict,
(s) show all options: p
--- Merging r17897 into '.':
C specific_fns/frame_order.py
\Summary of conflicts:
Text conflicts: 1
[edau@... relax-trunk]$ svn merge -r17917:17918 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r17918 into '.':
A test_suite/shared_data/frame_order/cam/pseudo_ellipse_torsionless/back_calc.bz2
A test_suite/shared_data/frame_order/cam/iso_cone_free_rotor/back_calc.bz2
A test_suite/shared_data/frame_order/cam/rotor2/back_calc.bz2
A test_suite/shared_data/frame_order/cam/free_rotor2/back_calc.bz2
A test_suite/shared_data/frame_order/cam/iso_cone/back_calc.bz2
A test_suite/shared_data/frame_order/cam/pseudo_ellipse2/back_calc.bz2
A test_suite/shared_data/frame_order/cam/pseudo_ellipse_free_rotor/back_calc.bz2
A test_suite/shared_data/frame_order/cam/iso_cone_torsionless/back_calc.bz2
A test_suite/shared_data/frame_order/cam/rotor/back_calc.bz2
A test_suite/shared_data/frame_order/cam/iso_cone_free_rotor2/back_calc.bz2
A test_suite/shared_data/frame_order/cam/free_rotor/back_calc.bz2
A test_suite/shared_data/frame_order/cam/pseudo_ellipse/back_calc.bz2
[edau@... relax-trunk]$ svn merge -r17929:17930 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r17930 into '.':
A test_suite/shared_data/frame_order/cam/pseudo_ellipse/multi_processor_test.py
[edau@... relax-trunk]$ svn merge -r17935:17936 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r17936 into '.':
U test_suite/shared_data/frame_order/cam/pseudo_ellipse/multi_processor_test.py
[edau@... relax-trunk]$ svn merge -r17942:17943 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r17943 into '.':
U maths_fns/frame_order/pseudo_ellipse.py
U maths_fns/frame_order/__init__.py
[edau@... relax-trunk]$ svn merge -r17949:17950 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r17950 into '.':
U maths_fns/frame_order/matrix_ops.py
[edau@... relax-trunk]$