relax SVN archive

Next block of the manual merger of the frame_order_testing branch.

The commands used were:
svn merge -r18460:18461 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18466:18467 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18467:18468 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18468:18469 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18469:18470 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18472:18473 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18546:18547 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18547:18548 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .

The console messages were:
[edau@... relax-trunk]$ svn merge -r18460:18461 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18461 into '.':
U specific_fns/frame_order.py
[edau@... relax-trunk]$ svn merge -r18466:18467 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 r18467 into '.':
C generic_fns/structure/main.py
Summary of conflicts:
Text conflicts: 1
[edau@... relax-trunk]$ svn merge -r18467:18468 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18468 into '.':
G specific_fns/frame_order.py
[edau@... relax-trunk]$ svn merge -r18468:18469 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18469 into '.':
G specific_fns/frame_order.py
[edau@... relax-trunk]$ svn merge -r18469:18470 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18470 into '.':
U test_suite/shared_data/frame_order/cam/full_analysis.py
[edau@... relax-trunk]$ svn merge -r18472:18473 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18473 into '.':
U auto_analyses/frame_order.py
[edau@... relax-trunk]$ svn merge -r18546:18547 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 r18547 into '.':
C generic_fns/structure/main.py
Summary of conflicts:
Text conflicts: 1
[edau@... relax-trunk]$ svn merge -r18547:18548 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18548 into '.':
G specific_fns/frame_order.py
[edau@... relax-trunk]$

Next block of the manual merger of the frame_order_testing branch.

The commands used were:
svn merge -r18240:18241 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18387:18388 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18430:18431 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18432:18433 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18433:18434 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18435:18436 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18438:18439 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18439:18440 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .

The console messages were:
[edau@... relax-trunk]$ svn merge -r18240:18241 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18241 into '.':
U test_suite/system_tests/n_state_model.py
[edau@... relax-trunk]$ svn merge -r18387:18388 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18388 into '.':
U scons/manuals.py
[edau@... relax-trunk]$ svn merge -r18430:18431 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18431 into '.':
U auto_analyses/frame_order.py
[edau@... relax-trunk]$ svn merge -r18432:18433 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18433 into '.':
A test_suite/shared_data/frame_order/cam/free_rotor_missing_data
A test_suite/shared_data/frame_order/cam/free_rotor_missing_data/generate_distribution.py
A test_suite/shared_data/frame_order/cam/free_rotor_missing_data/frame_order.bz2
A test_suite/shared_data/frame_order/cam/free_rotor_missing_data/rdc_dy.txt
A test_suite/shared_data/frame_order/cam/free_rotor_missing_data/clean
A test_suite/shared_data/frame_order/cam/free_rotor_missing_data/tensors.py
A test_suite/shared_data/frame_order/cam/free_rotor_missing_data/pcs_dy_subset.txt
A test_suite/shared_data/frame_order/cam/free_rotor_missing_data/rdc_tm.txt
A test_suite/shared_data/frame_order/cam/free_rotor_missing_data/tensor_fit.log.bz2
A test_suite/shared_data/frame_order/cam/free_rotor_missing_data/pcs_tb.txt
A test_suite/shared_data/frame_order/cam/free_rotor_missing_data/cone.pdb
A test_suite/shared_data/frame_order/cam/free_rotor_missing_data/pcs_er.txt
A test_suite/shared_data/frame_order/cam/free_rotor_missing_data/full_analysis.py
A test_suite/shared_data/frame_order/cam/free_rotor_missing_data/pcs_dy.txt
A test_suite/shared_data/frame_order/cam/free_rotor_missing_data/ave_pos.pdb
A test_suite/shared_data/frame_order/cam/free_rotor_missing_data/subset_pcs.py
A test_suite/shared_data/frame_order/cam/free_rotor_missing_data/frame_order.log.bz2
A test_suite/shared_data/frame_order/cam/free_rotor_missing_data/distribution.pdb.gz
A test_suite/shared_data/frame_order/cam/free_rotor_missing_data/tensor_fit.py
A test_suite/shared_data/frame_order/cam/free_rotor_missing_data/generate_distribution.log.bz2
A test_suite/shared_data/frame_order/cam/free_rotor_missing_data/animate.py
A test_suite/shared_data/frame_order/cam/free_rotor_missing_data/axis_system
A test_suite/shared_data/frame_order/cam/free_rotor_missing_data/frame_order_matrix
A test_suite/shared_data/frame_order/cam/free_rotor_missing_data/rdc_tb.txt
A test_suite/shared_data/frame_order/cam/free_rotor_missing_data/frame_order.py
A test_suite/shared_data/frame_order/cam/free_rotor_missing_data/pcs_tb_subset.txt
A test_suite/shared_data/frame_order/cam/free_rotor_missing_data/back_calc.bz2
A test_suite/shared_data/frame_order/cam/free_rotor_missing_data/pcs_er_subset.txt
A test_suite/system_tests/scripts/frame_order/cam/free_rotor_missing_data.py
Conflict discovered in 'test_suite/system_tests/scripts/frame_order/cam/base_script.py'.
Select: (p) postpone, (df) diff-full, (e) edit,
(mc) mine-conflict, (tc) theirs-conflict,
(s) show all options: p
C test_suite/system_tests/scripts/frame_order/cam/base_script.py
U test_suite/system_tests/frame_order.py
Summary of conflicts:
Text conflicts: 1
[edau@... relax-trunk]$ svn merge -r18433:18434 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
Conflict discovered in 'test_suite/system_tests/scripts/frame_order/cam/base_script.py'.
Select: (p) postpone, (df) diff-full, (e) edit,
(mc) mine-conflict, (tc) theirs-conflict,
(s) show all options: p
--- Merging r18434 into '.':
C test_suite/system_tests/scripts/frame_order/cam/base_script.py
Summary of conflicts:
Text conflicts: 1
[edau@... relax-trunk]$ svn merge -r18435:18436 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18436 into '.':
U specific_fns/frame_order.py
[edau@... relax-trunk]$ svn merge -r18438:18439 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18439 into '.':
G test_suite/system_tests/frame_order.py
[edau@... relax-trunk]$ svn merge -r18439:18440 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18440 into '.':
G specific_fns/frame_order.py
[edau@... relax-trunk]$

