relax SVN archive

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

Next block of the manual merger of the frame_order_testing branch.

The commands used were:
svn merge -r17310:17311 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r17311:17312 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r17312:17313 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r17313:17314 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r17314:17315 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r17315:17316 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r17316:17317 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r17317:17318 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r17318:17319 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r17319:17320 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .

The console messages were:
[edau@... relax-trunk]$ svn merge -r17310:17311 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r17311 into '.':
U data/align_tensor.py
[edau@... relax-trunk]$ svn merge -r17311:17312 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r17312 into '.':
U generic_fns/align_tensor.py
[edau@... relax-trunk]$ svn merge -r17312:17313 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r17313 into '.':
U sample_scripts/n_state_model/two_domain.py
[edau@... relax-trunk]$ svn merge -r17313:17314 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r17314 into '.':
U test_suite/system_tests/scripts/n_state_model/A_to_chi.py
U test_suite/system_tests/scripts/n_state_model/5_state_xz.py
U test_suite/system_tests/align_tensor.py
[edau@... relax-trunk]$ svn merge -r17314:17315 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r17315 into '.':
G generic_fns/align_tensor.py
[edau@... relax-trunk]$ svn merge -r17315:17316 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
Conflict discovered in 'user_functions/rdc.py'.
Select: (p) postpone, (df) diff-full, (e) edit,
(mc) mine-conflict, (tc) theirs-conflict,
(s) show all options: p
--- Merging r17316 into '.':
C user_functions/rdc.py
Conflict discovered in 'user_functions/pcs.py'.
Select: (p) postpone, (df) diff-full, (e) edit,
(mc) mine-conflict, (tc) theirs-conflict,
(s) show all options: p
C user_functions/pcs.py
Summary of conflicts:
Text conflicts: 2
[edau@... relax-trunk]$ svn merge -r17316:17317 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r17317 into '.':
U user_functions/align_tensor.py
[edau@... relax-trunk]$ svn merge -r17317:17318 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r17318 into '.':
U test_suite/unit_tests/_prompt/test_align_tensor.py
U test_suite/unit_tests/align_tensor_testing_base.py
[edau@... relax-trunk]$ svn merge -r17318:17319 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r17319 into '.':
U test_suite/shared_data/frame_order/cam/pseudo_ellipse_torsionless/frame_order.py
U test_suite/shared_data/frame_order/cam/iso_cone_free_rotor/frame_order.py
U test_suite/shared_data/frame_order/cam/rotor_2_state/frame_order.py
U test_suite/shared_data/frame_order/cam/rotor2/frame_order.py
U test_suite/shared_data/frame_order/cam/free_rotor2/frame_order.py
U test_suite/shared_data/frame_order/cam/rigid/frame_order.py
U test_suite/shared_data/frame_order/cam/iso_cone/frame_order.py
U test_suite/shared_data/frame_order/cam/pseudo_ellipse2/frame_order.py
U test_suite/shared_data/frame_order/cam/pseudo_ellipse_free_rotor/frame_order.py
U test_suite/shared_data/frame_order/cam/iso_cone_torsionless/frame_order.py
U test_suite/shared_data/frame_order/cam/rotor/frame_order.py
U test_suite/shared_data/frame_order/cam/iso_cone_free_rotor2/frame_order.py
U test_suite/shared_data/frame_order/cam/free_rotor/frame_order.py
U test_suite/shared_data/frame_order/cam/pseudo_ellipse/frame_order.py
[edau@... relax-trunk]$ svn merge -r17319:17320 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r17320 into '.':
U maths_fns/frame_order_matrix_ops.py
U 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 -r17300:17301 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r17301:17302 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r17302:17303 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r17303:17304 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r17304:17305 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r17305:17306 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r17306:17307 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r17307:17308 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r17308:17309 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r17309:17310 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .

The console messages were:
[edau@... relax-trunk]$ svn merge -r17300:17301 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
[edau@... relax-trunk]$ svn merge -r17301:17302 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r17302 into '.':
U test_suite/shared_data/frame_order/cam/opt_stats
[edau@... relax-trunk]$ svn merge -r17302:17303 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r17303 into '.':
G test_suite/shared_data/frame_order/cam/opt_stats
U test_suite/shared_data/frame_order/cam/free_rotor/frame_order.py
[edau@... relax-trunk]$ svn merge -r17303:17304 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r17304 into '.':
G test_suite/shared_data/frame_order/cam/opt_stats
U test_suite/shared_data/frame_order/cam/rotor2/frame_order.py
U test_suite/shared_data/frame_order/cam/rotor/frame_order.py
[edau@... relax-trunk]$ svn merge -r17304:17305 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r17305 into '.':
G test_suite/shared_data/frame_order/cam/opt_stats
[edau@... relax-trunk]$ svn merge -r17305:17306 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r17306 into '.':
U test_suite/system_tests/frame_order.py
[edau@... relax-trunk]$ svn merge -r17306:17307 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r17307 into '.':
G test_suite/shared_data/frame_order/cam/opt_stats
[edau@... relax-trunk]$ svn merge -r17307:17308 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r17308 into '.':
U test_suite/shared_data/frame_order/cam/generate_base.py
[edau@... relax-trunk]$ svn merge -r17308:17309 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r17309 into '.':
U test_suite/system_tests/scripts/n_state_model/5_state_xz.py
[edau@... relax-trunk]$ svn merge -r17309:17310 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r17310 into '.':
U generic_fns/align_tensor.py
U user_functions/align_tensor.py
[edau@... relax-trunk]$

