Author: bugman
Date: Fri Mar 22 16:45:57 2013
New Revision: 18980
URL: http://svn.gna.org/viewcvs/relax?rev=18980&view=rev
Log:
Next block of the manual merger of the frame_order_testing branch.
The commands used were:
svn merge -r17320:17321
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r17321:17322
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r17322:17323
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r17323:17324
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r17324:17325
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r17325:17326
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r17326:17327
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r17327:17328
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r17328:17329
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r17329:17330
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
The console messages were:
[edau@localhost relax-trunk]$ svn merge -r17320:17321
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r17321 into '.':
A maths_fns/frame_order
[edau@localhost relax-trunk]$ svn merge -r17321:17322
svn+ssh://bugman@xxxxxxxxxxx/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@localhost relax-trunk]$ svn merge -r17322:17323
svn+ssh://bugman@xxxxxxxxxxx/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@localhost relax-trunk]$ svn merge -r17323:17324
svn+ssh://bugman@xxxxxxxxxxx/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@localhost relax-trunk]$ svn merge -r17324:17325
svn+ssh://bugman@xxxxxxxxxxx/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@localhost relax-trunk]$ svn merge -r17325:17326
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r17326 into '.':
G maths_fns/frame_order/frame_order_matrix_ops.py
[edau@localhost relax-trunk]$ svn merge -r17326:17327
svn+ssh://bugman@xxxxxxxxxxx/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@localhost relax-trunk]$ svn merge -r17327:17328
svn+ssh://bugman@xxxxxxxxxxx/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@localhost relax-trunk]$ svn merge -r17328:17329
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r17329 into '.':
U maths_fns/__init__.py
[edau@localhost relax-trunk]$ svn merge -r17329:17330
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r17330 into '.':
G maths_fns/frame_order/rotor.py
[edau@localhost relax-trunk]$
Added:
trunk/maths_fns/frame_order/
- copied from r17321,
branches/frame_order_testing/maths_fns/frame_order/
trunk/maths_fns/frame_order/__init__.py
- copied, changed from r17322,
branches/frame_order_testing/maths_fns/frame_order/__init__.py
trunk/maths_fns/frame_order/free_rotor.py
- copied, changed from r17325,
branches/frame_order_testing/maths_fns/frame_order/free_rotor.py
trunk/maths_fns/frame_order/iso_cone.py
- copied, changed from r17325,
branches/frame_order_testing/maths_fns/frame_order/iso_cone.py
trunk/maths_fns/frame_order/iso_cone_free_rotor.py
- copied, changed from r17325,
branches/frame_order_testing/maths_fns/frame_order/iso_cone_free_rotor.py
trunk/maths_fns/frame_order/iso_cone_torsionless.py
- copied, changed from r17325,
branches/frame_order_testing/maths_fns/frame_order/iso_cone_torsionless.py
trunk/maths_fns/frame_order/matrix_ops.py
- copied unchanged from r17328,
branches/frame_order_testing/maths_fns/frame_order/matrix_ops.py
trunk/maths_fns/frame_order/pec.py
- copied unchanged from r17327,
branches/frame_order_testing/maths_fns/frame_order/pec.py
trunk/maths_fns/frame_order/pseudo_ellipse.py
- copied, changed from r17323,
branches/frame_order_testing/maths_fns/frame_order/pseudo_ellipse.py
trunk/maths_fns/frame_order/pseudo_ellipse_free_rotor.py
- copied, changed from r17324,
branches/frame_order_testing/maths_fns/frame_order/pseudo_ellipse_free_rotor.py
trunk/maths_fns/frame_order/pseudo_ellipse_torsionless.py
- copied, changed from r17324,
branches/frame_order_testing/maths_fns/frame_order/pseudo_ellipse_torsionless.py
trunk/maths_fns/frame_order/rotor.py
- copied, changed from r17325,
branches/frame_order_testing/maths_fns/frame_order/rotor.py
Removed:
trunk/maths_fns/frame_order.py
trunk/maths_fns/frame_order_matrix_ops.py
trunk/maths_fns/pseudo_ellipse.py
Modified:
trunk/maths_fns/__init__.py
[This mail would be too long, it was shortened to contain the URLs only.]
Modified: trunk/maths_fns/__init__.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/maths_fns/__init__.py?rev=18980&r1=18979&r2=18980&view=diff
Removed: trunk/maths_fns/frame_order.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/maths_fns/frame_order.py?rev=18979&view=auto
Copied: trunk/maths_fns/frame_order/__init__.py (from r17322,
branches/frame_order_testing/maths_fns/frame_order/__init__.py)
URL:
http://svn.gna.org/viewcvs/relax/trunk/maths_fns/frame_order/__init__.py?p2=trunk/maths_fns/frame_order/__init__.py&p1=branches/frame_order_testing/maths_fns/frame_order/__init__.py&r1=17322&r2=18980&rev=18980&view=diff
Copied: trunk/maths_fns/frame_order/free_rotor.py (from r17325,
branches/frame_order_testing/maths_fns/frame_order/free_rotor.py)
URL:
http://svn.gna.org/viewcvs/relax/trunk/maths_fns/frame_order/free_rotor.py?p2=trunk/maths_fns/frame_order/free_rotor.py&p1=branches/frame_order_testing/maths_fns/frame_order/free_rotor.py&r1=17325&r2=18980&rev=18980&view=diff
Copied: trunk/maths_fns/frame_order/iso_cone.py (from r17325,
branches/frame_order_testing/maths_fns/frame_order/iso_cone.py)
URL:
http://svn.gna.org/viewcvs/relax/trunk/maths_fns/frame_order/iso_cone.py?p2=trunk/maths_fns/frame_order/iso_cone.py&p1=branches/frame_order_testing/maths_fns/frame_order/iso_cone.py&r1=17325&r2=18980&rev=18980&view=diff
Copied: trunk/maths_fns/frame_order/iso_cone_free_rotor.py (from r17325,
branches/frame_order_testing/maths_fns/frame_order/iso_cone_free_rotor.py)
URL:
http://svn.gna.org/viewcvs/relax/trunk/maths_fns/frame_order/iso_cone_free_rotor.py?p2=trunk/maths_fns/frame_order/iso_cone_free_rotor.py&p1=branches/frame_order_testing/maths_fns/frame_order/iso_cone_free_rotor.py&r1=17325&r2=18980&rev=18980&view=diff
Copied: trunk/maths_fns/frame_order/iso_cone_torsionless.py (from r17325,
branches/frame_order_testing/maths_fns/frame_order/iso_cone_torsionless.py)
URL:
http://svn.gna.org/viewcvs/relax/trunk/maths_fns/frame_order/iso_cone_torsionless.py?p2=trunk/maths_fns/frame_order/iso_cone_torsionless.py&p1=branches/frame_order_testing/maths_fns/frame_order/iso_cone_torsionless.py&r1=17325&r2=18980&rev=18980&view=diff
Copied: trunk/maths_fns/frame_order/pseudo_ellipse.py (from r17323,
branches/frame_order_testing/maths_fns/frame_order/pseudo_ellipse.py)
URL:
http://svn.gna.org/viewcvs/relax/trunk/maths_fns/frame_order/pseudo_ellipse.py?p2=trunk/maths_fns/frame_order/pseudo_ellipse.py&p1=branches/frame_order_testing/maths_fns/frame_order/pseudo_ellipse.py&r1=17323&r2=18980&rev=18980&view=diff
Copied: trunk/maths_fns/frame_order/pseudo_ellipse_free_rotor.py (from
r17324,
branches/frame_order_testing/maths_fns/frame_order/pseudo_ellipse_free_rotor.py)
URL:
http://svn.gna.org/viewcvs/relax/trunk/maths_fns/frame_order/pseudo_ellipse_free_rotor.py?p2=trunk/maths_fns/frame_order/pseudo_ellipse_free_rotor.py&p1=branches/frame_order_testing/maths_fns/frame_order/pseudo_ellipse_free_rotor.py&r1=17324&r2=18980&rev=18980&view=diff
Copied: trunk/maths_fns/frame_order/pseudo_ellipse_torsionless.py (from
r17324,
branches/frame_order_testing/maths_fns/frame_order/pseudo_ellipse_torsionless.py)
URL:
http://svn.gna.org/viewcvs/relax/trunk/maths_fns/frame_order/pseudo_ellipse_torsionless.py?p2=trunk/maths_fns/frame_order/pseudo_ellipse_torsionless.py&p1=branches/frame_order_testing/maths_fns/frame_order/pseudo_ellipse_torsionless.py&r1=17324&r2=18980&rev=18980&view=diff
Copied: trunk/maths_fns/frame_order/rotor.py (from r17325,
branches/frame_order_testing/maths_fns/frame_order/rotor.py)
URL:
http://svn.gna.org/viewcvs/relax/trunk/maths_fns/frame_order/rotor.py?p2=trunk/maths_fns/frame_order/rotor.py&p1=branches/frame_order_testing/maths_fns/frame_order/rotor.py&r1=17325&r2=18980&rev=18980&view=diff
Removed: trunk/maths_fns/frame_order_matrix_ops.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/maths_fns/frame_order_matrix_ops.py?rev=18979&view=auto
Removed: trunk/maths_fns/pseudo_ellipse.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/maths_fns/pseudo_ellipse.py?rev=18979&view=auto
r18980 - in /trunk/maths_fns: ./ frame_order/