relax SVN archive

Next block of the manual merger of the frame_order_testing branch.

The commands used were:
svn merge -r15340:15341 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15341:15342 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15342:15343 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15343:15344 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15344:15345 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15345:15346 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15346:15347 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15347:15348 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15348:15349 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15349:15350 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .

The console messages were:
[edau@... relax-trunk]$ svn merge -r15340:15341 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15341 into '.':
U test_suite/shared_data/frame_order/cam/iso_cone_free_rotor/generate_distribution.py
U test_suite/shared_data/frame_order/cam/iso_cone_free_rotor/rdc_dy.txt
U test_suite/shared_data/frame_order/cam/iso_cone_free_rotor/rdc_tm.txt
U test_suite/shared_data/frame_order/cam/iso_cone_free_rotor/pcs_tb.txt
U test_suite/shared_data/frame_order/cam/iso_cone_free_rotor/pcs_er.txt
U test_suite/shared_data/frame_order/cam/iso_cone_free_rotor/pcs_dy.txt
U test_suite/shared_data/frame_order/cam/iso_cone_free_rotor/pcs_tm.txt
U test_suite/shared_data/frame_order/cam/iso_cone_free_rotor/generate_distribution.log.bz2
U test_suite/shared_data/frame_order/cam/iso_cone_free_rotor/frame_order_matrix
U test_suite/shared_data/frame_order/cam/iso_cone_free_rotor/rdc_tb.txt
U test_suite/shared_data/frame_order/cam/iso_cone_free_rotor/rdc_er.txt
[edau@... relax-trunk]$ svn merge -r15341:15342 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15342 into '.':
U test_suite/shared_data/frame_order/cam/opt_stats
[edau@... relax-trunk]$ svn merge -r15342:15343 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15343 into '.':
U test_suite/system_tests/scripts/frame_order/cam/iso_cone.py
U test_suite/system_tests/scripts/frame_order/cam/iso_cone_free_rotor.py
[edau@... relax-trunk]$ svn merge -r15343:15344 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15344 into '.':
U test_suite/shared_data/frame_order/cam/iso_cone_free_rotor2/generate_distribution.py
U test_suite/shared_data/frame_order/cam/iso_cone_free_rotor2/rdc_dy.txt
U test_suite/shared_data/frame_order/cam/iso_cone_free_rotor2/rdc_tm.txt
U test_suite/shared_data/frame_order/cam/iso_cone_free_rotor2/pcs_tb.txt
U test_suite/shared_data/frame_order/cam/iso_cone_free_rotor2/pcs_er.txt
U test_suite/shared_data/frame_order/cam/iso_cone_free_rotor2/pcs_dy.txt
U test_suite/shared_data/frame_order/cam/iso_cone_free_rotor2/pcs_tm.txt
U test_suite/shared_data/frame_order/cam/iso_cone_free_rotor2/generate_distribution.log.bz2
U test_suite/shared_data/frame_order/cam/iso_cone_free_rotor2/frame_order_matrix
U test_suite/shared_data/frame_order/cam/iso_cone_free_rotor2/rdc_tb.txt
U test_suite/shared_data/frame_order/cam/iso_cone_free_rotor2/rdc_er.txt
[edau@... relax-trunk]$ svn merge -r15344:15345 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15345 into '.':
U test_suite/shared_data/frame_order/cam/free_rotor/generate_distribution.py
U test_suite/shared_data/frame_order/cam/free_rotor/rdc_dy.txt
U test_suite/shared_data/frame_order/cam/free_rotor/rdc_tm.txt
U test_suite/shared_data/frame_order/cam/free_rotor/pcs_tb.txt
U test_suite/shared_data/frame_order/cam/free_rotor/pcs_er.txt
U test_suite/shared_data/frame_order/cam/free_rotor/pcs_dy.txt
U test_suite/shared_data/frame_order/cam/free_rotor/pcs_tm.txt
A test_suite/shared_data/frame_order/cam/free_rotor/generate_distribution.log.bz2
U test_suite/shared_data/frame_order/cam/free_rotor/frame_order_matrix
U test_suite/shared_data/frame_order/cam/free_rotor/rdc_tb.txt
U test_suite/shared_data/frame_order/cam/free_rotor/rdc_er.txt
D test_suite/shared_data/frame_order/cam/free_rotor/generate_distribution.log
[edau@... relax-trunk]$ svn merge -r15345:15346 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15346 into '.':
U test_suite/shared_data/frame_order/cam/free_rotor2/generate_distribution.py
U test_suite/shared_data/frame_order/cam/free_rotor2/rdc_dy.txt
U test_suite/shared_data/frame_order/cam/free_rotor2/rdc_tm.txt
U test_suite/shared_data/frame_order/cam/free_rotor2/pcs_tb.txt
U test_suite/shared_data/frame_order/cam/free_rotor2/pcs_er.txt
U test_suite/shared_data/frame_order/cam/free_rotor2/pcs_dy.txt
U test_suite/shared_data/frame_order/cam/free_rotor2/pcs_tm.txt
A test_suite/shared_data/frame_order/cam/free_rotor2/generate_distribution.log.bz2
A test_suite/shared_data/frame_order/cam/free_rotor2/axis_system
U test_suite/shared_data/frame_order/cam/free_rotor2/axis.pdb
A test_suite/shared_data/frame_order/cam/free_rotor2/frame_order_matrix
U test_suite/shared_data/frame_order/cam/free_rotor2/rdc_tb.txt
U test_suite/shared_data/frame_order/cam/free_rotor2/rdc_er.txt
[edau@... relax-trunk]$ svn merge -r15346:15347 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15347 into '.':
U test_suite/shared_data/frame_order/cam/rotor/generate_distribution.py
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/pcs_tb.txt
U test_suite/shared_data/frame_order/cam/rotor/pcs_er.txt
U test_suite/shared_data/frame_order/cam/rotor/pcs_dy.txt
U test_suite/shared_data/frame_order/cam/rotor/pcs_tm.txt
A test_suite/shared_data/frame_order/cam/rotor/generate_distribution.log.bz2
A test_suite/shared_data/frame_order/cam/rotor/axis_system
U test_suite/shared_data/frame_order/cam/rotor/axis.pdb
A test_suite/shared_data/frame_order/cam/rotor/frame_order_matrix
U test_suite/shared_data/frame_order/cam/rotor/rdc_tb.txt
U test_suite/shared_data/frame_order/cam/rotor/rdc_er.txt
D test_suite/shared_data/frame_order/cam/rotor/generate_distribution.log
[edau@... relax-trunk]$ svn merge -r15347:15348 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15348 into '.':
A extern/sobol/test.log
A extern/sobol/test.py
[edau@... relax-trunk]$ svn merge -r15348:15349 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15349 into '.':
G test_suite/shared_data/frame_order/cam/rotor/generate_distribution.py
[edau@... relax-trunk]$ svn merge -r15349:15350 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15350 into '.':
G test_suite/shared_data/frame_order/cam/free_rotor2/generate_distribution.py
[edau@... relax-trunk]$

