relax SVN archive

The commands used were:
svn merge -r18010:18011 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18011:18012 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18012:18013 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18013:18014 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18014:18015 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18015:18016 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18016:18017 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18017:18018 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18018:18019 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18019:18020 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .

The console messages were:
[edau@... relax-trunk]$ svn merge -r18010:18011 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18011 into '.':
U test_suite/shared_data/frame_order/cam/full_analysis.py
[edau@... relax-trunk]$ svn merge -r18011:18012 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18012 into '.':
A test_suite/shared_data/frame_order/cam/pseudo_ellipse_torsionless/pcs_dy_subset.txt
A test_suite/shared_data/frame_order/cam/pseudo_ellipse_torsionless/pcs_tm_subset.txt
A test_suite/shared_data/frame_order/cam/pseudo_ellipse_torsionless/pcs_tb_subset.txt
A test_suite/shared_data/frame_order/cam/pseudo_ellipse_torsionless/pcs_er_subset.txt
A test_suite/shared_data/frame_order/cam/rigid/pcs_dy_subset.txt
A test_suite/shared_data/frame_order/cam/rigid/pcs_tm_subset.txt
A test_suite/shared_data/frame_order/cam/rigid/pcs_tb_subset.txt
A test_suite/shared_data/frame_order/cam/rigid/pcs_er_subset.txt
A test_suite/shared_data/frame_order/cam/pseudo_ellipse_free_rotor/pcs_dy_subset.txt
A test_suite/shared_data/frame_order/cam/pseudo_ellipse_free_rotor/pcs_tm_subset.txt
A test_suite/shared_data/frame_order/cam/pseudo_ellipse_free_rotor/pcs_tb_subset.txt
A test_suite/shared_data/frame_order/cam/pseudo_ellipse_free_rotor/pcs_er_subset.txt
[edau@... relax-trunk]$ svn merge -r18012:18013 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18013 into '.':
U auto_analyses/frame_order.py
[edau@... relax-trunk]$ svn merge -r18013:18014 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18014 into '.':
U specific_fns/frame_order.py
[edau@... relax-trunk]$ svn merge -r18014:18015 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18015 into '.':
G test_suite/shared_data/frame_order/cam/full_analysis.py
[edau@... relax-trunk]$ svn merge -r18015:18016 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
Conflict discovered in 'generic_fns/structure/api_base.py'.
Select: (p) postpone, (df) diff-full, (e) edit,
(mc) mine-conflict, (tc) theirs-conflict,
(s) show all options: p
--- Merging r18016 into '.':
C generic_fns/structure/api_base.py
Summary of conflicts:
Text conflicts: 1
[edau@... relax-trunk]$ svn merge -r18016:18017 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18017 into '.':
U generic_fns/molmol.py
U generic_fns/pymol_control.py
[edau@... relax-trunk]$ svn merge -r18017:18018 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18018 into '.':
G generic_fns/pymol_control.py
[edau@... relax-trunk]$ svn merge -r18018:18019 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
Conflict discovered in 'generic_fns/structure/internal.py'.
Select: (p) postpone, (df) diff-full, (e) edit,
(mc) mine-conflict, (tc) theirs-conflict,
(s) show all options: p
--- Merging r18019 into '.':
C generic_fns/structure/internal.py
Conflict discovered in 'generic_fns/structure/scientific.py'.
Select: (p) postpone, (df) diff-full, (e) edit,
(mc) mine-conflict, (tc) theirs-conflict,
(s) show all options: p
C generic_fns/structure/scientific.py
Summary of conflicts:
Text conflicts: 2
[edau@... relax-trunk]$ svn merge -r18019:18020 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18020 into '.':
G auto_analyses/frame_order.py
[edau@... relax-trunk]$