Next block of the manual merger of the frame_order_testing branch.

The commands used were:
svn merge -r18161:18162 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18162:18163 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18207:18208 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18221:18222 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18222:18223 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18236:18237 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18237:18238 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18238:18239 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .

The console messages were:
[edau@... relax-trunk]$ svn merge -r18161:18162 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18162 into '.':
U generic_fns/selection.py
[edau@... relax-trunk]$ svn merge -r18162:18163 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18163 into '.':
G generic_fns/selection.py
[edau@... relax-trunk]$ svn merge -r18207:18208 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18208 into '.':
U user_functions/pcs.py
[edau@... relax-trunk]$ svn merge -r18221:18222 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18222 into '.':
G user_functions/pcs.py
[edau@... relax-trunk]$ svn merge -r18222:18223 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18223 into '.':
U user_functions/rdc.py
[edau@... relax-trunk]$ svn merge -r18236:18237 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 r18237 into '.':
C specific_fns/n_state_model.py
Summary of conflicts:
Text conflicts: 1
[edau@... relax-trunk]$ svn merge -r18237:18238 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 r18238 into '.':
C specific_fns/n_state_model.py
Summary of conflicts:
Text conflicts: 1
[edau@... relax-trunk]$ svn merge -r18238:18239 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18239 into '.':
U data/__init__.py
[edau@... relax-trunk]$

Next block of the manual merger of the frame_order_testing branch.

The commands used were:
svn merge -r18106:18107 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18119:18120 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18134:18135 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18138:18139 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18154:18155 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18155:18156 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18156:18157 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18157:18158 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18158:18159 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .

The console messages were:
[edau@... relax-trunk]$ svn merge -r18106:18107 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18107 into '.':
U generic_fns/align_tensor.py
[edau@... relax-trunk]$ svn merge -r18119:18120 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18120 into '.':
G generic_fns/align_tensor.py
[edau@... relax-trunk]$ svn merge -r18134:18135 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18135 into '.':
U test_suite/system_tests/scripts/n_state_model/paramag_align_fit.py
[edau@... relax-trunk]$ svn merge -r18138:18139 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18139 into '.':
A test_suite/system_tests/scripts/n_state_model/frame_order_align_fit.py
U test_suite/system_tests/n_state_model.py
[edau@... relax-trunk]$ svn merge -r18154:18155 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18155 into '.':
U test_suite/system_tests/selection.py
[edau@... relax-trunk]$ svn merge -r18155:18156 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18156 into '.':
U relax_errors.py
[edau@... relax-trunk]$ svn merge -r18156:18157 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18157 into '.':
U generic_fns/domain.py
[edau@... relax-trunk]$ svn merge -r18157:18158 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18158 into '.':
G test_suite/system_tests/selection.py
[edau@... relax-trunk]$ svn merge -r18158:18159 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
Conflict discovered in 'generic_fns/selection.py'.
Select: (p) postpone, (df) diff-full, (e) edit,
(mc) mine-conflict, (tc) theirs-conflict,
(s) show all options: p
--- Merging r18159 into '.':
C generic_fns/selection.py
U user_functions/select.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 -r18033:18034 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18035:18036 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18036:18037 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18037:18038 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18041:18042 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18070:18071 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18085:18086 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .

The console messages were:
[edau@... relax-trunk]$ svn merge -r18033:18034 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18034 into '.':
U specific_fns/frame_order.py
[edau@... relax-trunk]$ svn merge -r18035:18036 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18036 into '.':
G specific_fns/frame_order.py
[edau@... relax-trunk]$ svn merge -r18036:18037 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18037 into '.':
U test_suite/shared_data/frame_order/cam/pseudo_ellipse/frame_order.py
[edau@... relax-trunk]$ svn merge -r18037:18038 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18038 into '.':
A test_suite/shared_data/frame_order/cam/pseudo_ellipse_torsionless/full_analysis.py
A test_suite/shared_data/frame_order/cam/iso_cone_free_rotor/full_analysis.py
A test_suite/shared_data/frame_order/cam/rotor_2_state/full_analysis.py
A test_suite/shared_data/frame_order/cam/rotor2/full_analysis.py
A test_suite/shared_data/frame_order/cam/free_rotor2/full_analysis.py
A test_suite/shared_data/frame_order/cam/rigid/full_analysis.py
A test_suite/shared_data/frame_order/cam/iso_cone/full_analysis.py
A test_suite/shared_data/frame_order/cam/pseudo_ellipse2/full_analysis.py
A test_suite/shared_data/frame_order/cam/iso_cone_torsionless/full_analysis.py
A test_suite/shared_data/frame_order/cam/pseudo_ellipse_free_rotor/full_analysis.py
A test_suite/shared_data/frame_order/cam/rotor/full_analysis.py
A test_suite/shared_data/frame_order/cam/iso_cone_free_rotor2/full_analysis.py
A test_suite/shared_data/frame_order/cam/free_rotor/full_analysis.py
A test_suite/shared_data/frame_order/cam/pseudo_ellipse/full_analysis.py
[edau@... relax-trunk]$ svn merge -r18041:18042 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18042 into '.':
U test_suite/system_tests/frame_order.py
[edau@... relax-trunk]$ svn merge -r18070:18071 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18071 into '.':
U test_suite/system_tests/align_tensor.py
[edau@... relax-trunk]$ svn merge -r18085:18086 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18086 into '.':
U auto_analyses/frame_order.py
[edau@... relax-trunk]$

Next block of the manual merger of the frame_order_testing branch.

The commands used were:
svn merge -r18020:18021 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18021:18022 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18022:18023 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18023:18024 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18024:18025 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18025:18026 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18026:18027 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18028:18029 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .

