relax SVN archive

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

Next block of the manual merger of the frame_order_testing branch.

The commands used were:
svn merge -r17950:17951 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r17951:17952 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r17952:17953 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r17953:17954 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r17955:17956 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r17956:17957 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r17957:17958 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r17958:17959 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .

The console messages were:
[edau@... relax-trunk]$ svn merge -r17950:17951 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r17951 into '.':
U maths_fns/frame_order/matrix_ops.py
[edau@... relax-trunk]$ svn merge -r17951:17952 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r17952 into '.':
U maths_fns/frame_order/pseudo_ellipse.py
U maths_fns/frame_order/__init__.py
[edau@... relax-trunk]$ svn merge -r17952:17953 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r17953 into '.':
G maths_fns/frame_order/matrix_ops.py
[edau@... relax-trunk]$ svn merge -r17953:17954 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r17954 into '.':
G maths_fns/frame_order/__init__.py
G maths_fns/frame_order/matrix_ops.py
[edau@... relax-trunk]$ svn merge -r17955:17956 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r17956 into '.':
U test_suite/shared_data/frame_order/cam/pseudo_ellipse/multi_processor_test.py
A test_suite/shared_data/frame_order/cam/pseudo_ellipse/pcs_dy_subset.txt
A test_suite/shared_data/frame_order/cam/pseudo_ellipse/pcs_tm_subset.txt
A test_suite/shared_data/frame_order/cam/pseudo_ellipse/pcs_tb_subset.txt
A test_suite/shared_data/frame_order/cam/pseudo_ellipse/pcs_er_subset.txt
[edau@... relax-trunk]$ svn merge -r17956:17957 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r17957 into '.':
G maths_fns/frame_order/matrix_ops.py
[edau@... relax-trunk]$ svn merge -r17957:17958 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r17958 into '.':
G maths_fns/frame_order/pseudo_ellipse.py
[edau@... relax-trunk]$ svn merge -r17958:17959 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
Conflict discovered in 'auto_analyses/dauvergne_protocol.py'.
Select: (p) postpone, (df) diff-full, (e) edit,
(mc) mine-conflict, (tc) theirs-conflict,
(s) show all options: p
--- Merging r17959 into '.':
C auto_analyses/dauvergne_protocol.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 -r17866:17867 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r17867:17868 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r17896:17897 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r17917:17918 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r17929:17930 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r17935:17936 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r17942:17943 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r17949:17950 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .

The console messages were:
[edau@... relax-trunk]$ svn merge -r17866:17867 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r17867 into '.':
U test_suite/system_tests/frame_order.py
[edau@... relax-trunk]$ svn merge -r17867:17868 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 r17868 into '.':
C specific_fns/frame_order.py
Summary of conflicts:
Text conflicts: 1
[edau@... relax-trunk]$ svn merge -r17896:17897 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 r17897 into '.':
C specific_fns/frame_order.py
\Summary of conflicts:
Text conflicts: 1
[edau@... relax-trunk]$ svn merge -r17917:17918 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r17918 into '.':
A test_suite/shared_data/frame_order/cam/pseudo_ellipse_torsionless/back_calc.bz2
A test_suite/shared_data/frame_order/cam/iso_cone_free_rotor/back_calc.bz2
A test_suite/shared_data/frame_order/cam/rotor2/back_calc.bz2
A test_suite/shared_data/frame_order/cam/free_rotor2/back_calc.bz2
A test_suite/shared_data/frame_order/cam/iso_cone/back_calc.bz2
A test_suite/shared_data/frame_order/cam/pseudo_ellipse2/back_calc.bz2
A test_suite/shared_data/frame_order/cam/pseudo_ellipse_free_rotor/back_calc.bz2
A test_suite/shared_data/frame_order/cam/iso_cone_torsionless/back_calc.bz2
A test_suite/shared_data/frame_order/cam/rotor/back_calc.bz2
A test_suite/shared_data/frame_order/cam/iso_cone_free_rotor2/back_calc.bz2
A test_suite/shared_data/frame_order/cam/free_rotor/back_calc.bz2
A test_suite/shared_data/frame_order/cam/pseudo_ellipse/back_calc.bz2
[edau@... relax-trunk]$ svn merge -r17929:17930 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r17930 into '.':
A test_suite/shared_data/frame_order/cam/pseudo_ellipse/multi_processor_test.py
[edau@... relax-trunk]$ svn merge -r17935:17936 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r17936 into '.':
U test_suite/shared_data/frame_order/cam/pseudo_ellipse/multi_processor_test.py
[edau@... relax-trunk]$ svn merge -r17942:17943 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r17943 into '.':
U maths_fns/frame_order/pseudo_ellipse.py
U maths_fns/frame_order/__init__.py
[edau@... relax-trunk]$ svn merge -r17949:17950 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r17950 into '.':
U 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 -r17330:17331 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r17847:17848 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r17848:17849 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r17849:17850 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r17850:17851 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r17851:17852 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r17852:17853 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r17853:17854 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r17854:17855 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r17858:17859 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .

The console messages were:
[edau@... relax-trunk]$ svn merge -r17330:17331 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r17331 into '.':
A test_suite/unit_tests/_maths_fns/_frame_order
A test_suite/unit_tests/_maths_fns/_frame_order/__init__.py
A test_suite/unit_tests/_maths_fns/_frame_order/test_matrix_ops.py
A test_suite/unit_tests/_maths_fns/_frame_order/test_pec.py
D test_suite/unit_tests/_maths_fns/test_frame_order_matrix_ops.py
D test_suite/unit_tests/_maths_fns/test_pseudo_ellipse.py
[edau@... relax-trunk]$ svn merge -r17847:17848 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r17848 into '.':
U maths_fns/frame_order/iso_cone.py
U maths_fns/frame_order/pseudo_ellipse_torsionless.py
U maths_fns/frame_order/iso_cone_torsionless.py
U maths_fns/frame_order/rotor.py
U specific_fns/frame_order.py
U extern/sobol/sobol_lib.py
[edau@... relax-trunk]$ svn merge -r17848:17849 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r17849 into '.':
U generic_fns/structure/api_base.py
[edau@... relax-trunk]$ svn merge -r17849:17850 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r17850 into '.':
U maths_fns/frame_order/__init__.py
U maths_fns/frame_order/matrix_ops.py
G maths_fns/frame_order/rotor.py
U generic_fns/structure/internal.py
U generic_fns/align_tensor.py
G specific_fns/frame_order.py
U extern/sobol/sobol_lib-not_tested.py
U extern/sobol/sobol_test.py
G extern/sobol/sobol_lib.py
[edau@... relax-trunk]$ svn merge -r17850:17851 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r17851 into '.':
G extern/sobol/sobol_lib-not_tested.py
G extern/sobol/sobol_test.py
G extern/sobol/sobol_lib.py
[edau@... relax-trunk]$ svn merge -r17851:17852 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r17852 into '.':
G generic_fns/align_tensor.py
[edau@... relax-trunk]$ svn merge -r17852:17853 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
[edau@... relax-trunk]$ svn merge -r17853:17854 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r17854 into '.':
G specific_fns/frame_order.py
[edau@... relax-trunk]$ svn merge -r17854:17855 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r17855 into '.':
G specific_fns/frame_order.py
[edau@... relax-trunk]$ svn merge -r17858:17859 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
[edau@... relax-trunk]$

Next block of the manual merger of the frame_order_testing branch.

The commands used were:
svn merge -r17320:17321 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r17321:17322 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r17322:17323 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r17323:17324 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r17324:17325 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r17325:17326 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r17326:17327 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r17327:17328 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r17328:17329 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r17329:17330 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .

The console messages were:
[edau@... relax-trunk]$ svn merge -r17320:17321 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r17321 into '.':
A maths_fns/frame_order
[edau@... relax-trunk]$ svn merge -r17321:17322 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r17322 into '.':
A maths_fns/frame_order/frame_order_matrix_ops.py
A maths_fns/frame_order/__init__.py
D maths_fns/frame_order_matrix_ops.py
C maths_fns/frame_order.py
Summary of conflicts:
Tree conflicts: 1
[edau@... relax-trunk]$ svn merge -r17322:17323 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r17323 into '.':
U maths_fns/frame_order/frame_order_matrix_ops.py
A maths_fns/frame_order/pseudo_ellipse.py
U maths_fns/frame_order/__init__.py
[edau@... relax-trunk]$ svn merge -r17323:17324 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r17324 into '.':
G maths_fns/frame_order/frame_order_matrix_ops.py
G maths_fns/frame_order/__init__.py
A maths_fns/frame_order/pseudo_ellipse_torsionless.py
A maths_fns/frame_order/pseudo_ellipse_free_rotor.py
[edau@... relax-trunk]$ svn merge -r17324:17325 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r17325 into '.':
G maths_fns/frame_order/frame_order_matrix_ops.py
A maths_fns/frame_order/iso_cone.py
G maths_fns/frame_order/__init__.py
A maths_fns/frame_order/iso_cone_torsionless.py
A maths_fns/frame_order/iso_cone_free_rotor.py
A maths_fns/frame_order/rotor.py
A maths_fns/frame_order/free_rotor.py
[edau@... relax-trunk]$ svn merge -r17325:17326 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r17326 into '.':
G maths_fns/frame_order/frame_order_matrix_ops.py
[edau@... relax-trunk]$ svn merge -r17326:17327 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r17327 into '.':
U maths_fns/frame_order/pseudo_ellipse.py
U maths_fns/frame_order/pseudo_ellipse_torsionless.py
U maths_fns/frame_order/pseudo_ellipse_free_rotor.py
A maths_fns/frame_order/pec.py
D maths_fns/pseudo_ellipse.py
[edau@... relax-trunk]$ svn merge -r17327:17328 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r17328 into '.':
G maths_fns/frame_order/pseudo_ellipse.py
U maths_fns/frame_order/iso_cone.py
G maths_fns/frame_order/__init__.py
G maths_fns/frame_order/pseudo_ellipse_torsionless.py
U maths_fns/frame_order/iso_cone_torsionless.py
G maths_fns/frame_order/pseudo_ellipse_free_rotor.py
U maths_fns/frame_order/iso_cone_free_rotor.py
A maths_fns/frame_order/matrix_ops.py
U maths_fns/frame_order/rotor.py
U maths_fns/frame_order/free_rotor.py
D maths_fns/frame_order/frame_order_matrix_ops.py
[edau@... relax-trunk]$ svn merge -r17328:17329 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r17329 into '.':
U maths_fns/__init__.py
[edau@... relax-trunk]$ svn merge -r17329:17330 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r17330 into '.':
G maths_fns/frame_order/rotor.py
[edau@... relax-trunk]$