Next block of the manual merger of the frame_order_testing branch.

The commands used were:
svn merge -r15330:15331 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15331:15332 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15332:15333 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15335:15336 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15337:15338 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15338:15339 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15339:15340 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .

The console messages were:
[edau@... relax-trunk]$ svn merge -r15330:15331 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15331 into '.':
U test_suite/system_tests/scripts/frame_order/cam/iso_cone.py
U test_suite/system_tests/scripts/frame_order/cam/iso_cone_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.py
U test_suite/system_tests/scripts/frame_order/cam/free_rotor.py
[edau@... relax-trunk]$ svn merge -r15331:15332 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15332 into '.':
U test_suite/system_tests/frame_order.py
[edau@... relax-trunk]$ svn merge -r15332:15333 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15333 into '.':
U test_suite/shared_data/frame_order/cam/opt_stats
[edau@... relax-trunk]$ svn merge -r15335:15336 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15336 into '.':
U generic_fns/frame_order.py
[edau@... relax-trunk]$ svn merge -r15337:15338 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15338 into '.':
G test_suite/system_tests/frame_order.py
[edau@... relax-trunk]$ svn merge -r15338:15339 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15339 into '.':
G test_suite/shared_data/frame_order/cam/opt_stats
U test_suite/shared_data/frame_order/cam/pseudo_ellipse_torsionless/generate_distribution.py
U test_suite/shared_data/frame_order/cam/pseudo_ellipse_torsionless/rdc_dy.txt
U test_suite/shared_data/frame_order/cam/pseudo_ellipse_torsionless/rdc_tm.txt
U test_suite/shared_data/frame_order/cam/pseudo_ellipse_torsionless/pcs_tb.txt
U test_suite/shared_data/frame_order/cam/pseudo_ellipse_torsionless/pcs_er.txt
U test_suite/shared_data/frame_order/cam/pseudo_ellipse_torsionless/pcs_dy.txt
U test_suite/shared_data/frame_order/cam/pseudo_ellipse_torsionless/pcs_tm.txt
U test_suite/shared_data/frame_order/cam/pseudo_ellipse_torsionless/generate_distribution.log.bz2
A test_suite/shared_data/frame_order/cam/pseudo_ellipse_torsionless/axis_system
A test_suite/shared_data/frame_order/cam/pseudo_ellipse_torsionless/frame_order_matrix
U test_suite/shared_data/frame_order/cam/pseudo_ellipse_torsionless/rdc_tb.txt
U test_suite/shared_data/frame_order/cam/pseudo_ellipse_torsionless/rdc_er.txt
D test_suite/shared_data/frame_order/cam/pseudo_ellipse_torsionless/back_calc.py
D test_suite/shared_data/frame_order/cam/pseudo_ellipse_torsionless/README
Conflict discovered in 'test_suite/shared_data/frame_order/cam/iso_cone_free_rotor/generate_distribution.py'.
Select: (p) postpone, (df) diff-full, (e) edit,
(mc) mine-conflict, (tc) theirs-conflict,
(s) show all options: p
C test_suite/shared_data/frame_order/cam/iso_cone_free_rotor/generate_distribution.py
U test_suite/shared_data/frame_order/cam/iso_cone_free_rotor/rdc_dy.txt
U test_suite/shared_data/frame_order/cam/iso_cone_free_rotor/rdc_tm.txt
U test_suite/shared_data/frame_order/cam/iso_cone_free_rotor/pcs_tb.txt
U test_suite/shared_data/frame_order/cam/iso_cone_free_rotor/pcs_er.txt
U test_suite/shared_data/frame_order/cam/iso_cone_free_rotor/pcs_dy.txt
U test_suite/shared_data/frame_order/cam/iso_cone_free_rotor/pcs_tm.txt
U test_suite/shared_data/frame_order/cam/iso_cone_free_rotor/generate_distribution.log.bz2
A test_suite/shared_data/frame_order/cam/iso_cone_free_rotor/axis_system
U test_suite/shared_data/frame_order/cam/iso_cone_free_rotor/axis.pdb
A test_suite/shared_data/frame_order/cam/iso_cone_free_rotor/frame_order_matrix
U test_suite/shared_data/frame_order/cam/iso_cone_free_rotor/rdc_tb.txt
U test_suite/shared_data/frame_order/cam/iso_cone_free_rotor/rdc_er.txt
D test_suite/shared_data/frame_order/cam/iso_cone_free_rotor/README
D test_suite/shared_data/frame_order/cam/iso_cone_free_rotor/back_calc.py
U test_suite/shared_data/frame_order/cam/rotor_2_state/generate_distribution.py
D test_suite/shared_data/frame_order/cam/rotor_2_state/back_calc.py
D test_suite/shared_data/frame_order/cam/rotor_2_state/README
D test_suite/shared_data/frame_order/cam/rotor_2_state/back_calc.bz2
U test_suite/shared_data/frame_order/cam/rotor2/generate_distribution.py
D test_suite/shared_data/frame_order/cam/rotor2/back_calc.py
D test_suite/shared_data/frame_order/cam/rotor2/README
D test_suite/shared_data/frame_order/cam/rotor2/back_calc.bz2
U test_suite/shared_data/frame_order/cam/free_rotor2/generate_distribution.py
D test_suite/shared_data/frame_order/cam/free_rotor2/back_calc.py
D test_suite/shared_data/frame_order/cam/free_rotor2/README
D test_suite/shared_data/frame_order/cam/free_rotor2/back_calc.bz2
U test_suite/shared_data/frame_order/cam/README
D test_suite/shared_data/frame_order/cam/rigid/back_calc.py
D test_suite/shared_data/frame_order/cam/rigid/back_calc.bz2
U test_suite/shared_data/frame_order/cam/iso_cone/generate_distribution.py
U test_suite/shared_data/frame_order/cam/iso_cone/rdc_dy.txt
U test_suite/shared_data/frame_order/cam/iso_cone/rdc_tm.txt
U test_suite/shared_data/frame_order/cam/iso_cone/pcs_tb.txt
U test_suite/shared_data/frame_order/cam/iso_cone/pcs_er.txt
U test_suite/shared_data/frame_order/cam/iso_cone/pcs_dy.txt
U test_suite/shared_data/frame_order/cam/iso_cone/pcs_tm.txt
U test_suite/shared_data/frame_order/cam/iso_cone/generate_distribution.log.bz2
A test_suite/shared_data/frame_order/cam/iso_cone/axis_system
U test_suite/shared_data/frame_order/cam/iso_cone/axis.pdb
A test_suite/shared_data/frame_order/cam/iso_cone/frame_order_matrix
U test_suite/shared_data/frame_order/cam/iso_cone/rdc_tb.txt
U test_suite/shared_data/frame_order/cam/iso_cone/rdc_er.txt
D test_suite/shared_data/frame_order/cam/iso_cone/back_calc.py
D test_suite/shared_data/frame_order/cam/iso_cone/README
U test_suite/shared_data/frame_order/cam/pseudo_ellipse_free_rotor/generate_distribution.py
U test_suite/shared_data/frame_order/cam/pseudo_ellipse_free_rotor/rdc_dy.txt
U test_suite/shared_data/frame_order/cam/pseudo_ellipse_free_rotor/rdc_tm.txt
U test_suite/shared_data/frame_order/cam/pseudo_ellipse_free_rotor/pcs_tb.txt
U test_suite/shared_data/frame_order/cam/pseudo_ellipse_free_rotor/pcs_er.txt
U test_suite/shared_data/frame_order/cam/pseudo_ellipse_free_rotor/pcs_dy.txt
U test_suite/shared_data/frame_order/cam/pseudo_ellipse_free_rotor/pcs_tm.txt
U test_suite/shared_data/frame_order/cam/pseudo_ellipse_free_rotor/generate_distribution.log.bz2
A test_suite/shared_data/frame_order/cam/pseudo_ellipse_free_rotor/axis_system
A test_suite/shared_data/frame_order/cam/pseudo_ellipse_free_rotor/frame_order_matrix
U test_suite/shared_data/frame_order/cam/pseudo_ellipse_free_rotor/rdc_tb.txt
U test_suite/shared_data/frame_order/cam/pseudo_ellipse_free_rotor/rdc_er.txt
D test_suite/shared_data/frame_order/cam/pseudo_ellipse_free_rotor/README
D test_suite/shared_data/frame_order/cam/pseudo_ellipse_free_rotor/back_calc.py
U test_suite/shared_data/frame_order/cam/iso_cone_torsionless/generate_distribution.py
U test_suite/shared_data/frame_order/cam/iso_cone_torsionless/rdc_dy.txt
U test_suite/shared_data/frame_order/cam/iso_cone_torsionless/rdc_tm.txt
U test_suite/shared_data/frame_order/cam/iso_cone_torsionless/pcs_tb.txt
U test_suite/shared_data/frame_order/cam/iso_cone_torsionless/pcs_er.txt
U test_suite/shared_data/frame_order/cam/iso_cone_torsionless/pcs_dy.txt
U test_suite/shared_data/frame_order/cam/iso_cone_torsionless/pcs_tm.txt
U test_suite/shared_data/frame_order/cam/iso_cone_torsionless/generate_distribution.log.bz2
U test_suite/shared_data/frame_order/cam/iso_cone_torsionless/axis.pdb
U test_suite/shared_data/frame_order/cam/iso_cone_torsionless/rdc_tb.txt
U test_suite/shared_data/frame_order/cam/iso_cone_torsionless/rdc_er.txt
D test_suite/shared_data/frame_order/cam/iso_cone_torsionless/README
D test_suite/shared_data/frame_order/cam/iso_cone_torsionless/back_calc.py
U test_suite/shared_data/frame_order/cam/rotor/generate_distribution.py
D test_suite/shared_data/frame_order/cam/rotor/back_calc.py
D test_suite/shared_data/frame_order/cam/rotor/README
D test_suite/shared_data/frame_order/cam/rotor/back_calc.bz2
Conflict discovered in 'test_suite/shared_data/frame_order/cam/iso_cone_free_rotor2/generate_distribution.py'.
Select: (p) postpone, (df) diff-full, (e) edit,
(mc) mine-conflict, (tc) theirs-conflict,
(s) show all options: p
C test_suite/shared_data/frame_order/cam/iso_cone_free_rotor2/generate_distribution.py
U test_suite/shared_data/frame_order/cam/iso_cone_free_rotor2/rdc_dy.txt
U test_suite/shared_data/frame_order/cam/iso_cone_free_rotor2/rdc_tm.txt
U test_suite/shared_data/frame_order/cam/iso_cone_free_rotor2/pcs_tb.txt
U test_suite/shared_data/frame_order/cam/iso_cone_free_rotor2/pcs_er.txt
U test_suite/shared_data/frame_order/cam/iso_cone_free_rotor2/pcs_dy.txt
U test_suite/shared_data/frame_order/cam/iso_cone_free_rotor2/pcs_tm.txt
U test_suite/shared_data/frame_order/cam/iso_cone_free_rotor2/generate_distribution.log.bz2
A test_suite/shared_data/frame_order/cam/iso_cone_free_rotor2/axis_system
A test_suite/shared_data/frame_order/cam/iso_cone_free_rotor2/frame_order_matrix
U test_suite/shared_data/frame_order/cam/iso_cone_free_rotor2/rdc_tb.txt
U test_suite/shared_data/frame_order/cam/iso_cone_free_rotor2/rdc_er.txt
D test_suite/shared_data/frame_order/cam/iso_cone_free_rotor2/back_calc.py
D test_suite/shared_data/frame_order/cam/iso_cone_free_rotor2/README
U test_suite/shared_data/frame_order/cam/free_rotor/generate_distribution.py
U test_suite/shared_data/frame_order/cam/free_rotor/rdc_dy.txt
U test_suite/shared_data/frame_order/cam/free_rotor/rdc_tm.txt
U test_suite/shared_data/frame_order/cam/free_rotor/pcs_tb.txt
U test_suite/shared_data/frame_order/cam/free_rotor/pcs_er.txt
U test_suite/shared_data/frame_order/cam/free_rotor/pcs_dy.txt
U test_suite/shared_data/frame_order/cam/free_rotor/distribution.pdb.gz
U test_suite/shared_data/frame_order/cam/free_rotor/pcs_tm.txt
U test_suite/shared_data/frame_order/cam/free_rotor/animate.py
A test_suite/shared_data/frame_order/cam/free_rotor/axis_system
A test_suite/shared_data/frame_order/cam/free_rotor/frame_order_matrix
U test_suite/shared_data/frame_order/cam/free_rotor/rdc_tb.txt
U test_suite/shared_data/frame_order/cam/free_rotor/rdc_er.txt
D test_suite/shared_data/frame_order/cam/free_rotor/back_calc.py
D test_suite/shared_data/frame_order/cam/free_rotor/README
D test_suite/shared_data/frame_order/cam/free_rotor/back_calc.bz2
A test_suite/shared_data/frame_order/cam/generate_base.py
U test_suite/shared_data/frame_order/cam/pseudo_ellipse/generate_distribution.py
U test_suite/shared_data/frame_order/cam/pseudo_ellipse/rdc_dy.txt
U test_suite/shared_data/frame_order/cam/pseudo_ellipse/rdc_tm.txt
U test_suite/shared_data/frame_order/cam/pseudo_ellipse/pcs_tb.txt
U test_suite/shared_data/frame_order/cam/pseudo_ellipse/pcs_er.txt
U test_suite/shared_data/frame_order/cam/pseudo_ellipse/pcs_dy.txt
U test_suite/shared_data/frame_order/cam/pseudo_ellipse/pcs_tm.txt
U test_suite/shared_data/frame_order/cam/pseudo_ellipse/generate_distribution.log.bz2
A test_suite/shared_data/frame_order/cam/pseudo_ellipse/axis_system
A test_suite/shared_data/frame_order/cam/pseudo_ellipse/frame_order_matrix
U test_suite/shared_data/frame_order/cam/pseudo_ellipse/rdc_tb.txt
U test_suite/shared_data/frame_order/cam/pseudo_ellipse/rdc_er.txt
D test_suite/shared_data/frame_order/cam/pseudo_ellipse/back_calc.py
D test_suite/shared_data/frame_order/cam/pseudo_ellipse/README
Summary of conflicts:
Text conflicts: 2
[edau@... relax-trunk]$ svn merge -r15339:15340 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15340 into '.':
U test_suite/system_tests/scripts/frame_order/cam/pseudo_ellipse.py
U test_suite/system_tests/scripts/frame_order/cam/pseudo_ellipse_free_rotor.py
U test_suite/system_tests/scripts/frame_order/cam/iso_cone_free_rotor2.py
[edau@... relax-trunk]$