The console messages were:
[edau@... relax-trunk]$ svn merge -r18020:18021 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18021 into '.':
U auto_analyses/frame_order.py
[edau@... relax-trunk]$ svn merge -r18021:18022 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18022 into '.':
U specific_fns/frame_order.py
U user_functions/frame_order.py
[edau@... relax-trunk]$ svn merge -r18022:18023 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18023 into '.':
G auto_analyses/frame_order.py
[edau@... relax-trunk]$ svn merge -r18023:18024 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18024 into '.':
U test_suite/shared_data/frame_order/cam/full_analysis.py
[edau@... relax-trunk]$ svn merge -r18024:18025 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18025 into '.':
A test_suite/shared_data/frame_order/cam/rigid/clean
[edau@... relax-trunk]$ svn merge -r18025:18026 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18026 into '.':
U test_suite/shared_data/frame_order/cam/rigid/clean
[edau@... relax-trunk]$ svn merge -r18026:18027 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18027 into '.':
A test_suite/shared_data/frame_order/cam/pseudo_ellipse_torsionless/clean
A test_suite/shared_data/frame_order/cam/iso_cone_free_rotor/clean
A test_suite/shared_data/frame_order/cam/rotor_2_state/clean
A test_suite/shared_data/frame_order/cam/rotor2/clean
A test_suite/shared_data/frame_order/cam/free_rotor2/clean
A test_suite/shared_data/frame_order/cam/iso_cone/clean
A test_suite/shared_data/frame_order/cam/pseudo_ellipse2/clean
A test_suite/shared_data/frame_order/cam/iso_cone_torsionless/clean
A test_suite/shared_data/frame_order/cam/pseudo_ellipse_free_rotor/clean
A test_suite/shared_data/frame_order/cam/rotor/clean
A test_suite/shared_data/frame_order/cam/iso_cone_free_rotor2/clean
A test_suite/shared_data/frame_order/cam/free_rotor/clean
A test_suite/shared_data/frame_order/cam/pseudo_ellipse/clean
[edau@... relax-trunk]$ svn merge -r18028:18029 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18029 into '.':
A test_suite/shared_data/frame_order/cam/pseudo_ellipse_torsionless/subset_pcs.py
A test_suite/shared_data/frame_order/cam/iso_cone_free_rotor/pcs_dy_subset.txt
A test_suite/shared_data/frame_order/cam/iso_cone_free_rotor/pcs_tm_subset.txt
A test_suite/shared_data/frame_order/cam/iso_cone_free_rotor/subset_pcs.py
A test_suite/shared_data/frame_order/cam/iso_cone_free_rotor/pcs_tb_subset.txt
A test_suite/shared_data/frame_order/cam/iso_cone_free_rotor/pcs_er_subset.txt
A test_suite/shared_data/frame_order/cam/rotor_2_state/pcs_dy_subset.txt
A test_suite/shared_data/frame_order/cam/rotor_2_state/pcs_tm_subset.txt
A test_suite/shared_data/frame_order/cam/rotor_2_state/subset_pcs.py
A test_suite/shared_data/frame_order/cam/rotor_2_state/pcs_tb_subset.txt
A test_suite/shared_data/frame_order/cam/rotor_2_state/pcs_er_subset.txt
A test_suite/shared_data/frame_order/cam/rotor2/pcs_dy_subset.txt
A test_suite/shared_data/frame_order/cam/rotor2/pcs_tm_subset.txt
A test_suite/shared_data/frame_order/cam/rotor2/subset_pcs.py
A test_suite/shared_data/frame_order/cam/rotor2/pcs_tb_subset.txt
A test_suite/shared_data/frame_order/cam/rotor2/pcs_er_subset.txt
A test_suite/shared_data/frame_order/cam/free_rotor2/pcs_dy_subset.txt
A test_suite/shared_data/frame_order/cam/free_rotor2/pcs_tm_subset.txt
A test_suite/shared_data/frame_order/cam/free_rotor2/subset_pcs.py
A test_suite/shared_data/frame_order/cam/free_rotor2/pcs_tb_subset.txt
A test_suite/shared_data/frame_order/cam/free_rotor2/pcs_er_subset.txt
A test_suite/shared_data/frame_order/cam/rigid/subset_pcs.py
A test_suite/shared_data/frame_order/cam/iso_cone/pcs_dy_subset.txt
A test_suite/shared_data/frame_order/cam/iso_cone/pcs_tm_subset.txt
A test_suite/shared_data/frame_order/cam/iso_cone/subset_pcs.py
A test_suite/shared_data/frame_order/cam/iso_cone/pcs_tb_subset.txt
A test_suite/shared_data/frame_order/cam/iso_cone/pcs_er_subset.txt
A test_suite/shared_data/frame_order/cam/pseudo_ellipse2/pcs_dy_subset.txt
A test_suite/shared_data/frame_order/cam/pseudo_ellipse2/pcs_tm_subset.txt
A test_suite/shared_data/frame_order/cam/pseudo_ellipse2/subset_pcs.py
A test_suite/shared_data/frame_order/cam/pseudo_ellipse2/pcs_tb_subset.txt
A test_suite/shared_data/frame_order/cam/pseudo_ellipse2/pcs_er_subset.txt
A test_suite/shared_data/frame_order/cam/subset_pcs.py
A test_suite/shared_data/frame_order/cam/iso_cone_torsionless/pcs_dy_subset.txt
A test_suite/shared_data/frame_order/cam/iso_cone_torsionless/pcs_tm_subset.txt
A test_suite/shared_data/frame_order/cam/iso_cone_torsionless/subset_pcs.py
A test_suite/shared_data/frame_order/cam/iso_cone_torsionless/pcs_tb_subset.txt
A test_suite/shared_data/frame_order/cam/iso_cone_torsionless/pcs_er_subset.txt
A test_suite/shared_data/frame_order/cam/pseudo_ellipse_free_rotor/subset_pcs.py
A test_suite/shared_data/frame_order/cam/rotor/pcs_dy_subset.txt
A test_suite/shared_data/frame_order/cam/rotor/pcs_tm_subset.txt
A test_suite/shared_data/frame_order/cam/rotor/subset_pcs.py
A test_suite/shared_data/frame_order/cam/rotor/pcs_tb_subset.txt
A test_suite/shared_data/frame_order/cam/rotor/pcs_er_subset.txt
A test_suite/shared_data/frame_order/cam/iso_cone_free_rotor2/pcs_dy_subset.txt
A test_suite/shared_data/frame_order/cam/iso_cone_free_rotor2/pcs_tm_subset.txt
A test_suite/shared_data/frame_order/cam/iso_cone_free_rotor2/subset_pcs.py
A test_suite/shared_data/frame_order/cam/iso_cone_free_rotor2/pcs_tb_subset.txt
A test_suite/shared_data/frame_order/cam/iso_cone_free_rotor2/pcs_er_subset.txt
A test_suite/shared_data/frame_order/cam/free_rotor/pcs_dy_subset.txt
A test_suite/shared_data/frame_order/cam/free_rotor/pcs_tm_subset.txt
A test_suite/shared_data/frame_order/cam/free_rotor/subset_pcs.py
A test_suite/shared_data/frame_order/cam/free_rotor/pcs_tb_subset.txt
A test_suite/shared_data/frame_order/cam/free_rotor/pcs_er_subset.txt
A test_suite/shared_data/frame_order/cam/pseudo_ellipse/subset_pcs.py
[edau@... relax-trunk]$

