relax SVN archive

The commands used were:
svn merge -r15270:15271 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15271:15272 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15272:15273 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15273:15274 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15274:15275 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15275:15276 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15276:15277 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15277:15278 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15278:15279 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15279:15280 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .

The console messages were:
[edau@... relax-trunk]$ svn merge -r15270:15271 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15271 into '.':
U test_suite/system_tests/frame_order.py
[edau@... relax-trunk]$ svn merge -r15271:15272 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15272 into '.':
G test_suite/system_tests/frame_order.py
[edau@... relax-trunk]$ svn merge -r15272:15273 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15273 into '.':
G test_suite/system_tests/frame_order.py
[edau@... relax-trunk]$ svn merge -r15273:15274 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
Conflict discovered in 'test_suite/system_tests/frame_order.py'.
Select: (p) postpone, (df) diff-full, (e) edit,
(mc) mine-conflict, (tc) theirs-conflict,
(s) show all options: p
--- Merging r15274 into '.':
C test_suite/system_tests/frame_order.py
Summary of conflicts:
Text conflicts: 1
[edau@... relax-trunk]$ svn merge -r15274:15275 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
Conflict discovered in 'test_suite/system_tests/scripts/frame_order/cam/rigid.py'.
Select: (p) postpone, (df) diff-full, (e) edit,
(mc) mine-conflict, (tc) theirs-conflict,
(s) show all options: p
--- Merging r15275 into '.':
C test_suite/system_tests/scripts/frame_order/cam/rigid.py
Summary of conflicts:
Text conflicts: 1
[edau@... relax-trunk]$ svn merge -r15275:15276 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15276 into '.':
U test_suite/system_tests/scripts/frame_order/cam/free_rotor.py
[edau@... relax-trunk]$ svn merge -r15276:15277 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15277 into '.':
A test_suite/system_tests/scripts/__init__.py
[edau@... relax-trunk]$ svn merge -r15277:15278 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15278 into '.':
A test_suite/system_tests/scripts/frame_order/__init__.py
[edau@... relax-trunk]$ svn merge -r15278:15279 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15279 into '.':
A test_suite/system_tests/scripts/frame_order/cam/__init__.py
[edau@... relax-trunk]$ svn merge -r15279:15280 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
Conflict discovered in 'test_suite/system_tests/__init__.py'.
Select: (p) postpone, (df) diff-full, (e) edit,
(mc) mine-conflict, (tc) theirs-conflict,
(s) show all options: p
--- Merging r15280 into '.':
C test_suite/system_tests/__init__.py
Summary of conflicts:
Text conflicts: 1
[edau@... relax-trunk]$