relax SVN archive

The commands used were:
svn merge -r17290:17291 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r17291:17292 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r17292:17293 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r17293:17294 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r17295:17296 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r17296:17297 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r17297:17298 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r17298:17299 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r17299:17300 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .

The console messages were:
[edau@... relax-trunk]$ svn merge -r17290:17291 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r17291 into '.':
U maths_fns/frame_order.py
[edau@... relax-trunk]$ svn merge -r17291:17292 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r17292 into '.':
U specific_fns/frame_order.py
U user_functions/frame_order.py
[edau@... relax-trunk]$ svn merge -r17292:17293 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r17293 into '.':
G specific_fns/frame_order.py
G user_functions/frame_order.py
[edau@... relax-trunk]$ svn merge -r17293:17294 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r17294 into '.':
G specific_fns/frame_order.py
[edau@... relax-trunk]$ svn merge -r17295:17296 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 r17296 into '.':
C specific_fns/frame_order.py
Summary of conflicts:
Text conflicts: 1
[edau@... relax-trunk]$ svn merge -r17296:17297 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r17297 into '.':
G specific_fns/frame_order.py
[edau@... relax-trunk]$ svn merge -r17297:17298 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r17298 into '.':
G specific_fns/frame_order.py
[edau@... relax-trunk]$ svn merge -r17298:17299 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r17299 into '.':
G specific_fns/frame_order.py
[edau@... relax-trunk]$ svn merge -r17299:17300 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r17300 into '.':
U test_suite/shared_data/frame_order/cam/pseudo_ellipse_torsionless/frame_order.py
U test_suite/shared_data/frame_order/cam/iso_cone_free_rotor/frame_order.py
U test_suite/shared_data/frame_order/cam/rotor_2_state/frame_order.py
U test_suite/shared_data/frame_order/cam/rotor2/frame_order.py
U test_suite/shared_data/frame_order/cam/free_rotor2/frame_order.py
U test_suite/shared_data/frame_order/cam/rigid/frame_order.py
U test_suite/shared_data/frame_order/cam/iso_cone/frame_order.py
U test_suite/shared_data/frame_order/cam/pseudo_ellipse2/frame_order.py
U test_suite/shared_data/frame_order/cam/pseudo_ellipse_free_rotor/frame_order.py
U test_suite/shared_data/frame_order/cam/iso_cone_torsionless/frame_order.py
U test_suite/shared_data/frame_order/cam/rotor/frame_order.py
U test_suite/shared_data/frame_order/cam/iso_cone_free_rotor2/frame_order.py
U test_suite/shared_data/frame_order/cam/free_rotor/frame_order.py
U test_suite/shared_data/frame_order/cam/pseudo_ellipse/frame_order.py
[edau@... relax-trunk]$