Next block of the manual merger of the frame_order_testing branch.

The commands used were:
svn merge -r18010:18011 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18011:18012 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18012:18013 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18013:18014 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18014:18015 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18015:18016 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18016:18017 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18017:18018 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18018:18019 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18019:18020 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .

The console messages were:
[edau@... relax-trunk]$ svn merge -r18010:18011 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18011 into '.':
U test_suite/shared_data/frame_order/cam/full_analysis.py
[edau@... relax-trunk]$ svn merge -r18011:18012 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18012 into '.':
A test_suite/shared_data/frame_order/cam/pseudo_ellipse_torsionless/pcs_dy_subset.txt
A test_suite/shared_data/frame_order/cam/pseudo_ellipse_torsionless/pcs_tm_subset.txt
A test_suite/shared_data/frame_order/cam/pseudo_ellipse_torsionless/pcs_tb_subset.txt
A test_suite/shared_data/frame_order/cam/pseudo_ellipse_torsionless/pcs_er_subset.txt
A test_suite/shared_data/frame_order/cam/rigid/pcs_dy_subset.txt
A test_suite/shared_data/frame_order/cam/rigid/pcs_tm_subset.txt
A test_suite/shared_data/frame_order/cam/rigid/pcs_tb_subset.txt
A test_suite/shared_data/frame_order/cam/rigid/pcs_er_subset.txt
A test_suite/shared_data/frame_order/cam/pseudo_ellipse_free_rotor/pcs_dy_subset.txt
A test_suite/shared_data/frame_order/cam/pseudo_ellipse_free_rotor/pcs_tm_subset.txt
A test_suite/shared_data/frame_order/cam/pseudo_ellipse_free_rotor/pcs_tb_subset.txt
A test_suite/shared_data/frame_order/cam/pseudo_ellipse_free_rotor/pcs_er_subset.txt
[edau@... relax-trunk]$ svn merge -r18012:18013 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18013 into '.':
U auto_analyses/frame_order.py
[edau@... relax-trunk]$ svn merge -r18013:18014 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18014 into '.':
U specific_fns/frame_order.py
[edau@... relax-trunk]$ svn merge -r18014:18015 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18015 into '.':
G test_suite/shared_data/frame_order/cam/full_analysis.py
[edau@... relax-trunk]$ svn merge -r18015:18016 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
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
--- Merging r18016 into '.':
C generic_fns/structure/api_base.py
Summary of conflicts:
Text conflicts: 1
[edau@... relax-trunk]$ svn merge -r18016:18017 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18017 into '.':
U generic_fns/molmol.py
U generic_fns/pymol_control.py
[edau@... relax-trunk]$ svn merge -r18017:18018 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18018 into '.':
G generic_fns/pymol_control.py
[edau@... relax-trunk]$ svn merge -r18018:18019 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 r18019 into '.':
C generic_fns/structure/internal.py
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
C generic_fns/structure/scientific.py
Summary of conflicts:
Text conflicts: 2
[edau@... relax-trunk]$ svn merge -r18019:18020 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18020 into '.':
G auto_analyses/frame_order.py
[edau@... relax-trunk]$

