Author: bugman
Date: Fri Mar 22 16:49:43 2013
New Revision: 18982
URL: http://svn.gna.org/viewcvs/relax?rev=18982&view=rev
Log:
Next block of the manual merger of the frame_order_testing branch.
The commands used were:
svn merge -r17866:17867
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r17867:17868
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r17896:17897
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r17917:17918
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r17929:17930
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r17935:17936
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r17942:17943
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r17949:17950
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
The console messages were:
[edau@localhost relax-trunk]$ svn merge -r17866:17867
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r17867 into '.':
U test_suite/system_tests/frame_order.py
[edau@localhost relax-trunk]$ svn merge -r17867:17868
svn+ssh://bugman@xxxxxxxxxxx/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@localhost relax-trunk]$ svn merge -r17896:17897
svn+ssh://bugman@xxxxxxxxxxx/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@localhost relax-trunk]$ svn merge -r17917:17918
svn+ssh://bugman@xxxxxxxxxxx/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@localhost relax-trunk]$ svn merge -r17929:17930
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r17930 into '.':
A
test_suite/shared_data/frame_order/cam/pseudo_ellipse/multi_processor_test.py
[edau@localhost relax-trunk]$ svn merge -r17935:17936
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r17936 into '.':
U
test_suite/shared_data/frame_order/cam/pseudo_ellipse/multi_processor_test.py
[edau@localhost relax-trunk]$ svn merge -r17942:17943
svn+ssh://bugman@xxxxxxxxxxx/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@localhost relax-trunk]$ svn merge -r17949:17950
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r17950 into '.':
U maths_fns/frame_order/matrix_ops.py
[edau@localhost relax-trunk]$
Added:
trunk/test_suite/shared_data/frame_order/cam/free_rotor/back_calc.bz2
- copied unchanged from r17918,
branches/frame_order_testing/test_suite/shared_data/frame_order/cam/free_rotor/back_calc.bz2
trunk/test_suite/shared_data/frame_order/cam/free_rotor2/back_calc.bz2
- copied unchanged from r17918,
branches/frame_order_testing/test_suite/shared_data/frame_order/cam/free_rotor2/back_calc.bz2
trunk/test_suite/shared_data/frame_order/cam/iso_cone/back_calc.bz2
- copied unchanged from r17918,
branches/frame_order_testing/test_suite/shared_data/frame_order/cam/iso_cone/back_calc.bz2
trunk/test_suite/shared_data/frame_order/cam/iso_cone_free_rotor/back_calc.bz2
- copied unchanged from r17918,
branches/frame_order_testing/test_suite/shared_data/frame_order/cam/iso_cone_free_rotor/back_calc.bz2
trunk/test_suite/shared_data/frame_order/cam/iso_cone_free_rotor2/back_calc.bz2
- copied unchanged from r17918,
branches/frame_order_testing/test_suite/shared_data/frame_order/cam/iso_cone_free_rotor2/back_calc.bz2
trunk/test_suite/shared_data/frame_order/cam/iso_cone_torsionless/back_calc.bz2
- copied unchanged from r17918,
branches/frame_order_testing/test_suite/shared_data/frame_order/cam/iso_cone_torsionless/back_calc.bz2
trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse/back_calc.bz2
- copied unchanged from r17918,
branches/frame_order_testing/test_suite/shared_data/frame_order/cam/pseudo_ellipse/back_calc.bz2
trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse/multi_processor_test.py
- copied, changed from r17930,
branches/frame_order_testing/test_suite/shared_data/frame_order/cam/pseudo_ellipse/multi_processor_test.py
trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse2/back_calc.bz2
- copied unchanged from r17918,
branches/frame_order_testing/test_suite/shared_data/frame_order/cam/pseudo_ellipse2/back_calc.bz2
trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse_free_rotor/back_calc.bz2
- copied unchanged from r17918,
branches/frame_order_testing/test_suite/shared_data/frame_order/cam/pseudo_ellipse_free_rotor/back_calc.bz2
trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse_torsionless/back_calc.bz2
- copied unchanged from r17918,
branches/frame_order_testing/test_suite/shared_data/frame_order/cam/pseudo_ellipse_torsionless/back_calc.bz2
trunk/test_suite/shared_data/frame_order/cam/rotor/back_calc.bz2
- copied unchanged from r17918,
branches/frame_order_testing/test_suite/shared_data/frame_order/cam/rotor/back_calc.bz2
trunk/test_suite/shared_data/frame_order/cam/rotor2/back_calc.bz2
- copied unchanged from r17918,
branches/frame_order_testing/test_suite/shared_data/frame_order/cam/rotor2/back_calc.bz2
Modified:
trunk/maths_fns/frame_order/__init__.py
trunk/maths_fns/frame_order/matrix_ops.py
trunk/maths_fns/frame_order/pseudo_ellipse.py
trunk/specific_fns/frame_order.py
trunk/test_suite/system_tests/frame_order.py
[This mail would be too long, it was shortened to contain the URLs only.]
Modified: trunk/maths_fns/frame_order/__init__.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/maths_fns/frame_order/__init__.py?rev=18982&r1=18981&r2=18982&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=18982&r1=18981&r2=18982&view=diff
Modified: trunk/maths_fns/frame_order/pseudo_ellipse.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/maths_fns/frame_order/pseudo_ellipse.py?rev=18982&r1=18981&r2=18982&view=diff
Modified: trunk/specific_fns/frame_order.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/specific_fns/frame_order.py?rev=18982&r1=18981&r2=18982&view=diff
Copied:
trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse/multi_processor_test.py
(from r17930,
branches/frame_order_testing/test_suite/shared_data/frame_order/cam/pseudo_ellipse/multi_processor_test.py)
URL:
http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse/multi_processor_test.py?p2=trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse/multi_processor_test.py&p1=branches/frame_order_testing/test_suite/shared_data/frame_order/cam/pseudo_ellipse/multi_processor_test.py&r1=17930&r2=18982&rev=18982&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=18982&r1=18981&r2=18982&view=diff
r18982 - in /trunk: maths_fns/frame_order/ specific_fns/ test_suite/shared_data/frame_order/cam/free_rotor/ test_suite/share...