Next block of the manual merger of the frame_order_testing branch.

The commands used were:
svn merge -r15320:15321 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15323:15324 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15324:15325 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15327:15328 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15328:15329 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15329:15330 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .

The console messages were:
[edau@... relax-trunk]$ svn merge -r15320:15321 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15321 into '.':
U test_suite/system_tests/frame_order.py
[edau@... relax-trunk]$ svn merge -r15323:15324 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15324 into '.':
U test_suite/system_tests/scripts/frame_order/cam/iso_cone.py
U test_suite/system_tests/scripts/frame_order/cam/iso_cone_torsionless.py
[edau@... relax-trunk]$ svn merge -r15324:15325 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15325 into '.':
U test_suite/system_tests/scripts/frame_order/cam/base_script.py
G test_suite/system_tests/frame_order.py
[edau@... relax-trunk]$ svn merge -r15327:15328 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15328 into '.':
U test_suite/shared_data/frame_order/cam/opt_stats
G test_suite/system_tests/frame_order.py
[edau@... relax-trunk]$ svn merge -r15328:15329 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15329 into '.':
G test_suite/system_tests/frame_order.py
[edau@... relax-trunk]$ svn merge -r15329:15330 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15330 into '.':
U specific_fns/frame_order.py
[edau@... relax-trunk]$

