The commands used were:
svn merge -r15280:15281 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15281:15282 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15282:15283 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15283:15284 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15284:15285 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15285:15286 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15286:15287 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15287:15288 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15288:15289 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15289:15290 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
The console messages were:
[edau@... relax-trunk]$ svn merge -r15280:15281 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15281 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/rotor2/pcs_only/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/iso_cone/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_torsionless/frame_order.py
U test_suite/shared_data/frame_order/cam/pseudo_ellipse_free_rotor/frame_order_pseudo_ellipse.py
U test_suite/shared_data/frame_order/cam/pseudo_ellipse_free_rotor/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
U test_suite/unit_tests/unit_test_runner.py
[edau@... relax-trunk]$ svn merge -r15281:15282 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15282 into '.':
A test_suite/system_tests/scripts/frame_order/cam/base_script.py
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
C test_suite/system_tests/scripts/frame_order/cam/rigid.py
U test_suite/system_tests/scripts/frame_order/cam/__init__.py
Summary of conflicts:
Text conflicts: 1
[edau@... relax-trunk]$ svn merge -r15282:15283 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
Conflict discovered in 'test_suite/system_tests/scripts/frame_order/cam/free_rotor2.py'.
Select: (p) postpone, (df) diff-full, (e) edit,
(mc) mine-conflict, (tc) theirs-conflict,
(s) show all options: p
--- Merging r15283 into '.':
C test_suite/system_tests/scripts/frame_order/cam/free_rotor2.py
U test_suite/system_tests/scripts/frame_order/cam/base_script.py
Conflict discovered in 'test_suite/system_tests/scripts/frame_order/cam/iso_cone_free_rotor.py'.
Select: (p) postpone, (df) diff-full, (e) edit,
(mc) mine-conflict, (tc) theirs-conflict,
(s) show all options: p
C test_suite/system_tests/scripts/frame_order/cam/iso_cone_free_rotor.py
Conflict discovered in 'test_suite/system_tests/scripts/frame_order/cam/rotor.py'.
Select: (p) postpone, (df) diff-full, (e) edit,
(mc) mine-conflict, (tc) theirs-conflict,
(s) show all options: p
C test_suite/system_tests/scripts/frame_order/cam/rotor.py
Conflict discovered in 'test_suite/system_tests/scripts/frame_order/cam/free_rotor.py'.
Select: (p) postpone, (df) diff-full, (e) edit,
(mc) mine-conflict, (tc) theirs-conflict,
(s) show all options: p
C test_suite/system_tests/scripts/frame_order/cam/free_rotor.py
Conflict discovered in 'test_suite/system_tests/scripts/frame_order/cam/iso_cone_free_rotor2.py'.
Select: (p) postpone, (df) diff-full, (e) edit,
(mc) mine-conflict, (tc) theirs-conflict,
(s) show all options: p
C test_suite/system_tests/scripts/frame_order/cam/iso_cone_free_rotor2.py
Conflict discovered in 'test_suite/system_tests/scripts/frame_order/cam/rotor2.py'.
Select: (p) postpone, (df) diff-full, (e) edit,
(mc) mine-conflict, (tc) theirs-conflict,
(s) show all options: p
C test_suite/system_tests/scripts/frame_order/cam/rotor2.py
Summary of conflicts:
Text conflicts: 6
p[edau@... relax-trunk]$ svn merge -r15283:15284 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15284 into '.':
A test_suite/system_tests/scripts/frame_order/cam/pseudo_ellipse.py
A test_suite/system_tests/scripts/frame_order/cam/iso_cone.py
A test_suite/system_tests/scripts/frame_order/cam/pseudo_ellipse_torsionless.py
A test_suite/system_tests/scripts/frame_order/cam/iso_cone_torsionless.py
A test_suite/system_tests/scripts/frame_order/cam/pseudo_ellipse_free_rotor.py
[edau@... relax-trunk]$ svn merge -r15284:15285 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15285 into '.':
U maths_fns/frame_order.py
[edau@... relax-trunk]$ svn merge -r15285:15286 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15286 into '.':
G maths_fns/frame_order.py
[edau@... relax-trunk]$ svn merge -r15286:15287 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15287 into '.':
G maths_fns/frame_order.py
[edau@... relax-trunk]$ svn merge -r15287:15288 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15288 into '.':
G maths_fns/frame_order.py
[edau@... relax-trunk]$ svn merge -r15288:15289 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15289 into '.':
U maths_fns/frame_order_matrix_ops.py
[edau@... relax-trunk]$ svn merge -r15289:15290 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15290 into '.':
U specific_fns/frame_order.py
[edau@... relax-trunk]$
