relax SVN archive

The commands used were:
svn merge -r17250:17251 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r17255:17256 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r17257:17258 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r17258:17259 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r17259:17260 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .

The console messages were:
[edau@... relax-trunk]$ svn merge -r17250:17251 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r17251 into '.':
U prompt/domain.py
U generic_fns/domain.py
U test_suite/shared_data/frame_order/cam/generate_base.py
U test_suite/system_tests/scripts/frame_order/cam/free_rotor2.py
U test_suite/system_tests/scripts/frame_order/cam/base_script.py
U test_suite/system_tests/scripts/frame_order/cam/iso_cone.py
U test_suite/system_tests/scripts/frame_order/cam/pseudo_ellipse2.py
U test_suite/system_tests/scripts/frame_order/cam/rigid.py
U test_suite/system_tests/scripts/frame_order/cam/__init__.py
U test_suite/system_tests/scripts/frame_order/cam/iso_cone_torsionless.py
U test_suite/system_tests/scripts/frame_order/cam/pseudo_ellipse_free_rotor.py
U test_suite/system_tests/scripts/frame_order/cam/rotor.py
U test_suite/system_tests/scripts/frame_order/cam/free_rotor.py
U test_suite/system_tests/scripts/frame_order/cam/iso_cone_free_rotor2.py
U test_suite/system_tests/scripts/frame_order/cam/pseudo_ellipse.py
U test_suite/system_tests/scripts/frame_order/cam/pseudo_ellipse_torsionless.py
U test_suite/system_tests/scripts/frame_order/cam/iso_cone_free_rotor.py
U test_suite/system_tests/scripts/frame_order/cam/rotor_2_state.py
U test_suite/system_tests/scripts/frame_order/cam/rotor2.py
U test_suite/system_tests/scripts/frame_order/__init__.py
U test_suite/system_tests/scripts/__init__.py
U extern/sobol/__init__.py
U auto_analyses/frame_order.py
[edau@... relax-trunk]$ svn merge -r17255:17256 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r17256 into '.':
U specific_fns/frame_order.py
[edau@... relax-trunk]$ svn merge -r17257:17258 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r17258 into '.':
U test_suite/shared_data/frame_order/cam/rotor/rdc_dy.txt
U test_suite/shared_data/frame_order/cam/rotor/rdc_tm.txt
U test_suite/shared_data/frame_order/cam/rotor/rdc_tb.txt
U test_suite/shared_data/frame_order/cam/rotor/rdc_er.txt
[edau@... relax-trunk]$ svn merge -r17258:17259 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r17259 into '.':
D prompt/domain.py
U user_functions/__init__.py
A user_functions/domain.py
[edau@... relax-trunk]$ svn merge -r17259:17260 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
Conflict discovered in 'test_suite/system_tests/scripts/frame_order/cam/base_script.py'.
Select: (p) postpone, (df) diff-full, (e) edit,
(mc) mine-conflict, (tc) theirs-conflict,
(s) show all options: p
--- Merging r17260 into '.':
C test_suite/system_tests/scripts/frame_order/cam/base_script.py
Summary of conflicts:
Text conflicts: 1
[edau@... relax-trunk]$