Next block of the manual merger of the frame_order_testing branch.

The commands used were:
svn merge -r15310:15311 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15311:15312 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15312:15313 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15313:15314 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15314:15315 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15315:15316 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15316:15317 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15317:15318 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15318:15319 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15319:15320 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .

The console messages were:
[edau@... relax-trunk]$ svn merge -r15310:15311 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15311 into '.':
A test_suite/shared_data/frame_order/cam/iso_cone_torsionless/frame_order_matrix.log
A test_suite/shared_data/frame_order/cam/iso_cone_torsionless/frame_order_matrix.py
[edau@... relax-trunk]$ svn merge -r15311:15312 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15312 into '.':
U specific_fns/frame_order.py
[edau@... relax-trunk]$ svn merge -r15312:15313 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15313 into '.':
U maths_fns/frame_order.py
[edau@... relax-trunk]$ svn merge -r15313:15314 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15314 into '.':
U test_suite/system_tests/scripts/frame_order/cam/iso_cone_torsionless.py
[edau@... relax-trunk]$ svn merge -r15314:15315 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15315 into '.':
U test_suite/shared_data/frame_order/cam/iso_cone_torsionless/frame_order.py
[edau@... relax-trunk]$ svn merge -r15315:15316 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15316 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/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/pseudo_ellipse_free_rotor/frame_order_pseudo_ellipse.py
U test_suite/shared_data/frame_order/cam/pseudo_ellipse_free_rotor/frame_order.py
G 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]$ svn merge -r15316:15317 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15317 into '.':
U test_suite/system_tests/scripts/frame_order/cam/iso_cone.py
[edau@... relax-trunk]$ svn merge -r15317:15318 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15318 into '.':
U test_suite/system_tests/scripts/frame_order/cam/base_script.py
[edau@... relax-trunk]$ svn merge -r15318:15319 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15319 into '.':
G test_suite/system_tests/scripts/frame_order/cam/iso_cone.py
[edau@... relax-trunk]$ svn merge -r15319:15320 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15320 into '.':
G test_suite/system_tests/scripts/frame_order/cam/base_script.py
[edau@... relax-trunk]$

