relax SVN archive

Next block of the manual merger of the frame_order_testing branch.

The commands used were:
svn merge -r15150:15151 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15151:15152 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15152:15153 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15153:15154 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15154:15155 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15155:15156 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15156:15157 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15157:15158 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15158:15159 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15159:15160 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .

The console messages were:
[edau@... relax-trunk]$ svn merge -r15150:15151 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15151 into '.':
U test_suite/shared_data/frame_order/pseudo_ellipse_torsionless/frame_order.bz2
U test_suite/shared_data/frame_order/pseudo_ellipse_torsionless/rdc_dy.txt
U test_suite/shared_data/frame_order/pseudo_ellipse_torsionless/tensors.py
U test_suite/shared_data/frame_order/pseudo_ellipse_torsionless/rdc_tm.txt
U test_suite/shared_data/frame_order/pseudo_ellipse_torsionless/tensor_fit.log.bz2
U test_suite/shared_data/frame_order/pseudo_ellipse_torsionless/cone.pdb
U test_suite/shared_data/frame_order/pseudo_ellipse_torsionless/pcs_tb.txt
U test_suite/shared_data/frame_order/pseudo_ellipse_torsionless/pcs_er.txt
U test_suite/shared_data/frame_order/pseudo_ellipse_torsionless/README
U test_suite/shared_data/frame_order/pseudo_ellipse_torsionless/pcs_dy.txt
U test_suite/shared_data/frame_order/pseudo_ellipse_torsionless/ave_pos.pdb
U test_suite/shared_data/frame_order/pseudo_ellipse_torsionless/frame_order.log.bz2
U test_suite/shared_data/frame_order/pseudo_ellipse_torsionless/pcs_tm.txt
U test_suite/shared_data/frame_order/pseudo_ellipse_torsionless/rdc_tb.txt
U test_suite/shared_data/frame_order/pseudo_ellipse_torsionless/frame_order.py
U test_suite/shared_data/frame_order/pseudo_ellipse_torsionless/rdc_er.txt
[edau@... relax-trunk]$ svn merge -r15151:15152 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15152 into '.':
U test_suite/shared_data/frame_order/iso_cone_free_rotor/README
U test_suite/shared_data/frame_order/rotor_2_state/README
U test_suite/shared_data/frame_order/rotor2/README
U test_suite/shared_data/frame_order/free_rotor2/README
U test_suite/shared_data/frame_order/iso_cone/README
U test_suite/shared_data/frame_order/rotor/README
U test_suite/shared_data/frame_order/iso_cone_free_rotor2/README
A test_suite/shared_data/frame_order/free_rotor/README
[edau@... relax-trunk]$ svn merge -r15152:15153 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15153 into '.':
U maths_fns/frame_order_matrix_ops.py
[edau@... relax-trunk]$ svn merge -r15153:15154 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15154 into '.':
U maths_fns/frame_order.py
[edau@... relax-trunk]$ svn merge -r15154:15155 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15155 into '.':
G maths_fns/frame_order_matrix_ops.py
[edau@... relax-trunk]$ svn merge -r15155:15156 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15156 into '.':
U test_suite/shared_data/frame_order/rotor2/frame_order.py
U test_suite/shared_data/frame_order/rigid/frame_order.py
U test_suite/shared_data/frame_order/rotor/frame_order.py
U test_suite/shared_data/frame_order/iso_cone_free_rotor2/frame_order.py
U test_suite/shared_data/frame_order/free_rotor/frame_order.py
[edau@... relax-trunk]$ svn merge -r15156:15157 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15157 into '.':
G test_suite/shared_data/frame_order/pseudo_ellipse_torsionless/frame_order.py
U test_suite/shared_data/frame_order/iso_cone_free_rotor/frame_order.py
G test_suite/shared_data/frame_order/rotor2/frame_order.py
U test_suite/shared_data/frame_order/free_rotor2/frame_order.py
U test_suite/shared_data/frame_order/iso_cone/frame_order.py
G test_suite/shared_data/frame_order/rigid/frame_order.py
U test_suite/shared_data/frame_order/pseudo_ellipse_free_rotor/frame_order.py
G test_suite/shared_data/frame_order/rotor/frame_order.py
G test_suite/shared_data/frame_order/iso_cone_free_rotor2/frame_order.py
G test_suite/shared_data/frame_order/free_rotor/frame_order.py
U test_suite/shared_data/frame_order/pseudo_ellipse/frame_order.py
[edau@... relax-trunk]$ svn merge -r15157:15158 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15158 into '.':
U extern/__init__.py
A extern/sobol
A extern/sobol/sobol_lib-not_tested.py
A extern/sobol/sobol_test.py
A extern/sobol/__init__.py
A extern/sobol/sobol_lib.py
A extern/sobol/sobol_test_output.txt
[edau@... relax-trunk]$ svn merge -r15158:15159 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15159 into '.':
A test_suite/shared_data/frame_order/iso_cone_torsionless
A test_suite/shared_data/frame_order/iso_cone_torsionless/generate_distribution.py
A test_suite/shared_data/frame_order/iso_cone_torsionless/frame_order.bz2
A test_suite/shared_data/frame_order/iso_cone_torsionless/rdc_dy.txt
A test_suite/shared_data/frame_order/iso_cone_torsionless/tensors.py
A test_suite/shared_data/frame_order/iso_cone_torsionless/rdc_tm.txt
A test_suite/shared_data/frame_order/iso_cone_torsionless/tensor_fit.log.bz2
A test_suite/shared_data/frame_order/iso_cone_torsionless/cone.pdb
A test_suite/shared_data/frame_order/iso_cone_torsionless/pcs_tb.txt
A test_suite/shared_data/frame_order/iso_cone_torsionless/pcs_er.txt
A test_suite/shared_data/frame_order/iso_cone_torsionless/README
A test_suite/shared_data/frame_order/iso_cone_torsionless/pcs_dy.txt
A test_suite/shared_data/frame_order/iso_cone_torsionless/ave_pos.pdb
A test_suite/shared_data/frame_order/iso_cone_torsionless/frame_order.log.bz2
A test_suite/shared_data/frame_order/iso_cone_torsionless/tensor_fit.py
A test_suite/shared_data/frame_order/iso_cone_torsionless/pcs_tm.txt
A test_suite/shared_data/frame_order/iso_cone_torsionless/generate_distribution.log.bz2
A test_suite/shared_data/frame_order/iso_cone_torsionless/animate.py
A test_suite/shared_data/frame_order/iso_cone_torsionless/axis.pdb
A test_suite/shared_data/frame_order/iso_cone_torsionless/back_calc.py
A test_suite/shared_data/frame_order/iso_cone_torsionless/rdc_tb.txt
A test_suite/shared_data/frame_order/iso_cone_torsionless/frame_order.py
A test_suite/shared_data/frame_order/iso_cone_torsionless/rdc_er.txt
[edau@... relax-trunk]$ svn merge -r15159:15160 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15160 into '.':
G maths_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 -r15140:15141 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15141:15142 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15142:15143 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15143:15144 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15144:15145 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15145:15146 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15146:15147 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15147:15148 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15148:15149 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15149:15150 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .

The console messages were:
[edau@... relax-trunk]$ svn merge -r15140:15141 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
Conflict discovered in 'test_suite/system_tests/scripts/n_state_model/metal_pos_opt.py'.
Select: (p) postpone, (df) diff-full, (e) edit,
(mc) mine-conflict, (tc) theirs-conflict,
(s) show all options: p
--- Merging r15141 into '.':
C test_suite/system_tests/scripts/n_state_model/metal_pos_opt.py
Conflict discovered in 'test_suite/system_tests/scripts/n_state_model/populations.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/n_state_model/populations.py
Conflict discovered in 'test_suite/system_tests/scripts/n_state_model/pcs_to_rdc.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/n_state_model/pcs_to_rdc.py
U test_suite/system_tests/scripts/n_state_model/5_state_xz.py
Conflict discovered in 'test_suite/system_tests/scripts/n_state_model/pcs_back_calc.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/n_state_model/pcs_back_calc.py
Summary of conflicts:
Text conflicts: 4
[edau@... relax-trunk]$ svn merge -r15141:15142 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15142 into '.':
A test_suite/shared_data/frame_order/pseudo_ellipse_torsionless
A test_suite/shared_data/frame_order/pseudo_ellipse_torsionless/generate_distribution.py
A test_suite/shared_data/frame_order/pseudo_ellipse_torsionless/frame_order.bz2
A test_suite/shared_data/frame_order/pseudo_ellipse_torsionless/rdc_dy.txt
A test_suite/shared_data/frame_order/pseudo_ellipse_torsionless/tensors.py
A test_suite/shared_data/frame_order/pseudo_ellipse_torsionless/rdc_tm.txt
A test_suite/shared_data/frame_order/pseudo_ellipse_torsionless/tensor_fit.log.bz2
A test_suite/shared_data/frame_order/pseudo_ellipse_torsionless/cone.pdb
A test_suite/shared_data/frame_order/pseudo_ellipse_torsionless/pcs_tb.txt
A test_suite/shared_data/frame_order/pseudo_ellipse_torsionless/pcs_er.txt
A test_suite/shared_data/frame_order/pseudo_ellipse_torsionless/README
A test_suite/shared_data/frame_order/pseudo_ellipse_torsionless/pcs_dy.txt
A test_suite/shared_data/frame_order/pseudo_ellipse_torsionless/ave_pos.pdb
A test_suite/shared_data/frame_order/pseudo_ellipse_torsionless/frame_order.log.bz2
A test_suite/shared_data/frame_order/pseudo_ellipse_torsionless/tensor_fit.py
A test_suite/shared_data/frame_order/pseudo_ellipse_torsionless/pcs_tm.txt
A test_suite/shared_data/frame_order/pseudo_ellipse_torsionless/generate_distribution.log.bz2
A test_suite/shared_data/frame_order/pseudo_ellipse_torsionless/animate.py
A test_suite/shared_data/frame_order/pseudo_ellipse_torsionless/axis.pdb
A test_suite/shared_data/frame_order/pseudo_ellipse_torsionless/back_calc.py
A test_suite/shared_data/frame_order/pseudo_ellipse_torsionless/rdc_tb.txt
A test_suite/shared_data/frame_order/pseudo_ellipse_torsionless/frame_order.py
A test_suite/shared_data/frame_order/pseudo_ellipse_torsionless/rdc_er.txt
[edau@... relax-trunk]$ svn merge -r15142:15143 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15143 into '.':
A test_suite/shared_data/frame_order/pseudo_ellipse_free_rotor
A test_suite/shared_data/frame_order/pseudo_ellipse_free_rotor/generate_distribution.py
A test_suite/shared_data/frame_order/pseudo_ellipse_free_rotor/frame_order.bz2
A test_suite/shared_data/frame_order/pseudo_ellipse_free_rotor/rdc_dy.txt
A test_suite/shared_data/frame_order/pseudo_ellipse_free_rotor/tensors.py
A test_suite/shared_data/frame_order/pseudo_ellipse_free_rotor/rdc_tm.txt
A test_suite/shared_data/frame_order/pseudo_ellipse_free_rotor/tensor_fit.log.bz2
A test_suite/shared_data/frame_order/pseudo_ellipse_free_rotor/cone.pdb
A test_suite/shared_data/frame_order/pseudo_ellipse_free_rotor/pcs_tb.txt
A test_suite/shared_data/frame_order/pseudo_ellipse_free_rotor/pcs_er.txt
A test_suite/shared_data/frame_order/pseudo_ellipse_free_rotor/README
A test_suite/shared_data/frame_order/pseudo_ellipse_free_rotor/pcs_dy.txt
A test_suite/shared_data/frame_order/pseudo_ellipse_free_rotor/ave_pos.pdb
A test_suite/shared_data/frame_order/pseudo_ellipse_free_rotor/frame_order.log.bz2
A test_suite/shared_data/frame_order/pseudo_ellipse_free_rotor/tensor_fit.py
A test_suite/shared_data/frame_order/pseudo_ellipse_free_rotor/pcs_tm.txt
A test_suite/shared_data/frame_order/pseudo_ellipse_free_rotor/generate_distribution.log.bz2
A test_suite/shared_data/frame_order/pseudo_ellipse_free_rotor/animate.py
A test_suite/shared_data/frame_order/pseudo_ellipse_free_rotor/axis.pdb
A test_suite/shared_data/frame_order/pseudo_ellipse_free_rotor/back_calc.py
A test_suite/shared_data/frame_order/pseudo_ellipse_free_rotor/rdc_tb.txt
A test_suite/shared_data/frame_order/pseudo_ellipse_free_rotor/frame_order.py
A test_suite/shared_data/frame_order/pseudo_ellipse_free_rotor/rdc_er.txt
[edau@... relax-trunk]$ svn merge -r15143:15144 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15144 into '.':
A test_suite/shared_data/frame_order/pseudo_ellipse_free_rotor/frame_order_matrix.log
A test_suite/shared_data/frame_order/pseudo_ellipse_free_rotor/frame_order_matrix.py
A test_suite/shared_data/frame_order/pseudo_ellipse_free_rotor/rotation_matrices.py
[edau@... relax-trunk]$ svn merge -r15144:15145 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15145 into '.':
U test_suite/shared_data/frame_order/pseudo_ellipse_free_rotor/rdc_dy.txt
U test_suite/shared_data/frame_order/pseudo_ellipse_free_rotor/rdc_tm.txt
U test_suite/shared_data/frame_order/pseudo_ellipse_free_rotor/rdc_tb.txt
U test_suite/shared_data/frame_order/pseudo_ellipse_free_rotor/rdc_er.txt
[edau@... relax-trunk]$ svn merge -r15145:15146 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15146 into '.':
U maths_fns/frame_order_matrix_ops.py
[edau@... relax-trunk]$ svn merge -r15146:15147 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15147 into '.':
U test_suite/shared_data/frame_order/pseudo_ellipse_free_rotor/frame_order.bz2
U test_suite/shared_data/frame_order/pseudo_ellipse_free_rotor/tensors.py
U test_suite/shared_data/frame_order/pseudo_ellipse_free_rotor/tensor_fit.log.bz2
U test_suite/shared_data/frame_order/pseudo_ellipse_free_rotor/cone.pdb
U test_suite/shared_data/frame_order/pseudo_ellipse_free_rotor/ave_pos.pdb
U test_suite/shared_data/frame_order/pseudo_ellipse_free_rotor/frame_order.log.bz2
U test_suite/shared_data/frame_order/pseudo_ellipse_free_rotor/frame_order.py
[edau@... relax-trunk]$ svn merge -r15147:15148 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15148 into '.':
U test_suite/shared_data/frame_order/pseudo_ellipse/frame_order.bz2
U test_suite/shared_data/frame_order/pseudo_ellipse/cone.pdb
U test_suite/shared_data/frame_order/pseudo_ellipse/README
U test_suite/shared_data/frame_order/pseudo_ellipse/ave_pos.pdb
U test_suite/shared_data/frame_order/pseudo_ellipse/frame_order.log.bz2
[edau@... relax-trunk]$ svn merge -r15148:15149 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15149 into '.':
G maths_fns/frame_order_matrix_ops.py
U maths_fns/frame_order.py
[edau@... relax-trunk]$ svn merge -r15149:15150 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15150 into '.':
A test_suite/shared_data/frame_order/pseudo_ellipse_free_rotor/cone_pseudo_ellipse.pdb
A test_suite/shared_data/frame_order/pseudo_ellipse_free_rotor/ave_pos_pseudo_ellipse.pdb
U test_suite/shared_data/frame_order/pseudo_ellipse_free_rotor/README
A test_suite/shared_data/frame_order/pseudo_ellipse_free_rotor/frame_order_pseudo_ellipse.log.bz2
A test_suite/shared_data/frame_order/pseudo_ellipse_free_rotor/frame_order_pseudo_ellipse.py
A test_suite/shared_data/frame_order/pseudo_ellipse_free_rotor/frame_order_pseudo_ellipse.bz2
[edau@... relax-trunk]$