Next block of the manual merger of the frame_order_testing branch.

The commands used were:
svn merge -r18001:18002 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18002:18003 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18003:18004 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18004:18005 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18005:18006 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18006:18007 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18007:18008 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18008:18009 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18009:18010 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .

The console messages were:
[edau@... relax-trunk]$ svn merge -r18001:18002 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18002 into '.':
U specific_fns/frame_order.py
[edau@... relax-trunk]$ svn merge -r18002:18003 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18003 into '.':
G specific_fns/frame_order.py
[edau@... relax-trunk]$ svn merge -r18003:18004 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18004 into '.':
A test_suite/shared_data/frame_order/cam/full_analysis.py
[edau@... relax-trunk]$ svn merge -r18004:18005 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18005 into '.':
U auto_analyses/frame_order.py
[edau@... relax-trunk]$ svn merge -r18005:18006 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18006 into '.':
G auto_analyses/frame_order.py
[edau@... relax-trunk]$ svn merge -r18006:18007 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18007 into '.':
G auto_analyses/frame_order.py
[edau@... relax-trunk]$ svn merge -r18007:18008 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18008 into '.':
G auto_analyses/frame_order.py
[edau@... relax-trunk]$ svn merge -r18008:18009 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18009 into '.':
G auto_analyses/frame_order.py
[edau@... relax-trunk]$ svn merge -r18009:18010 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18010 into '.':
G auto_analyses/frame_order.py
[edau@... relax-trunk]$

Next block of the manual merger of the frame_order_testing branch.

The commands used were:
svn merge -r17990:17991 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r17991:17992 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r17992:17993 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r17995:17996 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .

The console messages were:
[edau@... relax-trunk]$ svn merge -r17990:17991 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r17991 into '.':
U specific_fns/frame_order.py
[edau@... relax-trunk]$ svn merge -r17991:17992 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r17992 into '.':
G specific_fns/frame_order.py
[edau@... relax-trunk]$ svn merge -r17992:17993 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r17993 into '.':
G specific_fns/frame_order.py
[edau@... relax-trunk]$ svn merge -r17995:17996 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r17996 into '.':
U auto_analyses/frame_order.py
[edau@... relax-trunk]$

Next block of the manual merger of the frame_order_testing branch.

The commands used were:
svn merge -r17964:17965 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r17965:17966 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r17966:17967 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r17977:17978 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r17983:17984 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r17984:17985 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r17985:17986 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r17988:17989 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r17989:17990 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .

The console messages were:
[edau@... relax-trunk]$ svn merge -r17964:17965 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r17965 into '.':
U maths_fns/frame_order/__init__.py
U maths_fns/frame_order/matrix_ops.py
[edau@... relax-trunk]$ svn merge -r17965:17966 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r17966 into '.':
U maths_fns/frame_order/pseudo_ellipse.py
G maths_fns/frame_order/matrix_ops.py
[edau@... relax-trunk]$ svn merge -r17966:17967 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r17967 into '.':
G maths_fns/frame_order/pseudo_ellipse.py
G maths_fns/frame_order/__init__.py
[edau@... relax-trunk]$ svn merge -r17977:17978 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r17978 into '.':
U user_functions/rdc.py
U user_functions/pcs.py
[edau@... relax-trunk]$ svn merge -r17983:17984 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r17984 into '.':
U test_suite/shared_data/frame_order/cam/pseudo_ellipse/multi_processor_test.py
[edau@... relax-trunk]$ svn merge -r17984:17985 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r17985 into '.':
U auto_analyses/frame_order.py
[edau@... relax-trunk]$ svn merge -r17985:17986 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 r17986 into '.':
C specific_fns/frame_order.py
G auto_analyses/frame_order.py
Summary of conflicts:
Text conflicts: 1
[edau@... relax-trunk]$ svn merge -r17988:17989 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r17989 into '.':
G specific_fns/frame_order.py
[edau@... relax-trunk]$ svn merge -r17989:17990 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r17990 into '.':
G auto_analyses/frame_order.py
[edau@... relax-trunk]$