relax SVN archive

The commands used were:
svn merge -r17950:17951 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r17951:17952 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r17952:17953 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r17953:17954 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r17955:17956 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r17956:17957 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r17957:17958 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r17958:17959 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .

The console messages were:
[edau@... relax-trunk]$ svn merge -r17950:17951 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r17951 into '.':
U maths_fns/frame_order/matrix_ops.py
[edau@... relax-trunk]$ svn merge -r17951:17952 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r17952 into '.':
U maths_fns/frame_order/pseudo_ellipse.py
U maths_fns/frame_order/__init__.py
[edau@... relax-trunk]$ svn merge -r17952:17953 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r17953 into '.':
G maths_fns/frame_order/matrix_ops.py
[edau@... relax-trunk]$ svn merge -r17953:17954 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r17954 into '.':
G maths_fns/frame_order/__init__.py
G maths_fns/frame_order/matrix_ops.py
[edau@... relax-trunk]$ svn merge -r17955:17956 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r17956 into '.':
U test_suite/shared_data/frame_order/cam/pseudo_ellipse/multi_processor_test.py
A test_suite/shared_data/frame_order/cam/pseudo_ellipse/pcs_dy_subset.txt
A test_suite/shared_data/frame_order/cam/pseudo_ellipse/pcs_tm_subset.txt
A test_suite/shared_data/frame_order/cam/pseudo_ellipse/pcs_tb_subset.txt
A test_suite/shared_data/frame_order/cam/pseudo_ellipse/pcs_er_subset.txt
[edau@... relax-trunk]$ svn merge -r17956:17957 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r17957 into '.':
G maths_fns/frame_order/matrix_ops.py
[edau@... relax-trunk]$ svn merge -r17957:17958 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r17958 into '.':
G maths_fns/frame_order/pseudo_ellipse.py
[edau@... relax-trunk]$ svn merge -r17958:17959 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
Conflict discovered in 'auto_analyses/dauvergne_protocol.py'.
Select: (p) postpone, (df) diff-full, (e) edit,
(mc) mine-conflict, (tc) theirs-conflict,
(s) show all options: p
--- Merging r17959 into '.':
C auto_analyses/dauvergne_protocol.py
Summary of conflicts:
Text conflicts: 1
[edau@... relax-trunk]$