Author: bugman
Date: Fri Mar 22 12:33:01 2013
New Revision: 18954
URL: http://svn.gna.org/viewcvs/relax?rev=18954&view=rev
Log:
Next block of the manual merger of the frame_order_testing branch.
The commands used were:
svn merge -r15140:15141
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r15141:15142
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r15142:15143
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r15143:15144
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r15144:15145
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r15145:15146
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r15146:15147
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r15147:15148
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r15148:15149
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r15149:15150
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
The console messages were:
[edau@localhost relax-trunk]$ svn merge -r15140:15141
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
Conflict discovered in
'test_suite/system_tests/scripts/n_state_model/metal_pos_opt.py'.
Select: (p) postpone, (df) diff-full, (e) edit,
(mc) mine-conflict, (tc) theirs-conflict,
(s) show all options: p
--- Merging r15141 into '.':
C test_suite/system_tests/scripts/n_state_model/metal_pos_opt.py
Conflict discovered in
'test_suite/system_tests/scripts/n_state_model/populations.py'.
Select: (p) postpone, (df) diff-full, (e) edit,
(mc) mine-conflict, (tc) theirs-conflict,
(s) show all options: p
C test_suite/system_tests/scripts/n_state_model/populations.py
Conflict discovered in
'test_suite/system_tests/scripts/n_state_model/pcs_to_rdc.py'.
Select: (p) postpone, (df) diff-full, (e) edit,
(mc) mine-conflict, (tc) theirs-conflict,
(s) show all options: p
C test_suite/system_tests/scripts/n_state_model/pcs_to_rdc.py
U test_suite/system_tests/scripts/n_state_model/5_state_xz.py
Conflict discovered in
'test_suite/system_tests/scripts/n_state_model/pcs_back_calc.py'.
Select: (p) postpone, (df) diff-full, (e) edit,
(mc) mine-conflict, (tc) theirs-conflict,
(s) show all options: p
C test_suite/system_tests/scripts/n_state_model/pcs_back_calc.py
Summary of conflicts:
Text conflicts: 4
[edau@localhost relax-trunk]$ svn merge -r15141:15142
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r15142 into '.':
A test_suite/shared_data/frame_order/pseudo_ellipse_torsionless
A
test_suite/shared_data/frame_order/pseudo_ellipse_torsionless/generate_distribution.py
A
test_suite/shared_data/frame_order/pseudo_ellipse_torsionless/frame_order.bz2
A test_suite/shared_data/frame_order/pseudo_ellipse_torsionless/rdc_dy.txt
A test_suite/shared_data/frame_order/pseudo_ellipse_torsionless/tensors.py
A test_suite/shared_data/frame_order/pseudo_ellipse_torsionless/rdc_tm.txt
A
test_suite/shared_data/frame_order/pseudo_ellipse_torsionless/tensor_fit.log.bz2
A test_suite/shared_data/frame_order/pseudo_ellipse_torsionless/cone.pdb
A test_suite/shared_data/frame_order/pseudo_ellipse_torsionless/pcs_tb.txt
A test_suite/shared_data/frame_order/pseudo_ellipse_torsionless/pcs_er.txt
A test_suite/shared_data/frame_order/pseudo_ellipse_torsionless/README
A test_suite/shared_data/frame_order/pseudo_ellipse_torsionless/pcs_dy.txt
A test_suite/shared_data/frame_order/pseudo_ellipse_torsionless/ave_pos.pdb
A
test_suite/shared_data/frame_order/pseudo_ellipse_torsionless/frame_order.log.bz2
A
test_suite/shared_data/frame_order/pseudo_ellipse_torsionless/tensor_fit.py
A test_suite/shared_data/frame_order/pseudo_ellipse_torsionless/pcs_tm.txt
A
test_suite/shared_data/frame_order/pseudo_ellipse_torsionless/generate_distribution.log.bz2
A test_suite/shared_data/frame_order/pseudo_ellipse_torsionless/animate.py
A test_suite/shared_data/frame_order/pseudo_ellipse_torsionless/axis.pdb
A
test_suite/shared_data/frame_order/pseudo_ellipse_torsionless/back_calc.py
A test_suite/shared_data/frame_order/pseudo_ellipse_torsionless/rdc_tb.txt
A
test_suite/shared_data/frame_order/pseudo_ellipse_torsionless/frame_order.py
A test_suite/shared_data/frame_order/pseudo_ellipse_torsionless/rdc_er.txt
[edau@localhost relax-trunk]$ svn merge -r15142:15143
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r15143 into '.':
A test_suite/shared_data/frame_order/pseudo_ellipse_free_rotor
A
test_suite/shared_data/frame_order/pseudo_ellipse_free_rotor/generate_distribution.py
A
test_suite/shared_data/frame_order/pseudo_ellipse_free_rotor/frame_order.bz2
A test_suite/shared_data/frame_order/pseudo_ellipse_free_rotor/rdc_dy.txt
A test_suite/shared_data/frame_order/pseudo_ellipse_free_rotor/tensors.py
A test_suite/shared_data/frame_order/pseudo_ellipse_free_rotor/rdc_tm.txt
A
test_suite/shared_data/frame_order/pseudo_ellipse_free_rotor/tensor_fit.log.bz2
A test_suite/shared_data/frame_order/pseudo_ellipse_free_rotor/cone.pdb
A test_suite/shared_data/frame_order/pseudo_ellipse_free_rotor/pcs_tb.txt
A test_suite/shared_data/frame_order/pseudo_ellipse_free_rotor/pcs_er.txt
A test_suite/shared_data/frame_order/pseudo_ellipse_free_rotor/README
A test_suite/shared_data/frame_order/pseudo_ellipse_free_rotor/pcs_dy.txt
A test_suite/shared_data/frame_order/pseudo_ellipse_free_rotor/ave_pos.pdb
A
test_suite/shared_data/frame_order/pseudo_ellipse_free_rotor/frame_order.log.bz2
A
test_suite/shared_data/frame_order/pseudo_ellipse_free_rotor/tensor_fit.py
A test_suite/shared_data/frame_order/pseudo_ellipse_free_rotor/pcs_tm.txt
A
test_suite/shared_data/frame_order/pseudo_ellipse_free_rotor/generate_distribution.log.bz2
A test_suite/shared_data/frame_order/pseudo_ellipse_free_rotor/animate.py
A test_suite/shared_data/frame_order/pseudo_ellipse_free_rotor/axis.pdb
A test_suite/shared_data/frame_order/pseudo_ellipse_free_rotor/back_calc.py
A test_suite/shared_data/frame_order/pseudo_ellipse_free_rotor/rdc_tb.txt
A
test_suite/shared_data/frame_order/pseudo_ellipse_free_rotor/frame_order.py
A test_suite/shared_data/frame_order/pseudo_ellipse_free_rotor/rdc_er.txt
[edau@localhost relax-trunk]$ svn merge -r15143:15144
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r15144 into '.':
A
test_suite/shared_data/frame_order/pseudo_ellipse_free_rotor/frame_order_matrix.log
A
test_suite/shared_data/frame_order/pseudo_ellipse_free_rotor/frame_order_matrix.py
A
test_suite/shared_data/frame_order/pseudo_ellipse_free_rotor/rotation_matrices.py
[edau@localhost relax-trunk]$ svn merge -r15144:15145
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r15145 into '.':
U test_suite/shared_data/frame_order/pseudo_ellipse_free_rotor/rdc_dy.txt
U test_suite/shared_data/frame_order/pseudo_ellipse_free_rotor/rdc_tm.txt
U test_suite/shared_data/frame_order/pseudo_ellipse_free_rotor/rdc_tb.txt
U test_suite/shared_data/frame_order/pseudo_ellipse_free_rotor/rdc_er.txt
[edau@localhost relax-trunk]$ svn merge -r15145:15146
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r15146 into '.':
U maths_fns/frame_order_matrix_ops.py
[edau@localhost relax-trunk]$ svn merge -r15146:15147
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r15147 into '.':
U
test_suite/shared_data/frame_order/pseudo_ellipse_free_rotor/frame_order.bz2
U test_suite/shared_data/frame_order/pseudo_ellipse_free_rotor/tensors.py
U
test_suite/shared_data/frame_order/pseudo_ellipse_free_rotor/tensor_fit.log.bz2
U test_suite/shared_data/frame_order/pseudo_ellipse_free_rotor/cone.pdb
U test_suite/shared_data/frame_order/pseudo_ellipse_free_rotor/ave_pos.pdb
U
test_suite/shared_data/frame_order/pseudo_ellipse_free_rotor/frame_order.log.bz2
U
test_suite/shared_data/frame_order/pseudo_ellipse_free_rotor/frame_order.py
[edau@localhost relax-trunk]$ svn merge -r15147:15148
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r15148 into '.':
U test_suite/shared_data/frame_order/pseudo_ellipse/frame_order.bz2
U test_suite/shared_data/frame_order/pseudo_ellipse/cone.pdb
U test_suite/shared_data/frame_order/pseudo_ellipse/README
U test_suite/shared_data/frame_order/pseudo_ellipse/ave_pos.pdb
U test_suite/shared_data/frame_order/pseudo_ellipse/frame_order.log.bz2
[edau@localhost relax-trunk]$ svn merge -r15148:15149
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r15149 into '.':
G maths_fns/frame_order_matrix_ops.py
U maths_fns/frame_order.py
[edau@localhost relax-trunk]$ svn merge -r15149:15150
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r15150 into '.':
A
test_suite/shared_data/frame_order/pseudo_ellipse_free_rotor/cone_pseudo_ellipse.pdb
A
test_suite/shared_data/frame_order/pseudo_ellipse_free_rotor/ave_pos_pseudo_ellipse.pdb
U test_suite/shared_data/frame_order/pseudo_ellipse_free_rotor/README
A
test_suite/shared_data/frame_order/pseudo_ellipse_free_rotor/frame_order_pseudo_ellipse.log.bz2
A
test_suite/shared_data/frame_order/pseudo_ellipse_free_rotor/frame_order_pseudo_ellipse.py
A
test_suite/shared_data/frame_order/pseudo_ellipse_free_rotor/frame_order_pseudo_ellipse.bz2
[edau@localhost relax-trunk]$
Added:
trunk/test_suite/shared_data/frame_order/pseudo_ellipse_free_rotor/
- copied from r15143,
branches/frame_order_testing/test_suite/shared_data/frame_order/pseudo_ellipse_free_rotor/
trunk/test_suite/shared_data/frame_order/pseudo_ellipse_free_rotor/ave_pos_pseudo_ellipse.pdb
- copied unchanged from r15150,
branches/frame_order_testing/test_suite/shared_data/frame_order/pseudo_ellipse_free_rotor/ave_pos_pseudo_ellipse.pdb
trunk/test_suite/shared_data/frame_order/pseudo_ellipse_free_rotor/cone_pseudo_ellipse.pdb
- copied unchanged from r15150,
branches/frame_order_testing/test_suite/shared_data/frame_order/pseudo_ellipse_free_rotor/cone_pseudo_ellipse.pdb
trunk/test_suite/shared_data/frame_order/pseudo_ellipse_free_rotor/frame_order_matrix.log
- copied unchanged from r15144,
branches/frame_order_testing/test_suite/shared_data/frame_order/pseudo_ellipse_free_rotor/frame_order_matrix.log
trunk/test_suite/shared_data/frame_order/pseudo_ellipse_free_rotor/frame_order_matrix.py
- copied unchanged from r15144,
branches/frame_order_testing/test_suite/shared_data/frame_order/pseudo_ellipse_free_rotor/frame_order_matrix.py
trunk/test_suite/shared_data/frame_order/pseudo_ellipse_free_rotor/frame_order_pseudo_ellipse.bz2
- copied unchanged from r15150,
branches/frame_order_testing/test_suite/shared_data/frame_order/pseudo_ellipse_free_rotor/frame_order_pseudo_ellipse.bz2
trunk/test_suite/shared_data/frame_order/pseudo_ellipse_free_rotor/frame_order_pseudo_ellipse.log.bz2
- copied unchanged from r15150,
branches/frame_order_testing/test_suite/shared_data/frame_order/pseudo_ellipse_free_rotor/frame_order_pseudo_ellipse.log.bz2
trunk/test_suite/shared_data/frame_order/pseudo_ellipse_free_rotor/frame_order_pseudo_ellipse.py
- copied unchanged from r15150,
branches/frame_order_testing/test_suite/shared_data/frame_order/pseudo_ellipse_free_rotor/frame_order_pseudo_ellipse.py
trunk/test_suite/shared_data/frame_order/pseudo_ellipse_free_rotor/rotation_matrices.py
- copied unchanged from r15144,
branches/frame_order_testing/test_suite/shared_data/frame_order/pseudo_ellipse_free_rotor/rotation_matrices.py
trunk/test_suite/shared_data/frame_order/pseudo_ellipse_torsionless/
- copied from r15142,
branches/frame_order_testing/test_suite/shared_data/frame_order/pseudo_ellipse_torsionless/
Modified:
trunk/maths_fns/frame_order.py
trunk/maths_fns/frame_order_matrix_ops.py
trunk/test_suite/shared_data/frame_order/pseudo_ellipse/README
trunk/test_suite/shared_data/frame_order/pseudo_ellipse/ave_pos.pdb
trunk/test_suite/shared_data/frame_order/pseudo_ellipse/cone.pdb
trunk/test_suite/shared_data/frame_order/pseudo_ellipse/frame_order.bz2
trunk/test_suite/shared_data/frame_order/pseudo_ellipse/frame_order.log.bz2
trunk/test_suite/shared_data/frame_order/pseudo_ellipse_free_rotor/README
trunk/test_suite/shared_data/frame_order/pseudo_ellipse_free_rotor/ave_pos.pdb
trunk/test_suite/shared_data/frame_order/pseudo_ellipse_free_rotor/cone.pdb
trunk/test_suite/shared_data/frame_order/pseudo_ellipse_free_rotor/frame_order.bz2
trunk/test_suite/shared_data/frame_order/pseudo_ellipse_free_rotor/frame_order.log.bz2
trunk/test_suite/shared_data/frame_order/pseudo_ellipse_free_rotor/frame_order.py
trunk/test_suite/shared_data/frame_order/pseudo_ellipse_free_rotor/rdc_dy.txt
trunk/test_suite/shared_data/frame_order/pseudo_ellipse_free_rotor/rdc_er.txt
trunk/test_suite/shared_data/frame_order/pseudo_ellipse_free_rotor/rdc_tb.txt
trunk/test_suite/shared_data/frame_order/pseudo_ellipse_free_rotor/rdc_tm.txt
trunk/test_suite/shared_data/frame_order/pseudo_ellipse_free_rotor/tensor_fit.log.bz2
trunk/test_suite/shared_data/frame_order/pseudo_ellipse_free_rotor/tensors.py
trunk/test_suite/system_tests/scripts/n_state_model/5_state_xz.py
trunk/test_suite/system_tests/scripts/n_state_model/metal_pos_opt.py
trunk/test_suite/system_tests/scripts/n_state_model/pcs_back_calc.py
trunk/test_suite/system_tests/scripts/n_state_model/pcs_to_rdc.py
trunk/test_suite/system_tests/scripts/n_state_model/populations.py
[This mail would be too long, it was shortened to contain the URLs only.]
Modified: trunk/maths_fns/frame_order.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/maths_fns/frame_order.py?rev=18954&r1=18953&r2=18954&view=diff
Modified: trunk/maths_fns/frame_order_matrix_ops.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/maths_fns/frame_order_matrix_ops.py?rev=18954&r1=18953&r2=18954&view=diff
Modified: trunk/test_suite/shared_data/frame_order/pseudo_ellipse/README
URL:
http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/pseudo_ellipse/README?rev=18954&r1=18953&r2=18954&view=diff
Modified: trunk/test_suite/shared_data/frame_order/pseudo_ellipse/ave_pos.pdb
URL:
http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/pseudo_ellipse/ave_pos.pdb?rev=18954&r1=18953&r2=18954&view=diff
Modified: trunk/test_suite/shared_data/frame_order/pseudo_ellipse/cone.pdb
URL:
http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/pseudo_ellipse/cone.pdb?rev=18954&r1=18953&r2=18954&view=diff
Modified:
trunk/test_suite/shared_data/frame_order/pseudo_ellipse/frame_order.bz2
URL:
http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/pseudo_ellipse/frame_order.bz2?rev=18954&r1=18953&r2=18954&view=diff
Modified:
trunk/test_suite/shared_data/frame_order/pseudo_ellipse/frame_order.log.bz2
URL:
http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/pseudo_ellipse/frame_order.log.bz2?rev=18954&r1=18953&r2=18954&view=diff
Modified:
trunk/test_suite/shared_data/frame_order/pseudo_ellipse_free_rotor/README
URL:
http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/pseudo_ellipse_free_rotor/README?rev=18954&r1=15143&r2=18954&view=diff
Modified:
trunk/test_suite/shared_data/frame_order/pseudo_ellipse_free_rotor/ave_pos.pdb
URL:
http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/pseudo_ellipse_free_rotor/ave_pos.pdb?rev=18954&r1=15143&r2=18954&view=diff
Modified:
trunk/test_suite/shared_data/frame_order/pseudo_ellipse_free_rotor/cone.pdb
URL:
http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/pseudo_ellipse_free_rotor/cone.pdb?rev=18954&r1=15143&r2=18954&view=diff
Modified:
trunk/test_suite/shared_data/frame_order/pseudo_ellipse_free_rotor/frame_order.bz2
URL:
http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/pseudo_ellipse_free_rotor/frame_order.bz2?rev=18954&r1=15143&r2=18954&view=diff
Modified:
trunk/test_suite/shared_data/frame_order/pseudo_ellipse_free_rotor/frame_order.log.bz2
URL:
http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/pseudo_ellipse_free_rotor/frame_order.log.bz2?rev=18954&r1=15143&r2=18954&view=diff
Modified:
trunk/test_suite/shared_data/frame_order/pseudo_ellipse_free_rotor/frame_order.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/pseudo_ellipse_free_rotor/frame_order.py?rev=18954&r1=15143&r2=18954&view=diff
Modified:
trunk/test_suite/shared_data/frame_order/pseudo_ellipse_free_rotor/rdc_dy.txt
URL:
http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/pseudo_ellipse_free_rotor/rdc_dy.txt?rev=18954&r1=15143&r2=18954&view=diff
Modified:
trunk/test_suite/shared_data/frame_order/pseudo_ellipse_free_rotor/rdc_er.txt
URL:
http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/pseudo_ellipse_free_rotor/rdc_er.txt?rev=18954&r1=15143&r2=18954&view=diff
Modified:
trunk/test_suite/shared_data/frame_order/pseudo_ellipse_free_rotor/rdc_tb.txt
URL:
http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/pseudo_ellipse_free_rotor/rdc_tb.txt?rev=18954&r1=15143&r2=18954&view=diff
Modified:
trunk/test_suite/shared_data/frame_order/pseudo_ellipse_free_rotor/rdc_tm.txt
URL:
http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/pseudo_ellipse_free_rotor/rdc_tm.txt?rev=18954&r1=15143&r2=18954&view=diff
Modified:
trunk/test_suite/shared_data/frame_order/pseudo_ellipse_free_rotor/tensor_fit.log.bz2
URL:
http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/pseudo_ellipse_free_rotor/tensor_fit.log.bz2?rev=18954&r1=15143&r2=18954&view=diff
Modified:
trunk/test_suite/shared_data/frame_order/pseudo_ellipse_free_rotor/tensors.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/pseudo_ellipse_free_rotor/tensors.py?rev=18954&r1=15143&r2=18954&view=diff
Modified: trunk/test_suite/system_tests/scripts/n_state_model/5_state_xz.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/test_suite/system_tests/scripts/n_state_model/5_state_xz.py?rev=18954&r1=18953&r2=18954&view=diff
Modified: trunk/test_suite/system_tests/scripts/n_state_model/metal_pos_opt.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/test_suite/system_tests/scripts/n_state_model/metal_pos_opt.py?rev=18954&r1=18953&r2=18954&view=diff
Modified: trunk/test_suite/system_tests/scripts/n_state_model/pcs_back_calc.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/test_suite/system_tests/scripts/n_state_model/pcs_back_calc.py?rev=18954&r1=18953&r2=18954&view=diff
Modified: trunk/test_suite/system_tests/scripts/n_state_model/pcs_to_rdc.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/test_suite/system_tests/scripts/n_state_model/pcs_to_rdc.py?rev=18954&r1=18953&r2=18954&view=diff
Modified: trunk/test_suite/system_tests/scripts/n_state_model/populations.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/test_suite/system_tests/scripts/n_state_model/populations.py?rev=18954&r1=18953&r2=18954&view=diff
r18954 - in /trunk: maths_fns/ test_suite/shared_data/frame_order/pseudo_ellipse/ test_suite/shared_data/frame_order/pseudo_...