Next block of the manual merger of the frame_order_testing branch.

The commands used were:
svn merge -r15300:15301 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15301:15302 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15302:15303 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15303:15304 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15304:15305 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15305:15306 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15306:15307 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15307:15308 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15308:15309 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15309:15310 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .

The console messages were:
[edau@... relax-trunk]$ svn merge -r15300:15301 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15301 into '.':
U maths_fns/frame_order_matrix_ops.py
[edau@... relax-trunk]$ svn merge -r15301:15302 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15302 into '.':
U test_suite/system_tests/scripts/frame_order/cam/base_script.py
[edau@... relax-trunk]$ svn merge -r15302:15303 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15303 into '.':
U test_suite/system_tests/frame_order.py
[edau@... relax-trunk]$ svn merge -r15303:15304 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15304 into '.':
U test_suite/system_tests/scripts/frame_order/cam/iso_cone.py
[edau@... relax-trunk]$ svn merge -r15304:15305 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15305 into '.':
G test_suite/system_tests/frame_order.py
[edau@... relax-trunk]$ svn merge -r15305:15306 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15306 into '.':
U test_suite/shared_data/frame_order/cam/pseudo_ellipse_torsionless/README
U test_suite/shared_data/frame_order/cam/rotor2/README
U test_suite/shared_data/frame_order/cam/free_rotor2/README
U test_suite/shared_data/frame_order/cam/iso_cone/README
U test_suite/shared_data/frame_order/cam/iso_cone_torsionless/README
U test_suite/shared_data/frame_order/cam/pseudo_ellipse_free_rotor/README
U test_suite/shared_data/frame_order/cam/rotor/README
U test_suite/shared_data/frame_order/cam/iso_cone_free_rotor2/README
U test_suite/shared_data/frame_order/cam/free_rotor/README
U test_suite/shared_data/frame_order/cam/pseudo_ellipse/README
[edau@... relax-trunk]$ svn merge -r15306:15307 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15307 into '.':
A test_suite/shared_data/frame_order/cam/opt_stats
[edau@... relax-trunk]$ svn merge -r15307:15308 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15308 into '.':
U test_suite/shared_data/frame_order/cam/opt_stats
[edau@... relax-trunk]$ svn merge -r15308:15309 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15309 into '.':
G test_suite/shared_data/frame_order/cam/opt_stats
[edau@... relax-trunk]$ svn merge -r15309:15310 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15310 into '.':
U test_suite/shared_data/frame_order/cam/iso_cone/frame_order.bz2
U test_suite/shared_data/frame_order/cam/iso_cone/cone.pdb
U test_suite/shared_data/frame_order/cam/iso_cone/ave_pos.pdb
U test_suite/shared_data/frame_order/cam/iso_cone/frame_order.log.bz2
[edau@... relax-trunk]$