Next block of the manual merger of the frame_order_testing branch.

The commands used were:
svn merge -r15130:15131 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15131:15132 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15132:15133 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15133:15134 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15134:15135 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15135:15136 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15136:15137 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15137:15138 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15138:15139 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15139:15140 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .

The console messages were:
[edau@... relax-trunk]$ svn merge -r15130:15131 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
Conflict discovered in 'test_suite/system_tests/align_tensor.py'.
Select: (p) postpone, (df) diff-full, (e) edit,
(mc) mine-conflict, (tc) theirs-conflict,
(s) show all options: p
--- Merging r15131 into '.':
C test_suite/system_tests/align_tensor.py
Summary of conflicts:
Text conflicts: 1
[edau@... relax-trunk]$ svn merge -r15131:15132 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15132 into '.':
U generic_fns/structure/mass.py
[edau@... relax-trunk]$ svn merge -r15132:15133 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
Conflict discovered in 'test_suite/unit_tests/_generic_fns/_structure/test_scientific.py'.
Select: (p) postpone, (df) diff-full, (e) edit,
(mc) mine-conflict, (tc) theirs-conflict,
(s) show all options: p
--- Merging r15133 into '.':
C test_suite/unit_tests/_generic_fns/_structure/test_scientific.py
Summary of conflicts:
Text conflicts: 1
[edau@... relax-trunk]$ svn merge -r15133:15134 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
Conflict discovered in 'generic_fns/structure/internal.py'.
Select: (p) postpone, (df) diff-full, (e) edit,
(mc) mine-conflict, (tc) theirs-conflict,
(s) show all options: p
--- Merging r15134 into '.':
C generic_fns/structure/internal.py
U generic_fns/structure/scientific.py
Conflict discovered in 'generic_fns/structure/api_base.py'.
Select: (p) postpone, (df) diff-full, (e) edit,
(mc) mine-conflict, (tc) theirs-conflict,
(s) show all options: p
C generic_fns/structure/api_base.py
Summary of conflicts:
Text conflicts: 2
[edau@... relax-trunk]$ svn merge -r15134:15135 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
Conflict discovered in 'generic_fns/structure/main.py'.
Select: (p) postpone, (df) diff-full, (e) edit,
(mc) mine-conflict, (tc) theirs-conflict,
(s) show all options: p
--- Merging r15135 into '.':
C generic_fns/structure/main.py
Summary of conflicts:
Text conflicts: 1
[edau@... relax-trunk]$ svn merge -r15135:15136 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15136 into '.':
G generic_fns/structure/main.py
[edau@... relax-trunk]$ svn merge -r15136:15137 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
Conflict discovered in 'specific_fns/n_state_model.py'.
Select: (p) postpone, (df) diff-full, (e) edit,
(mc) mine-conflict, (tc) theirs-conflict,
(s) show all options: p
--- Merging r15137 into '.':
C specific_fns/n_state_model.py
Summary of conflicts:
Text conflicts: 1
[edau@... relax-trunk]$ svn merge -r15137:15138 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
Conflict discovered in 'specific_fns/n_state_model.py'.
Select: (p) postpone, (df) diff-full, (e) edit,
(mc) mine-conflict, (tc) theirs-conflict,
(s) show all options: p
--- Merging r15138 into '.':
C specific_fns/n_state_model.py
Summary of conflicts:
Text conflicts: 1
[edau@... relax-trunk]$ svn merge -r15138:15139 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
Conflict discovered in 'specific_fns/n_state_model.py'.
Select: (p) postpone, (df) diff-full, (e) edit,
(mc) mine-conflict, (tc) theirs-conflict,
(s) show all options: p
--- Merging r15139 into '.':
C specific_fns/n_state_model.py
Summary of conflicts:
Text conflicts: 1
[edau@... relax-trunk]$ svn merge -r15139:15140 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15140 into '.':
C prompt/align_tensor.py
Summary of conflicts:
Tree conflicts: 1
[edau@... relax-trunk]$

