relax SVN archive

Next block of the manual merger of the frame_order_testing branch.

The commands used were:
svn merge -r16681:16682 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r16710:16711 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .

The console messages were:
[edau@... relax-trunk]$ svn merge -r16681:16682 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 r16682 into '.':
C test_suite/system_tests/__init__.py
Summary of conflicts:
Text conflicts: 1
[edau@... relax-trunk]$ svn merge -r16710:16711 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r16711 into '.':
U generic_fns/align_tensor.py
[edau@... relax-trunk]$

Next block of the manual merger of the frame_order_testing branch.

The commands used were:
svn merge -r15446:15447 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15447:15448 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15448:15449 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15449:15450 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15450:15451 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15451:15452 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15468:15469 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15469:15470 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15649:15650 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15663:15664 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .

The console messages were:
[edau@... relax-trunk]$ svn merge -r15446:15447 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15447 into '.':
U maths_fns/frame_order_matrix_ops.py
U maths_fns/frame_order.py
[edau@... relax-trunk]$ svn merge -r15447:15448 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15448 into '.':
G maths_fns/frame_order.py
[edau@... relax-trunk]$ svn merge -r15448:15449 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15449 into '.':
G maths_fns/frame_order_matrix_ops.py
G maths_fns/frame_order.py
[edau@... relax-trunk]$ svn merge -r15449:15450 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15450 into '.':
G maths_fns/frame_order_matrix_ops.py
G maths_fns/frame_order.py
[edau@... relax-trunk]$ svn merge -r15450:15451 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15451 into '.':
G maths_fns/frame_order_matrix_ops.py
G maths_fns/frame_order.py
[edau@... relax-trunk]$ svn merge -r15451:15452 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15452 into '.':
G maths_fns/frame_order_matrix_ops.py
G maths_fns/frame_order.py
[edau@... relax-trunk]$ svn merge -r15468:15469 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15469 into '.':
G maths_fns/frame_order.py
[edau@... relax-trunk]$ svn merge -r15469:15470 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15470 into '.':
G maths_fns/frame_order.py
[edau@... relax-trunk]$ svn merge -r15649:15650 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15650 into '.':
U generic_fns/frame_order.py
[edau@... relax-trunk]$ svn merge -r15663:15664 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
Conflict discovered in 'docs/latex/develop.tex'.
Select: (p) postpone, (df) diff-full, (e) edit,
(mc) mine-conflict, (tc) theirs-conflict,
(s) show all options: p
--- Merging r15664 into '.':
C docs/latex/develop.tex
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 -r15381:15382 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15383:15384 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15386:15387 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15428:15429 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15429:15430 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15433:15434 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15436:15437 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15437:15438 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15438:15439 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .

The console messages were:
[edau@... relax-trunk]$ svn merge -r15381:15382 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15382 into '.':
U test_suite/system_tests/scripts/frame_order/cam/iso_cone_torsionless.py
[edau@... relax-trunk]$ svn merge -r15383:15384 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15384 into '.':
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
A test_suite/shared_data/frame_order/cam/iso_cone_torsionless/axis_system
A test_suite/shared_data/frame_order/cam/iso_cone_torsionless/frame_order_matrix
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
[edau@... relax-trunk]$ svn merge -r15386:15387 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15387 into '.':
U test_suite/shared_data/frame_order/cam/opt_stats
U test_suite/system_tests/frame_order.py
[edau@... relax-trunk]$ svn merge -r15428:15429 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15429 into '.':
U test_suite/system_tests/scripts/frame_order/cam/iso_cone_free_rotor2.py
[edau@... relax-trunk]$ svn merge -r15429:15430 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15430 into '.':
U test_suite/shared_data/frame_order/cam/pseudo_ellipse2/frame_order.log.bz2
U test_suite/shared_data/frame_order/cam/pseudo_ellipse2/frame_order.py
[edau@... relax-trunk]$ svn merge -r15433:15434 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15434 into '.':
U maths_fns/frame_order_matrix_ops.py
[edau@... relax-trunk]$ svn merge -r15436:15437 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15437 into '.':
G maths_fns/frame_order_matrix_ops.py
[edau@... relax-trunk]$ svn merge -r15437:15438 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15438 into '.':
G test_suite/shared_data/frame_order/cam/opt_stats
U test_suite/system_tests/scripts/frame_order/cam/pseudo_ellipse.py
G test_suite/system_tests/frame_order.py
[edau@... relax-trunk]$ svn merge -r15438:15439 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15439 into '.':
G maths_fns/frame_order_matrix_ops.py
[edau@... relax-trunk]$

