Author: bugman
Date: Fri Mar 22 15:28:26 2013
New Revision: 18960
URL: http://svn.gna.org/viewcvs/relax?rev=18960&view=rev
Log:
Next block of the manual merger of the frame_order_testing branch.
The commands used were:
svn merge -r15280:15281
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r15281:15282
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r15282:15283
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r15283:15284
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r15284:15285
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r15285:15286
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r15286:15287
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r15287:15288
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r15288:15289
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r15289:15290
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
The console messages were:
[edau@localhost relax-trunk]$ svn merge -r15280:15281
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r15281 into '.':
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/pcs_only/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/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/frame_order.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/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/frame_order.py
U test_suite/unit_tests/unit_test_runner.py
[edau@localhost relax-trunk]$ svn merge -r15281:15282
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r15282 into '.':
A test_suite/system_tests/scripts/frame_order/cam/base_script.py
Conflict discovered in
'test_suite/system_tests/scripts/frame_order/cam/rigid.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/frame_order/cam/rigid.py
U test_suite/system_tests/scripts/frame_order/cam/__init__.py
Summary of conflicts:
Text conflicts: 1
[edau@localhost relax-trunk]$ svn merge -r15282:15283
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
Conflict discovered in
'test_suite/system_tests/scripts/frame_order/cam/free_rotor2.py'.
Select: (p) postpone, (df) diff-full, (e) edit,
(mc) mine-conflict, (tc) theirs-conflict,
(s) show all options: p
--- Merging r15283 into '.':
C test_suite/system_tests/scripts/frame_order/cam/free_rotor2.py
U test_suite/system_tests/scripts/frame_order/cam/base_script.py
Conflict discovered in
'test_suite/system_tests/scripts/frame_order/cam/iso_cone_free_rotor.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/frame_order/cam/iso_cone_free_rotor.py
Conflict discovered in
'test_suite/system_tests/scripts/frame_order/cam/rotor.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/frame_order/cam/rotor.py
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
C test_suite/system_tests/scripts/frame_order/cam/free_rotor.py
Conflict discovered in
'test_suite/system_tests/scripts/frame_order/cam/iso_cone_free_rotor2.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/frame_order/cam/iso_cone_free_rotor2.py
Conflict discovered in
'test_suite/system_tests/scripts/frame_order/cam/rotor2.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/frame_order/cam/rotor2.py
Summary of conflicts:
Text conflicts: 6
p[edau@localhost relax-trunk]$ svn merge -r15283:15284
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r15284 into '.':
A test_suite/system_tests/scripts/frame_order/cam/pseudo_ellipse.py
A test_suite/system_tests/scripts/frame_order/cam/iso_cone.py
A
test_suite/system_tests/scripts/frame_order/cam/pseudo_ellipse_torsionless.py
A test_suite/system_tests/scripts/frame_order/cam/iso_cone_torsionless.py
A
test_suite/system_tests/scripts/frame_order/cam/pseudo_ellipse_free_rotor.py
[edau@localhost relax-trunk]$ svn merge -r15284:15285
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r15285 into '.':
U maths_fns/frame_order.py
[edau@localhost relax-trunk]$ svn merge -r15285:15286
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r15286 into '.':
G maths_fns/frame_order.py
[edau@localhost relax-trunk]$ svn merge -r15286:15287
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r15287 into '.':
G maths_fns/frame_order.py
[edau@localhost relax-trunk]$ svn merge -r15287:15288
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r15288 into '.':
G maths_fns/frame_order.py
[edau@localhost relax-trunk]$ svn merge -r15288:15289
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r15289 into '.':
U maths_fns/frame_order_matrix_ops.py
[edau@localhost relax-trunk]$ svn merge -r15289:15290
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r15290 into '.':
U specific_fns/frame_order.py
[edau@localhost relax-trunk]$
Added:
trunk/test_suite/system_tests/scripts/frame_order/cam/base_script.py
- copied, changed from r15282,
branches/frame_order_testing/test_suite/system_tests/scripts/frame_order/cam/base_script.py
trunk/test_suite/system_tests/scripts/frame_order/cam/iso_cone.py
- copied unchanged from r15284,
branches/frame_order_testing/test_suite/system_tests/scripts/frame_order/cam/iso_cone.py
trunk/test_suite/system_tests/scripts/frame_order/cam/iso_cone_torsionless.py
- copied unchanged from r15284,
branches/frame_order_testing/test_suite/system_tests/scripts/frame_order/cam/iso_cone_torsionless.py
trunk/test_suite/system_tests/scripts/frame_order/cam/pseudo_ellipse.py
- copied unchanged from r15284,
branches/frame_order_testing/test_suite/system_tests/scripts/frame_order/cam/pseudo_ellipse.py
trunk/test_suite/system_tests/scripts/frame_order/cam/pseudo_ellipse_free_rotor.py
- copied unchanged from r15284,
branches/frame_order_testing/test_suite/system_tests/scripts/frame_order/cam/pseudo_ellipse_free_rotor.py
trunk/test_suite/system_tests/scripts/frame_order/cam/pseudo_ellipse_torsionless.py
- copied unchanged from r15284,
branches/frame_order_testing/test_suite/system_tests/scripts/frame_order/cam/pseudo_ellipse_torsionless.py
Modified:
trunk/maths_fns/frame_order.py
trunk/maths_fns/frame_order_matrix_ops.py
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/frame_order.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/frame_order.py
trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse/frame_order.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_torsionless/frame_order.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/shared_data/frame_order/cam/rotor2/pcs_only/frame_order.py
trunk/test_suite/system_tests/scripts/frame_order/cam/__init__.py
trunk/test_suite/system_tests/scripts/frame_order/cam/free_rotor.py
trunk/test_suite/system_tests/scripts/frame_order/cam/free_rotor2.py
trunk/test_suite/system_tests/scripts/frame_order/cam/iso_cone_free_rotor.py
trunk/test_suite/system_tests/scripts/frame_order/cam/iso_cone_free_rotor2.py
trunk/test_suite/system_tests/scripts/frame_order/cam/rigid.py
trunk/test_suite/system_tests/scripts/frame_order/cam/rotor.py
trunk/test_suite/system_tests/scripts/frame_order/cam/rotor2.py
trunk/test_suite/unit_tests/unit_test_runner.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=18960&r1=18959&r2=18960&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=18960&r1=18959&r2=18960&view=diff
Modified: trunk/specific_fns/frame_order.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/specific_fns/frame_order.py?rev=18960&r1=18959&r2=18960&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=18960&r1=18959&r2=18960&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=18960&r1=18959&r2=18960&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=18960&r1=18959&r2=18960&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=18960&r1=18959&r2=18960&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=18960&r1=18959&r2=18960&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=18960&r1=18959&r2=18960&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=18960&r1=18959&r2=18960&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=18960&r1=18959&r2=18960&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=18960&r1=18959&r2=18960&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=18960&r1=18959&r2=18960&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=18960&r1=18959&r2=18960&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=18960&r1=18959&r2=18960&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=18960&r1=18959&r2=18960&view=diff
Modified:
trunk/test_suite/shared_data/frame_order/cam/rotor2/pcs_only/frame_order.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/cam/rotor2/pcs_only/frame_order.py?rev=18960&r1=18959&r2=18960&view=diff
Modified: trunk/test_suite/system_tests/scripts/frame_order/cam/__init__.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/test_suite/system_tests/scripts/frame_order/cam/__init__.py?rev=18960&r1=18959&r2=18960&view=diff
Copied: trunk/test_suite/system_tests/scripts/frame_order/cam/base_script.py
(from r15282,
branches/frame_order_testing/test_suite/system_tests/scripts/frame_order/cam/base_script.py)
URL:
http://svn.gna.org/viewcvs/relax/trunk/test_suite/system_tests/scripts/frame_order/cam/base_script.py?p2=trunk/test_suite/system_tests/scripts/frame_order/cam/base_script.py&p1=branches/frame_order_testing/test_suite/system_tests/scripts/frame_order/cam/base_script.py&r1=15282&r2=18960&rev=18960&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=18960&r1=18959&r2=18960&view=diff
Modified: trunk/test_suite/system_tests/scripts/frame_order/cam/free_rotor2.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/test_suite/system_tests/scripts/frame_order/cam/free_rotor2.py?rev=18960&r1=18959&r2=18960&view=diff
Modified:
trunk/test_suite/system_tests/scripts/frame_order/cam/iso_cone_free_rotor.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/test_suite/system_tests/scripts/frame_order/cam/iso_cone_free_rotor.py?rev=18960&r1=18959&r2=18960&view=diff
Modified:
trunk/test_suite/system_tests/scripts/frame_order/cam/iso_cone_free_rotor2.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/test_suite/system_tests/scripts/frame_order/cam/iso_cone_free_rotor2.py?rev=18960&r1=18959&r2=18960&view=diff
Modified: trunk/test_suite/system_tests/scripts/frame_order/cam/rigid.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/test_suite/system_tests/scripts/frame_order/cam/rigid.py?rev=18960&r1=18959&r2=18960&view=diff
Modified: trunk/test_suite/system_tests/scripts/frame_order/cam/rotor.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/test_suite/system_tests/scripts/frame_order/cam/rotor.py?rev=18960&r1=18959&r2=18960&view=diff
Modified: trunk/test_suite/system_tests/scripts/frame_order/cam/rotor2.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/test_suite/system_tests/scripts/frame_order/cam/rotor2.py?rev=18960&r1=18959&r2=18960&view=diff
Modified: trunk/test_suite/unit_tests/unit_test_runner.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/test_suite/unit_tests/unit_test_runner.py?rev=18960&r1=18959&r2=18960&view=diff
r18960 - in /trunk: maths_fns/ specific_fns/ test_suite/shared_data/frame_order/cam/free_rotor/ test_suite/shared_data/frame...