Next block of the manual merger of the frame_order_testing branch.

The commands used were:
svn merge -r15290:15291 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15291:15292 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15292:15293 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15293:15294 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15294:15295 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15295:15296 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15296:15297 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15297:15298 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15298:15299 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15299:15300 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .

The console messages were:
[edau@... relax-trunk]$ svn merge -r15290:15291 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15291 into '.':
U maths_fns/frame_order.py
U specific_fns/frame_order.py
[edau@... relax-trunk]$ svn merge -r15291:15292 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15292 into '.':
U test_suite/system_tests/scripts/frame_order/cam/base_script.py
U test_suite/system_tests/scripts/frame_order/cam/rotor.py
[edau@... relax-trunk]$ svn merge -r15292:15293 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15293 into '.':
U test_suite/system_tests/frame_order.py
[edau@... relax-trunk]$ svn merge -r15293:15294 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15294 into '.':
U maths_fns/frame_order_matrix_ops.py
G maths_fns/frame_order.py
[edau@... relax-trunk]$ svn merge -r15294:15295 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15295 into '.':
G maths_fns/frame_order.py
[edau@... relax-trunk]$ svn merge -r15295:15296 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15296 into '.':
U test_suite/system_tests/scripts/frame_order/cam/free_rotor2.py
U test_suite/system_tests/scripts/frame_order/cam/pseudo_ellipse.py
U test_suite/system_tests/scripts/frame_order/cam/iso_cone.py
U test_suite/system_tests/scripts/frame_order/cam/rigid.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_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/iso_cone_free_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/rotor2.py
[edau@... relax-trunk]$ svn merge -r15296:15297 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15297 into '.':
G maths_fns/frame_order.py
[edau@... relax-trunk]$ svn merge -r15297:15298 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15298 into '.':
G maths_fns/frame_order.py
[edau@... relax-trunk]$ svn merge -r15298:15299 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15299 into '.':
G maths_fns/frame_order_matrix_ops.py
[edau@... relax-trunk]$ svn merge -r15299:15300 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15300 into '.':
G specific_fns/frame_order.py
[edau@... relax-trunk]$

