Author: bugman
Date: Fri Mar 22 12:47:52 2013
New Revision: 18957
URL: http://svn.gna.org/viewcvs/relax?rev=18957&view=rev
Log:
Next block of the manual merger of the frame_order_testing branch.
The commands used were:
svn merge -r15220:15221
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r15221:15222
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r15238:15239
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r15239:15240
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r15240:15241
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r15241:15242
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r15242:15243
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r15252:15253
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
The console messages were:
[edau@localhost relax-trunk]$ svn merge -r15220:15221
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r15221 into '.':
U test_suite/unit_tests/_generic_fns/test_mol_res_spin.py
U test_suite/unit_tests/_maths_fns/test_frame_order_matrix_ops.py
[edau@localhost relax-trunk]$ svn merge -r15221:15222
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r15222 into '.':
U test_suite/system_tests/frame_order.py
[edau@localhost relax-trunk]$ svn merge -r15238:15239
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r15239 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/back_calc.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/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/iso_cone/tensor_fit.py
U test_suite/shared_data/frame_order/cam/iso_cone/back_calc.py
U test_suite/shared_data/frame_order/cam/iso_cone/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_torsionless/tensor_fit.py
U test_suite/shared_data/frame_order/cam/iso_cone_torsionless/back_calc.py
U
test_suite/shared_data/frame_order/cam/iso_cone_torsionless/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/back_calc.py
U
test_suite/shared_data/frame_order/cam/pseudo_ellipse_free_rotor/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/tensor_fit.py
U test_suite/shared_data/frame_order/cam/pseudo_ellipse/back_calc.py
U test_suite/shared_data/frame_order/cam/pseudo_ellipse/frame_order.py
[edau@localhost relax-trunk]$ svn merge -r15239:15240
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r15240 into '.':
U specific_fns/frame_order.py
[edau@localhost relax-trunk]$ svn merge -r15240:15241
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r15241 into '.':
G specific_fns/frame_order.py
[edau@localhost relax-trunk]$ svn merge -r15241:15242
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
Conflict discovered in 'test_suite/system_tests/structure.py'.
Select: (p) postpone, (df) diff-full, (e) edit,
(mc) mine-conflict, (tc) theirs-conflict,
(s) show all options: p
--- Merging r15242 into '.':
C test_suite/system_tests/structure.py
Summary of conflicts:
Text conflicts: 1
[edau@localhost relax-trunk]$ svn merge -r15242:15243
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
Conflict discovered in
'test_suite/system_tests/scripts/frame_order/cam/free_rotor.py'.
Select: (p) postpone, (df) diff-full, (e) edit,
(mc) mine-conflict, (tc) theirs-conflict,
(s) show all options: p
--- Merging r15243 into '.':
C test_suite/system_tests/scripts/frame_order/cam/free_rotor.py
G test_suite/system_tests/frame_order.py
Summary of conflicts:
Text conflicts: 1
[edau@localhost relax-trunk]$ svn merge -r15252:15253
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r15253 into '.':
G test_suite/system_tests/scripts/frame_order/cam/free_rotor.py
G test_suite/system_tests/frame_order.py
[edau@localhost relax-trunk]$
Modified:
trunk/specific_fns/frame_order.py
trunk/test_suite/shared_data/frame_order/cam/free_rotor/frame_order.py
trunk/test_suite/shared_data/frame_order/cam/free_rotor2/frame_order.py
trunk/test_suite/shared_data/frame_order/cam/iso_cone/back_calc.py
trunk/test_suite/shared_data/frame_order/cam/iso_cone/frame_order.py
trunk/test_suite/shared_data/frame_order/cam/iso_cone/tensor_fit.py
trunk/test_suite/shared_data/frame_order/cam/iso_cone_free_rotor/frame_order.py
trunk/test_suite/shared_data/frame_order/cam/iso_cone_free_rotor2/frame_order.py
trunk/test_suite/shared_data/frame_order/cam/iso_cone_torsionless/back_calc.py
trunk/test_suite/shared_data/frame_order/cam/iso_cone_torsionless/frame_order.py
trunk/test_suite/shared_data/frame_order/cam/iso_cone_torsionless/tensor_fit.py
trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse/back_calc.py
trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse/frame_order.py
trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse/tensor_fit.py
trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse_free_rotor/back_calc.py
trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse_free_rotor/frame_order.py
trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse_free_rotor/frame_order_pseudo_ellipse.py
trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse_free_rotor/tensor_fit.py
trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse_torsionless/back_calc.py
trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse_torsionless/frame_order.py
trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse_torsionless/tensor_fit.py
trunk/test_suite/shared_data/frame_order/cam/rigid/frame_order.py
trunk/test_suite/shared_data/frame_order/cam/rotor/frame_order.py
trunk/test_suite/shared_data/frame_order/cam/rotor2/frame_order.py
trunk/test_suite/system_tests/frame_order.py
trunk/test_suite/system_tests/scripts/frame_order/cam/free_rotor.py
trunk/test_suite/system_tests/structure.py
trunk/test_suite/unit_tests/_generic_fns/test_mol_res_spin.py
trunk/test_suite/unit_tests/_maths_fns/test_frame_order_matrix_ops.py
[This mail would be too long, it was shortened to contain the URLs only.]
Modified: trunk/specific_fns/frame_order.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/specific_fns/frame_order.py?rev=18957&r1=18956&r2=18957&view=diff
Modified:
trunk/test_suite/shared_data/frame_order/cam/free_rotor/frame_order.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/cam/free_rotor/frame_order.py?rev=18957&r1=18956&r2=18957&view=diff
Modified:
trunk/test_suite/shared_data/frame_order/cam/free_rotor2/frame_order.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/cam/free_rotor2/frame_order.py?rev=18957&r1=18956&r2=18957&view=diff
Modified: trunk/test_suite/shared_data/frame_order/cam/iso_cone/back_calc.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/cam/iso_cone/back_calc.py?rev=18957&r1=18956&r2=18957&view=diff
Modified: trunk/test_suite/shared_data/frame_order/cam/iso_cone/frame_order.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/cam/iso_cone/frame_order.py?rev=18957&r1=18956&r2=18957&view=diff
Modified: trunk/test_suite/shared_data/frame_order/cam/iso_cone/tensor_fit.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/cam/iso_cone/tensor_fit.py?rev=18957&r1=18956&r2=18957&view=diff
Modified:
trunk/test_suite/shared_data/frame_order/cam/iso_cone_free_rotor/frame_order.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/cam/iso_cone_free_rotor/frame_order.py?rev=18957&r1=18956&r2=18957&view=diff
Modified:
trunk/test_suite/shared_data/frame_order/cam/iso_cone_free_rotor2/frame_order.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/cam/iso_cone_free_rotor2/frame_order.py?rev=18957&r1=18956&r2=18957&view=diff
Modified:
trunk/test_suite/shared_data/frame_order/cam/iso_cone_torsionless/back_calc.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/cam/iso_cone_torsionless/back_calc.py?rev=18957&r1=18956&r2=18957&view=diff
Modified:
trunk/test_suite/shared_data/frame_order/cam/iso_cone_torsionless/frame_order.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/cam/iso_cone_torsionless/frame_order.py?rev=18957&r1=18956&r2=18957&view=diff
Modified:
trunk/test_suite/shared_data/frame_order/cam/iso_cone_torsionless/tensor_fit.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/cam/iso_cone_torsionless/tensor_fit.py?rev=18957&r1=18956&r2=18957&view=diff
Modified:
trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse/back_calc.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse/back_calc.py?rev=18957&r1=18956&r2=18957&view=diff
Modified:
trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse/frame_order.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse/frame_order.py?rev=18957&r1=18956&r2=18957&view=diff
Modified:
trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse/tensor_fit.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse/tensor_fit.py?rev=18957&r1=18956&r2=18957&view=diff
Modified:
trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse_free_rotor/back_calc.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse_free_rotor/back_calc.py?rev=18957&r1=18956&r2=18957&view=diff
Modified:
trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse_free_rotor/frame_order.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse_free_rotor/frame_order.py?rev=18957&r1=18956&r2=18957&view=diff
Modified:
trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse_free_rotor/frame_order_pseudo_ellipse.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse_free_rotor/frame_order_pseudo_ellipse.py?rev=18957&r1=18956&r2=18957&view=diff
Modified:
trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse_free_rotor/tensor_fit.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse_free_rotor/tensor_fit.py?rev=18957&r1=18956&r2=18957&view=diff
Modified:
trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse_torsionless/back_calc.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse_torsionless/back_calc.py?rev=18957&r1=18956&r2=18957&view=diff
Modified:
trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse_torsionless/frame_order.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse_torsionless/frame_order.py?rev=18957&r1=18956&r2=18957&view=diff
Modified:
trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse_torsionless/tensor_fit.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse_torsionless/tensor_fit.py?rev=18957&r1=18956&r2=18957&view=diff
Modified: trunk/test_suite/shared_data/frame_order/cam/rigid/frame_order.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/cam/rigid/frame_order.py?rev=18957&r1=18956&r2=18957&view=diff
Modified: trunk/test_suite/shared_data/frame_order/cam/rotor/frame_order.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/cam/rotor/frame_order.py?rev=18957&r1=18956&r2=18957&view=diff
Modified: trunk/test_suite/shared_data/frame_order/cam/rotor2/frame_order.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/cam/rotor2/frame_order.py?rev=18957&r1=18956&r2=18957&view=diff
Modified: trunk/test_suite/system_tests/frame_order.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/test_suite/system_tests/frame_order.py?rev=18957&r1=18956&r2=18957&view=diff
Modified: trunk/test_suite/system_tests/scripts/frame_order/cam/free_rotor.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/test_suite/system_tests/scripts/frame_order/cam/free_rotor.py?rev=18957&r1=18956&r2=18957&view=diff
Modified: trunk/test_suite/system_tests/structure.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/test_suite/system_tests/structure.py?rev=18957&r1=18956&r2=18957&view=diff
Modified: trunk/test_suite/unit_tests/_generic_fns/test_mol_res_spin.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/test_suite/unit_tests/_generic_fns/test_mol_res_spin.py?rev=18957&r1=18956&r2=18957&view=diff
Modified:
trunk/test_suite/unit_tests/_maths_fns/test_frame_order_matrix_ops.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/test_suite/unit_tests/_maths_fns/test_frame_order_matrix_ops.py?rev=18957&r1=18956&r2=18957&view=diff
r18957 - in /trunk: specific_fns/ test_suite/shared_data/frame_order/cam/free_rotor/ test_suite/shared_data/frame_order/cam/...