Next block of the manual merger of the frame_order_testing branch.

The commands used were:
svn merge -r15120:15121 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15121:15122 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15122:15123 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15123:15124 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15124:15125 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15125:15126 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15126:15127 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15127:15128 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15128:15129 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15129:15130 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .

The console messages were:
[edau@... relax-trunk]$ svn merge -r15120:15121 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
Conflict discovered in 'generic_fns/structure/scientific.py'.
Select: (p) postpone, (df) diff-full, (e) edit,
(mc) mine-conflict, (tc) theirs-conflict,
(s) show all options: p
--- Merging r15121 into '.':
C generic_fns/structure/scientific.py
Conflict discovered in 'generic_fns/structure/api_base.py'.
Select: (p) postpone, (df) diff-full, (e) edit,
(mc) mine-conflict, (tc) theirs-conflict,
(s) show all options: p
C generic_fns/structure/api_base.py
Summary of conflicts:
Text conflicts: 2
[edau@... relax-trunk]$ svn merge -r15121:15122 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15122 into '.':
U specific_fns/frame_order.py
[edau@... relax-trunk]$ svn merge -r15122:15123 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
Conflict discovered in 'generic_fns/align_tensor.py'.
Select: (p) postpone, (df) diff-full, (e) edit,
(mc) mine-conflict, (tc) theirs-conflict,
(s) show all options: p
--- Merging r15123 into '.':
C generic_fns/align_tensor.py
Summary of conflicts:
Text conflicts: 1
[edau@... relax-trunk]$ svn merge -r15123:15124 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
Conflict discovered in 'test_suite/unit_tests/_generic_fns/_structure/test_internal.py'.
Select: (p) postpone, (df) diff-full, (e) edit,
(mc) mine-conflict, (tc) theirs-conflict,
(s) show all options: p
--- Merging r15124 into '.':
C test_suite/unit_tests/_generic_fns/_structure/test_internal.py
Conflict discovered in 'test_suite/unit_tests/_generic_fns/_structure/test_scientific.py'.
Select: (p) postpone, (df) diff-full, (e) edit,
(mc) mine-conflict, (tc) theirs-conflict,
(s) show all options: p
C test_suite/unit_tests/_generic_fns/_structure/test_scientific.py
Summary of conflicts:
Text conflicts: 2
[edau@... relax-trunk]$ svn merge -r15124:15125 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
Conflict discovered in 'generic_fns/structure/main.py'.
Select: (p) postpone, (df) diff-full, (e) edit,
(mc) mine-conflict, (tc) theirs-conflict,
(s) show all options: p
--- Merging r15125 into '.':
C generic_fns/structure/main.py
Summary of conflicts:
Text conflicts: 1
[edau@... relax-trunk]$ svn merge -r15125:15126 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15126 into '.':
G generic_fns/align_tensor.py
[edau@... relax-trunk]$ svn merge -r15126:15127 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15127 into '.':
G test_suite/unit_tests/_generic_fns/_structure/test_internal.py
[edau@... relax-trunk]$ svn merge -r15127:15128 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15128 into '.':
U test_suite/unit_tests/_maths_fns/test_frame_order_matrix_ops.py
[edau@... relax-trunk]$ svn merge -r15128:15129 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
Conflict discovered in 'generic_fns/structure/scientific.py'.
Select: (p) postpone, (df) diff-full, (e) edit,
(mc) mine-conflict, (tc) theirs-conflict,
(s) show all options: p
--- Merging r15129 into '.':
C generic_fns/structure/scientific.py
Summary of conflicts:
Text conflicts: 1
[edau@... relax-trunk]$ svn merge -r15129:15130 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15130 into '.':
U prompt/domain.py
[edau@... relax-trunk]$