Next block of the manual merger of the frame_order_testing branch.

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]$

Next block of the manual merger of the frame_order_testing branch.

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]$

Next block of the manual merger of the frame_order_testing branch.

The commands used were:
svn merge -r15262:15263 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15263:15264 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15264:15265 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15265:15266 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15266:15267 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15267:15268 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15268:15269 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15269:15270 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .

The console messages were:
[edau@... relax-trunk]$ svn merge -r15262:15263 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15263 into '.':
U test_suite/system_tests/scripts/frame_order/cam/free_rotor.py
[edau@... relax-trunk]$ svn merge -r15263:15264 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15264 into '.':
U specific_fns/api_common.py
[edau@... relax-trunk]$ svn merge -r15264:15265 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15265 into '.':
U specific_fns/frame_order.py
[edau@... relax-trunk]$ svn merge -r15265:15266 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 r15266 into '.':
C test_suite/system_tests/scripts/frame_order/cam/free_rotor2.py
U test_suite/system_tests/frame_order.py
Summary of conflicts:
Text conflicts: 1
[edau@... relax-trunk]$ svn merge -r15266:15267 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15267 into '.':
G test_suite/system_tests/frame_order.py
[edau@... relax-trunk]$ svn merge -r15267:15268 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15268 into '.':
G test_suite/system_tests/frame_order.py
[edau@... relax-trunk]$ svn merge -r15268:15269 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15269 into '.':
G test_suite/system_tests/frame_order.py
[edau@... relax-trunk]$ svn merge -r15269:15270 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15270 into '.':
G test_suite/system_tests/frame_order.py
[edau@... relax-trunk]$