Next block of the manual merger of the frame_order_testing branch.

The commands used were:
svn merge -r15372:15373 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15373:15374 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15374:15375 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15375:15376 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15376:15377 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15377:15378 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15378:15379 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .

The console messages were:
[edau@... relax-trunk]$ svn merge -r15372:15373 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15373 into '.':
U test_suite/shared_data/frame_order/cam/opt_stats
U test_suite/system_tests/scripts/frame_order/cam/free_rotor2.py
U test_suite/system_tests/frame_order.py
[edau@... relax-trunk]$ svn merge -r15373:15374 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15374 into '.':
G test_suite/system_tests/scripts/frame_order/cam/free_rotor2.py
[edau@... relax-trunk]$ svn merge -r15374:15375 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15375 into '.':
G test_suite/system_tests/frame_order.py
[edau@... relax-trunk]$ svn merge -r15375:15376 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15376 into '.':
G test_suite/shared_data/frame_order/cam/opt_stats
U test_suite/system_tests/scripts/frame_order/cam/iso_cone_free_rotor2.py
G test_suite/system_tests/frame_order.py
svn merge -r15376:15377 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
[edau@... relax-trunk]$ svn merge -r15376:15377 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15377 into '.':
G test_suite/system_tests/scripts/frame_order/cam/free_rotor2.py
[edau@... relax-trunk]$ svn merge -r15377:15378 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15378 into '.':
G test_suite/system_tests/frame_order.py
[edau@... relax-trunk]$ svn merge -r15378:15379 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15379 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 -r15360:15361 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15361:15362 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15362:15363 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15363:15364 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15364:15365 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15365:15366 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15366:15367 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15367:15368 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15368:15369 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .

The console messages were:
[edau@... relax-trunk]$ svn merge -r15360:15361 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15361 into '.':
U test_suite/shared_data/frame_order/cam/rotor/generate_distribution.py
[edau@... relax-trunk]$ svn merge -r15361:15362 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15362 into '.':
U test_suite/shared_data/frame_order/cam/free_rotor2/generate_distribution.py
U test_suite/shared_data/frame_order/cam/iso_cone_free_rotor2/generate_distribution.py
U test_suite/shared_data/frame_order/cam/generate_base.py
[edau@... relax-trunk]$ svn merge -r15362:15363 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15363 into '.':
U test_suite/shared_data/frame_order/cam/rotor2/generate_distribution.py
G test_suite/shared_data/frame_order/cam/free_rotor2/generate_distribution.py
G test_suite/shared_data/frame_order/cam/rotor/generate_distribution.py
U test_suite/shared_data/frame_order/cam/free_rotor/generate_distribution.py
[edau@... relax-trunk]$ svn merge -r15363:15364 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15364 into '.':
A test_suite/system_tests/scripts/frame_order/cam/rotor_2_state.py
U test_suite/system_tests/frame_order.py
[edau@... relax-trunk]$ svn merge -r15364:15365 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15365 into '.':
U test_suite/shared_data/frame_order/cam/opt_stats
[edau@... relax-trunk]$ svn merge -r15365:15366 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15366 into '.':
G test_suite/system_tests/frame_order.py
[edau@... relax-trunk]$ svn merge -r15366:15367 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15367 into '.':
A test_suite/shared_data/frame_order/cam/pseudo_ellipse2
A test_suite/shared_data/frame_order/cam/pseudo_ellipse2/generate_distribution.py
A test_suite/shared_data/frame_order/cam/pseudo_ellipse2/frame_order.bz2
A test_suite/shared_data/frame_order/cam/pseudo_ellipse2/rdc_dy.txt
A test_suite/shared_data/frame_order/cam/pseudo_ellipse2/tensors.py
A test_suite/shared_data/frame_order/cam/pseudo_ellipse2/rdc_tm.txt
A test_suite/shared_data/frame_order/cam/pseudo_ellipse2/tensor_fit.log.bz2
A test_suite/shared_data/frame_order/cam/pseudo_ellipse2/cone.pdb
A test_suite/shared_data/frame_order/cam/pseudo_ellipse2/pcs_tb.txt
A test_suite/shared_data/frame_order/cam/pseudo_ellipse2/pcs_er.txt
A test_suite/shared_data/frame_order/cam/pseudo_ellipse2/pcs_dy.txt
A test_suite/shared_data/frame_order/cam/pseudo_ellipse2/ave_pos.pdb
A test_suite/shared_data/frame_order/cam/pseudo_ellipse2/frame_order.log.bz2
A test_suite/shared_data/frame_order/cam/pseudo_ellipse2/tensor_fit.py
A test_suite/shared_data/frame_order/cam/pseudo_ellipse2/pcs_tm.txt
A test_suite/shared_data/frame_order/cam/pseudo_ellipse2/animate.py
A test_suite/shared_data/frame_order/cam/pseudo_ellipse2/generate_distribution.log.bz2
A test_suite/shared_data/frame_order/cam/pseudo_ellipse2/axis_system
A test_suite/shared_data/frame_order/cam/pseudo_ellipse2/axis.pdb
A test_suite/shared_data/frame_order/cam/pseudo_ellipse2/frame_order_matrix
A test_suite/shared_data/frame_order/cam/pseudo_ellipse2/rdc_tb.txt
A test_suite/shared_data/frame_order/cam/pseudo_ellipse2/frame_order.py
A test_suite/shared_data/frame_order/cam/pseudo_ellipse2/rdc_er.txt
A test_suite/system_tests/scripts/frame_order/cam/pseudo_ellipse2.py
G test_suite/system_tests/frame_order.py
[edau@... relax-trunk]$ svn merge -r15367:15368 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15368 into '.':
U test_suite/shared_data/frame_order/cam/pseudo_ellipse2/rdc_dy.txt
U test_suite/shared_data/frame_order/cam/pseudo_ellipse2/rdc_tm.txt
U test_suite/shared_data/frame_order/cam/pseudo_ellipse2/pcs_tb.txt
U test_suite/shared_data/frame_order/cam/pseudo_ellipse2/pcs_er.txt
U test_suite/shared_data/frame_order/cam/pseudo_ellipse2/pcs_dy.txt
U test_suite/shared_data/frame_order/cam/pseudo_ellipse2/pcs_tm.txt
U test_suite/shared_data/frame_order/cam/pseudo_ellipse2/generate_distribution.log.bz2
U test_suite/shared_data/frame_order/cam/pseudo_ellipse2/frame_order_matrix
U test_suite/shared_data/frame_order/cam/pseudo_ellipse2/rdc_tb.txt
U test_suite/shared_data/frame_order/cam/pseudo_ellipse2/rdc_er.txt
[edau@... relax-trunk]$ svn merge -r15368:15369 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15369 into '.':
G test_suite/shared_data/frame_order/cam/opt_stats
[edau@... relax-trunk]$

Next block of the manual merger of the frame_order_testing branch.

The commands used were:
svn merge -r15350:15351 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15351:15352 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15352:15353 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15353:15354 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15354:15355 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15355:15356 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15356:15357 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15357:15358 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15358:15359 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15359:15360 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .

The console messages were:
[edau@... relax-trunk]$ svn merge -r15350:15351 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15351 into '.':
U test_suite/shared_data/frame_order/cam/opt_stats
[edau@... relax-trunk]$ svn merge -r15351:15352 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15352 into '.':
U extern/sobol/test.py
[edau@... relax-trunk]$ svn merge -r15352:15353 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15353 into '.':
U maths_fns/frame_order.py
[edau@... relax-trunk]$ svn merge -r15353:15354 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15354 into '.':
U test_suite/shared_data/frame_order/cam/rotor2/generate_distribution.py
U test_suite/shared_data/frame_order/cam/rotor2/rdc_dy.txt
U test_suite/shared_data/frame_order/cam/rotor2/rdc_tm.txt
U test_suite/shared_data/frame_order/cam/rotor2/pcs_tb.txt
U test_suite/shared_data/frame_order/cam/rotor2/pcs_er.txt
U test_suite/shared_data/frame_order/cam/rotor2/pcs_dy.txt
U test_suite/shared_data/frame_order/cam/rotor2/pcs_tm.txt
A test_suite/shared_data/frame_order/cam/rotor2/generate_distribution.log.bz2
A test_suite/shared_data/frame_order/cam/rotor2/axis_system
U test_suite/shared_data/frame_order/cam/rotor2/axis.pdb
A test_suite/shared_data/frame_order/cam/rotor2/frame_order_matrix
U test_suite/shared_data/frame_order/cam/rotor2/rdc_tb.txt
U test_suite/shared_data/frame_order/cam/rotor2/rdc_er.txt
D test_suite/shared_data/frame_order/cam/rotor2/generate_distribution.log
[edau@... relax-trunk]$ svn merge -r15354:15355 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15355 into '.':
G test_suite/shared_data/frame_order/cam/opt_stats
[edau@... relax-trunk]$ svn merge -r15355:15356 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15356 into '.':
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
U 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
[edau@... relax-trunk]$ svn merge -r15356:15357 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15357 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
U test_suite/shared_data/frame_order/cam/free_rotor/generate_distribution.log.bz2
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
[edau@... relax-trunk]$ svn merge -r15357:15358 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15358 into '.':
U test_suite/system_tests/scripts/frame_order/cam/rotor2.py
[edau@... relax-trunk]$ svn merge -r15358:15359 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15359 into '.':
U test_suite/system_tests/scripts/frame_order/cam/pseudo_ellipse_torsionless.py
[edau@... relax-trunk]$ svn merge -r15359:15360 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15360 into '.':
U test_suite/shared_data/frame_order/cam/rotor_2_state/generate_distribution.py
U test_suite/shared_data/frame_order/cam/rotor_2_state/rdc_dy.txt
U test_suite/shared_data/frame_order/cam/rotor_2_state/rdc_tm.txt
U test_suite/shared_data/frame_order/cam/rotor_2_state/pcs_tb.txt
U test_suite/shared_data/frame_order/cam/rotor_2_state/pcs_er.txt
U test_suite/shared_data/frame_order/cam/rotor_2_state/pcs_dy.txt
U test_suite/shared_data/frame_order/cam/rotor_2_state/pcs_tm.txt
A test_suite/shared_data/frame_order/cam/rotor_2_state/generate_distribution.log.bz2
A test_suite/shared_data/frame_order/cam/rotor_2_state/axis_system
U test_suite/shared_data/frame_order/cam/rotor_2_state/axis.pdb
A test_suite/shared_data/frame_order/cam/rotor_2_state/frame_order_matrix
U test_suite/shared_data/frame_order/cam/rotor_2_state/rdc_tb.txt
U test_suite/shared_data/frame_order/cam/rotor_2_state/rdc_er.txt
D test_suite/shared_data/frame_order/cam/rotor_2_state/generate_distribution.log
[edau@... relax-trunk]$

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