Menu

Commit [r18981]  Maximize  Restore  History

Next block of the manual merger of the frame_order_testing branch.

The commands used were:
svn merge -r17330:17331 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r17847:17848 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r17848:17849 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r17849:17850 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r17850:17851 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r17851:17852 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r17852:17853 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r17853:17854 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r17854:17855 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r17858:17859 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .

The console messages were:
[edau@... relax-trunk]$ svn merge -r17330:17331 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r17331 into '.':
A test_suite/unit_tests/_maths_fns/_frame_order
A test_suite/unit_tests/_maths_fns/_frame_order/__init__.py
A test_suite/unit_tests/_maths_fns/_frame_order/test_matrix_ops.py
A test_suite/unit_tests/_maths_fns/_frame_order/test_pec.py
D test_suite/unit_tests/_maths_fns/test_frame_order_matrix_ops.py
D test_suite/unit_tests/_maths_fns/test_pseudo_ellipse.py
[edau@... relax-trunk]$ svn merge -r17847:17848 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r17848 into '.':
U maths_fns/frame_order/iso_cone.py
U maths_fns/frame_order/pseudo_ellipse_torsionless.py
U maths_fns/frame_order/iso_cone_torsionless.py
U maths_fns/frame_order/rotor.py
U specific_fns/frame_order.py
U extern/sobol/sobol_lib.py
[edau@... relax-trunk]$ svn merge -r17848:17849 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r17849 into '.':
U generic_fns/structure/api_base.py
[edau@... relax-trunk]$ svn merge -r17849:17850 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r17850 into '.':
U maths_fns/frame_order/__init__.py
U maths_fns/frame_order/matrix_ops.py
G maths_fns/frame_order/rotor.py
U generic_fns/structure/internal.py
U generic_fns/align_tensor.py
G specific_fns/frame_order.py
U extern/sobol/sobol_lib-not_tested.py
U extern/sobol/sobol_test.py
G extern/sobol/sobol_lib.py
[edau@... relax-trunk]$ svn merge -r17850:17851 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r17851 into '.':
G extern/sobol/sobol_lib-not_tested.py
G extern/sobol/sobol_test.py
G extern/sobol/sobol_lib.py
[edau@... relax-trunk]$ svn merge -r17851:17852 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r17852 into '.':
G generic_fns/align_tensor.py
[edau@... relax-trunk]$ svn merge -r17852:17853 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
[edau@... relax-trunk]$ svn merge -r17853:17854 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r17854 into '.':
G specific_fns/frame_order.py
[edau@... relax-trunk]$ svn merge -r17854:17855 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r17855 into '.':
G specific_fns/frame_order.py
[edau@... relax-trunk]$ svn merge -r17858:17859 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
[edau@... relax-trunk]$

bugman 2013-03-22

copied /branches/frame_order_testing/test_suite/unit_tests/_maths_fns/_frame_order -> /trunk/test_suite/unit_tests/_maths_fns/_frame_order
changed /trunk/extern/sobol/sobol_lib-not_tested.py
changed /trunk/extern/sobol/sobol_lib.py
changed /trunk/extern/sobol/sobol_test.py
changed /trunk/generic_fns/align_tensor.py
changed /trunk/generic_fns/structure/api_base.py
changed /trunk/generic_fns/structure/internal.py
changed /trunk/maths_fns/frame_order/__init__.py
changed /trunk/maths_fns/frame_order/iso_cone.py
changed /trunk/maths_fns/frame_order/iso_cone_torsionless.py
changed /trunk/maths_fns/frame_order/matrix_ops.py
changed /trunk/maths_fns/frame_order/pseudo_ellipse_torsionless.py
changed /trunk/maths_fns/frame_order/rotor.py
changed /trunk/specific_fns/frame_order.py
removed /trunk/test_suite/unit_tests/_maths_fns/test_frame_order_matrix_ops.py
removed /trunk/test_suite/unit_tests/_maths_fns/test_pseudo_ellipse.py
/trunk/extern/sobol/sobol_lib-not_tested.py Diff Switch to side-by-side view
Loading...
/trunk/extern/sobol/sobol_lib.py Diff Switch to side-by-side view
Loading...
/trunk/extern/sobol/sobol_test.py Diff Switch to side-by-side view
Loading...
/trunk/generic_fns/align_tensor.py Diff Switch to side-by-side view
Loading...
/trunk/generic_fns/structure/api_base.py Diff Switch to side-by-side view
Loading...
/trunk/generic_fns/structure/internal.py Diff Switch to side-by-side view
Loading...
/trunk/maths_fns/frame_order/__init__.py Diff Switch to side-by-side view
Loading...
/trunk/maths_fns/frame_order/iso_cone.py Diff Switch to side-by-side view
Loading...
/trunk/maths_fns/frame_order/iso_cone_torsionless.py Diff Switch to side-by-side view
Loading...
/trunk/maths_fns/frame_order/matrix_ops.py Diff Switch to side-by-side view
Loading...
/trunk/maths_fns/frame_order/pseudo_ellipse_torsionless.py Diff Switch to side-by-side view
Loading...
/trunk/maths_fns/frame_order/rotor.py Diff Switch to side-by-side view
Loading...
/trunk/specific_fns/frame_order.py Diff Switch to side-by-side view
Loading...
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.