Next block of the manual merger of the frame_order_testing branch.

The commands used were:
svn merge -r15220:15221 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15221:15222 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15238:15239 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15239:15240 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15240:15241 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15241:15242 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15242:15243 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15252:15253 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .

The console messages were:
[edau@... relax-trunk]$ svn merge -r15220:15221 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15221 into '.':
U test_suite/unit_tests/_generic_fns/test_mol_res_spin.py
U test_suite/unit_tests/_maths_fns/test_frame_order_matrix_ops.py
[edau@... relax-trunk]$ svn merge -r15221:15222 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15222 into '.':
U test_suite/system_tests/frame_order.py
[edau@... relax-trunk]$ svn merge -r15238:15239 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15239 into '.':
U test_suite/shared_data/frame_order/cam/pseudo_ellipse_torsionless/tensor_fit.py
U test_suite/shared_data/frame_order/cam/pseudo_ellipse_torsionless/back_calc.py
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/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/tensor_fit.py
U test_suite/shared_data/frame_order/cam/iso_cone/back_calc.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/tensor_fit.py
U test_suite/shared_data/frame_order/cam/iso_cone_torsionless/back_calc.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/tensor_fit.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/back_calc.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/tensor_fit.py
U test_suite/shared_data/frame_order/cam/pseudo_ellipse/back_calc.py
U test_suite/shared_data/frame_order/cam/pseudo_ellipse/frame_order.py
[edau@... relax-trunk]$ svn merge -r15239:15240 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15240 into '.':
U specific_fns/frame_order.py
[edau@... relax-trunk]$ svn merge -r15240:15241 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15241 into '.':
G specific_fns/frame_order.py
[edau@... relax-trunk]$ svn merge -r15241:15242 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
Conflict discovered in 'test_suite/system_tests/structure.py'.
Select: (p) postpone, (df) diff-full, (e) edit,
(mc) mine-conflict, (tc) theirs-conflict,
(s) show all options: p
--- Merging r15242 into '.':
C test_suite/system_tests/structure.py
Summary of conflicts:
Text conflicts: 1
[edau@... relax-trunk]$ svn merge -r15242:15243 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
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
--- Merging r15243 into '.':
C test_suite/system_tests/scripts/frame_order/cam/free_rotor.py
G test_suite/system_tests/frame_order.py
Summary of conflicts:
Text conflicts: 1
[edau@... relax-trunk]$ svn merge -r15252:15253 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15253 into '.':
G test_suite/system_tests/scripts/frame_order/cam/free_rotor.py
G test_suite/system_tests/frame_order.py
[edau@... relax-trunk]$