Author: bugman
Date: Fri Mar 22 16:54:21 2013
New Revision: 18984
URL: http://svn.gna.org/viewcvs/relax?rev=18984&view=rev
Log:
Next block of the manual merger of the frame_order_testing branch.
The commands used were:
svn merge -r17964:17965
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r17965:17966
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r17966:17967
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r17977:17978
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r17983:17984
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r17984:17985
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r17985:17986
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r17988:17989
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r17989:17990
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
The console messages were:
[edau@localhost relax-trunk]$ svn merge -r17964:17965
svn+ssh://bugman@xxxxxxxxxxx/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@localhost relax-trunk]$ svn merge -r17965:17966
svn+ssh://bugman@xxxxxxxxxxx/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@localhost relax-trunk]$ svn merge -r17966:17967
svn+ssh://bugman@xxxxxxxxxxx/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@localhost relax-trunk]$ svn merge -r17977:17978
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r17978 into '.':
U user_functions/rdc.py
U user_functions/pcs.py
[edau@localhost relax-trunk]$ svn merge -r17983:17984
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r17984 into '.':
U
test_suite/shared_data/frame_order/cam/pseudo_ellipse/multi_processor_test.py
[edau@localhost relax-trunk]$ svn merge -r17984:17985
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r17985 into '.':
U auto_analyses/frame_order.py
[edau@localhost relax-trunk]$ svn merge -r17985:17986
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 r17986 into '.':
C specific_fns/frame_order.py
G auto_analyses/frame_order.py
Summary of conflicts:
Text conflicts: 1
[edau@localhost relax-trunk]$ svn merge -r17988:17989
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r17989 into '.':
G specific_fns/frame_order.py
[edau@localhost relax-trunk]$ svn merge -r17989:17990
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r17990 into '.':
G auto_analyses/frame_order.py
[edau@localhost relax-trunk]$
Modified:
trunk/auto_analyses/frame_order.py
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/shared_data/frame_order/cam/pseudo_ellipse/multi_processor_test.py
trunk/user_functions/pcs.py
trunk/user_functions/rdc.py
[This mail would be too long, it was shortened to contain the URLs only.]
Modified: trunk/auto_analyses/frame_order.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/auto_analyses/frame_order.py?rev=18984&r1=18983&r2=18984&view=diff
Modified: trunk/maths_fns/frame_order/__init__.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/maths_fns/frame_order/__init__.py?rev=18984&r1=18983&r2=18984&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=18984&r1=18983&r2=18984&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=18984&r1=18983&r2=18984&view=diff
Modified: trunk/specific_fns/frame_order.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/specific_fns/frame_order.py?rev=18984&r1=18983&r2=18984&view=diff
Modified:
trunk/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?rev=18984&r1=18983&r2=18984&view=diff
Modified: trunk/user_functions/pcs.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/user_functions/pcs.py?rev=18984&r1=18983&r2=18984&view=diff
Modified: trunk/user_functions/rdc.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/user_functions/rdc.py?rev=18984&r1=18983&r2=18984&view=diff
r18984 - in /trunk: auto_analyses/ maths_fns/frame_order/ specific_fns/ test_suite/shared_data/frame_order/cam/pseudo_ellips...