Next block of the manual merger of the frame_order_testing branch.

The commands used were:
svn merge -r17290:17291 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r17291:17292 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r17292:17293 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r17293:17294 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r17295:17296 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r17296:17297 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r17297:17298 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r17298:17299 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r17299:17300 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .

The console messages were:
[edau@... relax-trunk]$ svn merge -r17290:17291 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r17291 into '.':
U maths_fns/frame_order.py
[edau@... relax-trunk]$ svn merge -r17291:17292 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r17292 into '.':
U specific_fns/frame_order.py
U user_functions/frame_order.py
[edau@... relax-trunk]$ svn merge -r17292:17293 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r17293 into '.':
G specific_fns/frame_order.py
G user_functions/frame_order.py
[edau@... relax-trunk]$ svn merge -r17293:17294 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r17294 into '.':
G specific_fns/frame_order.py
[edau@... relax-trunk]$ svn merge -r17295:17296 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 r17296 into '.':
C specific_fns/frame_order.py
Summary of conflicts:
Text conflicts: 1
[edau@... relax-trunk]$ svn merge -r17296:17297 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r17297 into '.':
G specific_fns/frame_order.py
[edau@... relax-trunk]$ svn merge -r17297:17298 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r17298 into '.':
G specific_fns/frame_order.py
[edau@... relax-trunk]$ svn merge -r17298:17299 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r17299 into '.':
G specific_fns/frame_order.py
[edau@... relax-trunk]$ svn merge -r17299:17300 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r17300 into '.':
U test_suite/shared_data/frame_order/cam/pseudo_ellipse_torsionless/frame_order.py
U test_suite/shared_data/frame_order/cam/iso_cone_free_rotor/frame_order.py
U test_suite/shared_data/frame_order/cam/rotor_2_state/frame_order.py
U test_suite/shared_data/frame_order/cam/rotor2/frame_order.py
U test_suite/shared_data/frame_order/cam/free_rotor2/frame_order.py
U test_suite/shared_data/frame_order/cam/rigid/frame_order.py
U test_suite/shared_data/frame_order/cam/iso_cone/frame_order.py
U test_suite/shared_data/frame_order/cam/pseudo_ellipse2/frame_order.py
U test_suite/shared_data/frame_order/cam/pseudo_ellipse_free_rotor/frame_order.py
U test_suite/shared_data/frame_order/cam/iso_cone_torsionless/frame_order.py
U test_suite/shared_data/frame_order/cam/rotor/frame_order.py
U test_suite/shared_data/frame_order/cam/iso_cone_free_rotor2/frame_order.py
U test_suite/shared_data/frame_order/cam/free_rotor/frame_order.py
U test_suite/shared_data/frame_order/cam/pseudo_ellipse/frame_order.py
[edau@... relax-trunk]$

Next block of the manual merger of the frame_order_testing branch.

The commands used were:
svn merge -r17280:17281 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r17281:17282 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r17282:17283 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r17283:17284 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r17284:17285 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r17285:17286 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r17286:17287 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r17287:17288 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r17288:17289 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r17289:17290 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .

The console messages were:
[edau@... relax-trunk]$ svn merge -r17280:17281 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r17281 into '.':
U maths_fns/frame_order.py
U specific_fns/frame_order.py
[edau@... relax-trunk]$ svn merge -r17281:17282 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r17282 into '.':
G maths_fns/frame_order.py
[edau@... relax-trunk]$ svn merge -r17282:17283 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r17283 into '.':
U test_suite/shared_data/frame_order/cam/pseudo_ellipse_torsionless/tensor_fit.py
U test_suite/shared_data/frame_order/cam/pseudo_ellipse_torsionless/frame_order.py
U test_suite/shared_data/frame_order/cam/iso_cone_free_rotor/tensor_fit.py
U test_suite/shared_data/frame_order/cam/iso_cone_free_rotor/frame_order.py
U test_suite/shared_data/frame_order/cam/rotor_2_state/tensor_fit.py
U test_suite/shared_data/frame_order/cam/rotor2/tensor_fit.py
U test_suite/shared_data/frame_order/cam/rotor2/frame_order.py
U test_suite/shared_data/frame_order/cam/free_rotor2/tensor_fit.py
U test_suite/shared_data/frame_order/cam/free_rotor2/frame_order.py
U test_suite/shared_data/frame_order/cam/rigid/tensor_fit.py
U test_suite/shared_data/frame_order/cam/rigid/frame_order.py
U test_suite/shared_data/frame_order/cam/iso_cone/tensor_fit.py
U test_suite/shared_data/frame_order/cam/iso_cone/frame_order.py
U test_suite/shared_data/frame_order/cam/pseudo_ellipse2/tensor_fit.py
U test_suite/shared_data/frame_order/cam/pseudo_ellipse2/frame_order.py
U test_suite/shared_data/frame_order/cam/pseudo_ellipse_free_rotor/tensor_fit.py
U test_suite/shared_data/frame_order/cam/pseudo_ellipse_free_rotor/frame_order_pseudo_ellipse.py
U test_suite/shared_data/frame_order/cam/pseudo_ellipse_free_rotor/frame_order.py
U test_suite/shared_data/frame_order/cam/iso_cone_torsionless/tensor_fit.py
U test_suite/shared_data/frame_order/cam/iso_cone_torsionless/frame_order.py
U test_suite/shared_data/frame_order/cam/rotor/tensor_fit.py
U test_suite/shared_data/frame_order/cam/rotor/frame_order.py
U test_suite/shared_data/frame_order/cam/iso_cone_free_rotor2/tensor_fit.py
U test_suite/shared_data/frame_order/cam/iso_cone_free_rotor2/frame_order.py
U test_suite/shared_data/frame_order/cam/free_rotor/tensor_fit.py
U test_suite/shared_data/frame_order/cam/free_rotor/frame_order.py
U test_suite/shared_data/frame_order/cam/pseudo_ellipse/tensor_fit.py
U test_suite/shared_data/frame_order/cam/pseudo_ellipse/frame_order.py
[edau@... relax-trunk]$ svn merge -r17283:17284 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r17284 into '.':
G maths_fns/frame_order.py
[edau@... relax-trunk]$ svn merge -r17284:17285 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r17285 into '.':
G maths_fns/frame_order.py
[edau@... relax-trunk]$ svn merge -r17285:17286 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r17286 into '.':
G maths_fns/frame_order.py
[edau@... relax-trunk]$ svn merge -r17286:17287 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r17287 into '.':
U test_suite/shared_data/frame_order/cam/generate_base.py
[edau@... relax-trunk]$ svn merge -r17287:17288 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r17288 into '.':
G test_suite/shared_data/frame_order/cam/pseudo_ellipse_torsionless/frame_order.py
G test_suite/shared_data/frame_order/cam/iso_cone_free_rotor/frame_order.py
G test_suite/shared_data/frame_order/cam/rotor2/frame_order.py
G test_suite/shared_data/frame_order/cam/free_rotor2/frame_order.py
G test_suite/shared_data/frame_order/cam/rigid/frame_order.py
G test_suite/shared_data/frame_order/cam/iso_cone/frame_order.py
G test_suite/shared_data/frame_order/cam/pseudo_ellipse2/frame_order.py
G test_suite/shared_data/frame_order/cam/pseudo_ellipse_free_rotor/frame_order_pseudo_ellipse.py
G test_suite/shared_data/frame_order/cam/pseudo_ellipse_free_rotor/frame_order.py
G test_suite/shared_data/frame_order/cam/iso_cone_torsionless/frame_order.py
G test_suite/shared_data/frame_order/cam/rotor/frame_order.py
G test_suite/shared_data/frame_order/cam/iso_cone_free_rotor2/frame_order.py
G test_suite/shared_data/frame_order/cam/free_rotor/frame_order.py
G test_suite/shared_data/frame_order/cam/pseudo_ellipse/frame_order.py
[edau@... relax-trunk]$ svn merge -r17288:17289 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r17289 into '.':
G test_suite/shared_data/frame_order/cam/pseudo_ellipse_torsionless/frame_order.py
G test_suite/shared_data/frame_order/cam/iso_cone_free_rotor/frame_order.py
G test_suite/shared_data/frame_order/cam/rotor2/frame_order.py
G test_suite/shared_data/frame_order/cam/free_rotor2/frame_order.py
G test_suite/shared_data/frame_order/cam/iso_cone/frame_order.py
G test_suite/shared_data/frame_order/cam/pseudo_ellipse2/frame_order.py
G test_suite/shared_data/frame_order/cam/pseudo_ellipse_free_rotor/frame_order_pseudo_ellipse.py
G test_suite/shared_data/frame_order/cam/pseudo_ellipse_free_rotor/frame_order.py
G test_suite/shared_data/frame_order/cam/iso_cone_torsionless/frame_order.py
G test_suite/shared_data/frame_order/cam/rotor/frame_order.py
G test_suite/shared_data/frame_order/cam/iso_cone_free_rotor2/frame_order.py
G test_suite/shared_data/frame_order/cam/free_rotor/frame_order.py
G test_suite/shared_data/frame_order/cam/pseudo_ellipse/frame_order.py
[edau@... relax-trunk]$ svn merge -r17289:17290 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r17290 into '.':
G test_suite/shared_data/frame_order/cam/iso_cone_free_rotor2/frame_order.py
[edau@... relax-trunk]$