Next block of the manual merger of the frame_order_testing branch.

The commands used were:
svn merge -r15110:15111 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15111:15112 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15112:15113 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15113:15114 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15114:15115 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15115:15116 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15116:15117 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15117:15118 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15118:15119 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15119:15120 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .

The console messages were:
[edau@... relax-trunk]$ svn merge -r15110:15111 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15111 into '.':
U maths_fns/frame_order.py
[edau@... relax-trunk]$ svn merge -r15111:15112 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
Conflict discovered in 'specific_fns/frame_order.py'.
Select: (p) postpone, (df) diff-full, (e) edit,
(mc) mine-conflict, (tc) theirs-conflict,
(s) show all options: p
--- Merging r15112 into '.':
C specific_fns/frame_order.py
Summary of conflicts:
Text conflicts: 1
[edau@... relax-trunk]$ svn merge -r15112:15113 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15113 into '.':
U generic_fns/pymol_control.py
[edau@... relax-trunk]$ svn merge -r15113:15114 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
Conflict discovered in 'specific_fns/frame_order.py'.
Select: (p) postpone, (df) diff-full, (e) edit,
(mc) mine-conflict, (tc) theirs-conflict,
(s) show all options: p
--- Merging r15114 into '.':
C specific_fns/frame_order.py
Summary of conflicts:
Text conflicts: 1
[edau@... relax-trunk]$ svn merge -r15114:15115 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15115 into '.':
U test_suite/shared_data/frame_order/pseudo_ellipse/frame_order.bz2
U test_suite/shared_data/frame_order/pseudo_ellipse/cone.pdb
U test_suite/shared_data/frame_order/pseudo_ellipse/ave_pos.pdb
U test_suite/shared_data/frame_order/pseudo_ellipse/frame_order.log.bz2
U test_suite/shared_data/frame_order/pseudo_ellipse/frame_order.py
[edau@... relax-trunk]$ svn merge -r15115:15116 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15116 into '.':
U test_suite/shared_data/frame_order/pseudo_ellipse/tensors.py
U test_suite/shared_data/frame_order/pseudo_ellipse/tensor_fit.log.bz2
[edau@... relax-trunk]$ svn merge -r15116:15117 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
Conflict discovered in 'generic_fns/structure/internal.py'.
Select: (p) postpone, (df) diff-full, (e) edit,
(mc) mine-conflict, (tc) theirs-conflict,
(s) show all options: p
--- Merging r15117 into '.':
C generic_fns/structure/internal.py
Summary of conflicts:
Text conflicts: 1
[edau@... relax-trunk]$ svn merge -r15117:15118 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
Conflict discovered in 'generic_fns/structure/main.py'.
Select: (p) postpone, (df) diff-full, (e) edit,
(mc) mine-conflict, (tc) theirs-conflict,
(s) show all options: p
--- Merging r15118 into '.':
C generic_fns/structure/main.py
Summary of conflicts:
Text conflicts: 1
[edau@... relax-trunk]$ svn merge -r15118:15119 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15119 into '.':
G generic_fns/structure/internal.py
[edau@... relax-trunk]$ svn merge -r15119:15120 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
Conflict discovered in 'prompt/__init__.py'.
Select: (p) postpone, (df) diff-full, (e) edit,
(mc) mine-conflict, (tc) theirs-conflict,
(s) show all options: p
--- Merging r15120 into '.':
C prompt/__init__.py
U auto_analyses/__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 -r15100:15101 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15101:15102 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15102:15103 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15103:15104 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15104:15105 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15105:15106 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15106:15107 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15107:15108 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15108:15109 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15109:15110 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .

The console messages were:
[edau@... relax-trunk]$ svn merge -r15100:15101 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15101 into '.':
U test_suite/shared_data/frame_order/iso_cone/frame_order.bz2
U test_suite/shared_data/frame_order/iso_cone/rdc_dy.txt
U test_suite/shared_data/frame_order/iso_cone/tensors.py
U test_suite/shared_data/frame_order/iso_cone/rdc_tm.txt
U test_suite/shared_data/frame_order/iso_cone/tensor_fit.log.bz2
U test_suite/shared_data/frame_order/iso_cone/cone.pdb
U test_suite/shared_data/frame_order/iso_cone/pcs_tb.txt
U test_suite/shared_data/frame_order/iso_cone/pcs_er.txt
U test_suite/shared_data/frame_order/iso_cone/pcs_dy.txt
U test_suite/shared_data/frame_order/iso_cone/ave_pos.pdb
U test_suite/shared_data/frame_order/iso_cone/pcs_tm.txt
U test_suite/shared_data/frame_order/iso_cone/animate.py
U test_suite/shared_data/frame_order/iso_cone/rdc_tb.txt
U test_suite/shared_data/frame_order/iso_cone/frame_order.py
U test_suite/shared_data/frame_order/iso_cone/rdc_er.txt
[edau@... relax-trunk]$ svn merge -r15101:15102 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15102 into '.':
U relax.py
[edau@... relax-trunk]$ svn merge -r15102:15103 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15103 into '.':
U dep_check.py
[edau@... relax-trunk]$ svn merge -r15103:15104 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15104 into '.':
U maths_fns/frame_order_matrix_ops.py
U maths_fns/frame_order.py
[edau@... relax-trunk]$ svn merge -r15104:15105 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15105 into '.':
G maths_fns/frame_order_matrix_ops.py
G maths_fns/frame_order.py
[edau@... relax-trunk]$ svn merge -r15105:15106 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15106 into '.':
G maths_fns/frame_order.py
[edau@... relax-trunk]$ svn merge -r15106:15107 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15107 into '.':
U specific_fns/frame_order.py
[edau@... relax-trunk]$ svn merge -r15107:15108 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15108 into '.':
A test_suite/shared_data/frame_order/pseudo_ellipse
A test_suite/shared_data/frame_order/pseudo_ellipse/generate_distribution.py
A test_suite/shared_data/frame_order/pseudo_ellipse/frame_order.bz2
A test_suite/shared_data/frame_order/pseudo_ellipse/rdc_dy.txt
A test_suite/shared_data/frame_order/pseudo_ellipse/tensors.py
A test_suite/shared_data/frame_order/pseudo_ellipse/rdc_tm.txt
A test_suite/shared_data/frame_order/pseudo_ellipse/tensor_fit.log.bz2
A test_suite/shared_data/frame_order/pseudo_ellipse/cone.pdb
A test_suite/shared_data/frame_order/pseudo_ellipse/pcs_tb.txt
A test_suite/shared_data/frame_order/pseudo_ellipse/pcs_er.txt
A test_suite/shared_data/frame_order/pseudo_ellipse/README
A test_suite/shared_data/frame_order/pseudo_ellipse/pcs_dy.txt
A test_suite/shared_data/frame_order/pseudo_ellipse/ave_pos.pdb
A test_suite/shared_data/frame_order/pseudo_ellipse/frame_order.log.bz2
A test_suite/shared_data/frame_order/pseudo_ellipse/tensor_fit.py
A test_suite/shared_data/frame_order/pseudo_ellipse/pcs_tm.txt
A test_suite/shared_data/frame_order/pseudo_ellipse/generate_distribution.log.bz2
A test_suite/shared_data/frame_order/pseudo_ellipse/animate.py
A test_suite/shared_data/frame_order/pseudo_ellipse/axis.pdb
A test_suite/shared_data/frame_order/pseudo_ellipse/back_calc.py
A test_suite/shared_data/frame_order/pseudo_ellipse/rdc_tb.txt
A test_suite/shared_data/frame_order/pseudo_ellipse/frame_order.py
A test_suite/shared_data/frame_order/pseudo_ellipse/rdc_er.txt
[edau@... relax-trunk]$ svn merge -r15108:15109 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15109 into '.':
G maths_fns/frame_order.py
[edau@... relax-trunk]$ svn merge -r15109:15110 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15110 into '.':
G maths_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 -r15090:15091 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15091:15092 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15092:15093 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15093:15094 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15094:15095 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15095:15096 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15096:15097 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15097:15098 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15098:15099 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15099:15100 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .

The console messages were:
[edau@... relax-trunk]$ svn merge -r15090:15091 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15091 into '.':
U maths_fns/frame_order.py
[edau@... relax-trunk]$ svn merge -r15091:15092 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15092 into '.':
U maths_fns/frame_order_matrix_ops.py
G maths_fns/frame_order.py
[edau@... relax-trunk]$ svn merge -r15092:15093 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15093 into '.':
G maths_fns/frame_order_matrix_ops.py
G maths_fns/frame_order.py
[edau@... relax-trunk]$ svn merge -r15093:15094 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15094 into '.':
G maths_fns/frame_order_matrix_ops.py
[edau@... relax-trunk]$ svn merge -r15094:15095 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15095 into '.':
G maths_fns/frame_order_matrix_ops.py
G maths_fns/frame_order.py
[edau@... relax-trunk]$ svn merge -r15095:15096 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15096 into '.':
U test_suite/shared_data/frame_order/iso_cone_free_rotor/back_calc.py
U test_suite/shared_data/frame_order/rotor_2_state/back_calc.py
U test_suite/shared_data/frame_order/rotor2/back_calc.py
U test_suite/shared_data/frame_order/free_rotor2/back_calc.py
U test_suite/shared_data/frame_order/iso_cone/back_calc.py
U test_suite/shared_data/frame_order/rigid/back_calc.py
U test_suite/shared_data/frame_order/rotor/back_calc.py
U test_suite/shared_data/frame_order/iso_cone_free_rotor2/back_calc.py
U test_suite/shared_data/frame_order/free_rotor/back_calc.py
[edau@... relax-trunk]$ svn merge -r15096:15097 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15097 into '.':
G maths_fns/frame_order.py
[edau@... relax-trunk]$ svn merge -r15097:15098 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15098 into '.':
G maths_fns/frame_order.py
Conflict discovered in 'specific_fns/frame_order.py'.
Select: (p) postpone, (df) diff-full, (e) edit,
(mc) mine-conflict, (tc) theirs-conflict,
(s) show all options: p
C specific_fns/frame_order.py
Summary of conflicts:
Text conflicts: 1
[edau@... relax-trunk]$ svn merge -r15098:15099 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15099 into '.':
G specific_fns/frame_order.py
[edau@... relax-trunk]$ svn merge -r15099:15100 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15100 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 -r15080:15081 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15081:15082 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15082:15083 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15083:15084 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15084:15085 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15085:15086 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15086:15087 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15087:15088 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15088:15089 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15089:15090 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .

The console messages were:
[edau@... relax-trunk]$ svn merge -r15080:15081 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15081 into '.':
U specific_fns/frame_order.py
[edau@... relax-trunk]$ svn merge -r15081:15082 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15082 into '.':
U test_suite/shared_data/frame_order/rotor/frame_order.bz2
U test_suite/shared_data/frame_order/rotor/cone.pdb
U test_suite/shared_data/frame_order/rotor/ave_pos.pdb
U test_suite/shared_data/frame_order/rotor/frame_order.log.bz2
U test_suite/shared_data/frame_order/rotor/frame_order.py
[edau@... relax-trunk]$ svn merge -r15082:15083 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15083 into '.':
U test_suite/shared_data/frame_order/rotor2/frame_order.bz2
U test_suite/shared_data/frame_order/rotor2/ave_pos.pdb
U test_suite/shared_data/frame_order/rotor2/cone.pdb.gz
U test_suite/shared_data/frame_order/rotor2/frame_order.py
[edau@... relax-trunk]$ svn merge -r15083:15084 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15084 into '.':
U maths_fns/frame_order_matrix_ops.py
U maths_fns/frame_order.py
[edau@... relax-trunk]$ svn merge -r15084:15085 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15085 into '.':
U test_suite/shared_data/frame_order/free_rotor/frame_order.bz2
U test_suite/shared_data/frame_order/free_rotor/cone.pdb
U test_suite/shared_data/frame_order/free_rotor/ave_pos.pdb
U test_suite/shared_data/frame_order/free_rotor/frame_order.log.bz2
U test_suite/shared_data/frame_order/free_rotor/frame_order.py
[edau@... relax-trunk]$ svn merge -r15085:15086 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15086 into '.':
U test_suite/shared_data/frame_order/free_rotor2/frame_order.bz2
U test_suite/shared_data/frame_order/free_rotor2/cone.pdb
U test_suite/shared_data/frame_order/free_rotor2/ave_pos.pdb
U test_suite/shared_data/frame_order/free_rotor2/frame_order.log.bz2
U test_suite/shared_data/frame_order/free_rotor2/frame_order.py
[edau@... relax-trunk]$ svn merge -r15086:15087 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15087 into '.':
U test_suite/shared_data/frame_order/iso_cone_free_rotor/frame_order.py
[edau@... relax-trunk]$ svn merge -r15087:15088 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15088 into '.':
G maths_fns/frame_order_matrix_ops.py
G maths_fns/frame_order.py
[edau@... relax-trunk]$ svn merge -r15088:15089 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15089 into '.':
A test_suite/shared_data/frame_order/iso_cone
A test_suite/shared_data/frame_order/iso_cone/generate_distribution.py
A test_suite/shared_data/frame_order/iso_cone/frame_order.bz2
A test_suite/shared_data/frame_order/iso_cone/rdc_dy.txt
A test_suite/shared_data/frame_order/iso_cone/tensors.py
A test_suite/shared_data/frame_order/iso_cone/rdc_tm.txt
A test_suite/shared_data/frame_order/iso_cone/tensor_fit.log.bz2
A test_suite/shared_data/frame_order/iso_cone/cone.pdb
A test_suite/shared_data/frame_order/iso_cone/pcs_tb.txt
A test_suite/shared_data/frame_order/iso_cone/pcs_er.txt
A test_suite/shared_data/frame_order/iso_cone/README
A test_suite/shared_data/frame_order/iso_cone/pcs_dy.txt
A test_suite/shared_data/frame_order/iso_cone/ave_pos.pdb
A test_suite/shared_data/frame_order/iso_cone/frame_order.log.bz2
A test_suite/shared_data/frame_order/iso_cone/tensor_fit.py
A test_suite/shared_data/frame_order/iso_cone/pcs_tm.txt
A test_suite/shared_data/frame_order/iso_cone/generate_distribution.log.bz2
A test_suite/shared_data/frame_order/iso_cone/animate.py
A test_suite/shared_data/frame_order/iso_cone/axis.pdb
A test_suite/shared_data/frame_order/iso_cone/back_calc.py
A test_suite/shared_data/frame_order/iso_cone/rdc_tb.txt
A test_suite/shared_data/frame_order/iso_cone/frame_order.py
A test_suite/shared_data/frame_order/iso_cone/rdc_er.txt
[edau@... relax-trunk]$ svn merge -r15089:15090 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15090 into '.':
U test_suite/shared_data/frame_order/iso_cone_free_rotor2/frame_order.py
[edau@... relax-trunk]$

Next block of the manual merger of the frame_order_testing branch.

The commands used were:
svn merge -r15070:15071 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15071:15072 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15072:15073 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15073:15074 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15074:15075 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15075:15076 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15076:15077 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15077:15078 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15078:15079 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15079:15080 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .

The console messages were:
[edau@... relax-trunk]$ svn merge -r15070:15071 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15071 into '.':
U specific_fns/frame_order.py
[edau@... relax-trunk]$ svn merge -r15071:15072 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15072 into '.':
U maths_fns/frame_order.py
[edau@... relax-trunk]$ svn merge -r15072:15073 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15073 into '.':
U test_suite/shared_data/frame_order/rotor2/frame_order.py
[edau@... relax-trunk]$ svn merge -r15073:15074 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15074 into '.':
G specific_fns/frame_order.py
[edau@... relax-trunk]$ svn merge -r15074:15075 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15075 into '.':
G maths_fns/frame_order.py
[edau@... relax-trunk]$ svn merge -r15075:15076 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
Conflict discovered in 'specific_fns/frame_order.py'.
Select: (p) postpone, (df) diff-full, (e) edit,
(mc) mine-conflict, (tc) theirs-conflict,
(s) show all options: p
--- Merging r15076 into '.':
C specific_fns/frame_order.py
Summary of conflicts:
Text conflicts: 1
[edau@... relax-trunk]$ svn merge -r15076:15077 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15077 into '.':
G specific_fns/frame_order.py
[edau@... relax-trunk]$ svn merge -r15077:15078 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15078 into '.':
G specific_fns/frame_order.py
[edau@... relax-trunk]$ svn merge -r15078:15079 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15079 into '.':
G specific_fns/frame_order.py
[edau@... relax-trunk]$ svn merge -r15079:15080 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15080 into '.':
U test_suite/shared_data/frame_order/rigid/frame_order.bz2
U test_suite/shared_data/frame_order/rigid/ave_pos.pdb
A test_suite/shared_data/frame_order/rigid/frame_order.log.bz2
U test_suite/shared_data/frame_order/rigid/frame_order.py
[edau@... relax-trunk]$

Next block of the manual merger of the frame_order_testing branch.

The commands used were:
svn merge -r15060:15061 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15061:15062 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15062:15063 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15063:15064 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15064:15065 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15065:15066 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15066:15067 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15067:15068 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15068:15069 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15069:15070 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .

The console messages were:
[edau@... relax-trunk]$ svn merge -r15060:15061 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15061 into '.':
A test_suite/shared_data/frame_order/rotor2/pcs_only/ave_pos_back_calc.py
[edau@... relax-trunk]$ svn merge -r15061:15062 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15062 into '.':
A test_suite/shared_data/frame_order/rotor2/pcs_only/frame_order.py
[edau@... relax-trunk]$ svn merge -r15062:15063 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15063 into '.':
U test_suite/shared_data/frame_order/rotor2/pcs_only/frame_order.py
[edau@... relax-trunk]$ svn merge -r15063:15064 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15064 into '.':
A test_suite/shared_data/frame_order/rotor2/pcs_only/ave_pos.pdb
A test_suite/shared_data/frame_order/rotor2/pcs_only/frame_order.bz2
A test_suite/shared_data/frame_order/rotor2/pcs_only/frame_order.log.bz2
U test_suite/shared_data/frame_order/rotor2/pcs_only/ave_pos_back_calc.py
A test_suite/shared_data/frame_order/rotor2/pcs_only/cone.pdb
[edau@... relax-trunk]$ svn merge -r15064:15065 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15065 into '.':
G test_suite/shared_data/frame_order/rotor2/pcs_only/ave_pos_back_calc.py
[edau@... relax-trunk]$ svn merge -r15065:15066 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15066 into '.':
G test_suite/shared_data/frame_order/rotor2/pcs_only/ave_pos_back_calc.py
[edau@... relax-trunk]$ svn merge -r15066:15067 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
Conflict discovered in 'generic_fns/align_tensor.py'.
Select: (p) postpone, (df) diff-full, (e) edit,
(mc) mine-conflict, (tc) theirs-conflict,
(s) show all options: p
--- Merging r15067 into '.':
C generic_fns/align_tensor.py
Conflict discovered in 'generic_fns/rdc.py'.
Select: (p) postpone, (df) diff-full, (e) edit,
(mc) mine-conflict, (tc) theirs-conflict,
(s) show all options: p
C generic_fns/rdc.py
U generic_fns/pcs.py
Summary of conflicts:
Text conflicts: 2
[edau@... relax-trunk]$ svn merge -r15067:15068 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15068 into '.':
A test_suite/shared_data/frame_order/rotor2/pcs_only/ave_pos_pcs_tm.txt
G test_suite/shared_data/frame_order/rotor2/pcs_only/ave_pos_back_calc.py
A test_suite/shared_data/frame_order/rotor2/pcs_only/ave_pos_rdc_tb.txt
A test_suite/shared_data/frame_order/rotor2/pcs_only/ave_pos_rdc_er.txt
A test_suite/shared_data/frame_order/rotor2/pcs_only/ave_pos_back_calc.bz2
A test_suite/shared_data/frame_order/rotor2/pcs_only/rdc_comp.agr
A test_suite/shared_data/frame_order/rotor2/pcs_only/ave_pos_rdc_dy.txt
A test_suite/shared_data/frame_order/rotor2/pcs_only/ave_pos_rdc_tm.txt
A test_suite/shared_data/frame_order/rotor2/pcs_only/ave_pos_pcs_tb.txt
A test_suite/shared_data/frame_order/rotor2/pcs_only/ave_pos_pcs_er.txt
A test_suite/shared_data/frame_order/rotor2/pcs_only/ave_pos_pcs_dy.txt
A test_suite/shared_data/frame_order/rotor2/pcs_only/pcs_comp.agr
[edau@... relax-trunk]$ svn merge -r15068:15069 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15069 into '.':
U test_suite/shared_data/frame_order/rotor2/pcs_only/frame_order.bz2
A test_suite/shared_data/frame_order/rotor2/pcs_only/animate.py
G test_suite/shared_data/frame_order/rotor2/pcs_only/frame_order.py
[edau@... relax-trunk]$ svn merge -r15069:15070 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15070 into '.':
D test_suite/shared_data/frame_order/rotor2/frame_order_pcs_only.py