Menu

Commit [r18967]  Maximize  Restore  History

Next block of the manual merger of the frame_order_testing branch.

The commands used were:
svn merge -r15350:15351 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15351:15352 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15352:15353 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15353:15354 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15354:15355 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15355:15356 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15356:15357 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15357:15358 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15358:15359 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15359:15360 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .

The console messages were:
[edau@... relax-trunk]$ svn merge -r15350:15351 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15351 into '.':
U test_suite/shared_data/frame_order/cam/opt_stats
[edau@... relax-trunk]$ svn merge -r15351:15352 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15352 into '.':
U extern/sobol/test.py
[edau@... relax-trunk]$ svn merge -r15352:15353 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15353 into '.':
U maths_fns/frame_order.py
[edau@... relax-trunk]$ svn merge -r15353:15354 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15354 into '.':
U test_suite/shared_data/frame_order/cam/rotor2/generate_distribution.py
U test_suite/shared_data/frame_order/cam/rotor2/rdc_dy.txt
U test_suite/shared_data/frame_order/cam/rotor2/rdc_tm.txt
U test_suite/shared_data/frame_order/cam/rotor2/pcs_tb.txt
U test_suite/shared_data/frame_order/cam/rotor2/pcs_er.txt
U test_suite/shared_data/frame_order/cam/rotor2/pcs_dy.txt
U test_suite/shared_data/frame_order/cam/rotor2/pcs_tm.txt
A test_suite/shared_data/frame_order/cam/rotor2/generate_distribution.log.bz2
A test_suite/shared_data/frame_order/cam/rotor2/axis_system
U test_suite/shared_data/frame_order/cam/rotor2/axis.pdb
A test_suite/shared_data/frame_order/cam/rotor2/frame_order_matrix
U test_suite/shared_data/frame_order/cam/rotor2/rdc_tb.txt
U test_suite/shared_data/frame_order/cam/rotor2/rdc_er.txt
D test_suite/shared_data/frame_order/cam/rotor2/generate_distribution.log
[edau@... relax-trunk]$ svn merge -r15354:15355 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15355 into '.':
G test_suite/shared_data/frame_order/cam/opt_stats
[edau@... relax-trunk]$ svn merge -r15355:15356 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15356 into '.':
U test_suite/shared_data/frame_order/cam/pseudo_ellipse_torsionless/rdc_dy.txt
U test_suite/shared_data/frame_order/cam/pseudo_ellipse_torsionless/rdc_tm.txt
U test_suite/shared_data/frame_order/cam/pseudo_ellipse_torsionless/pcs_tb.txt
U test_suite/shared_data/frame_order/cam/pseudo_ellipse_torsionless/pcs_er.txt
U test_suite/shared_data/frame_order/cam/pseudo_ellipse_torsionless/pcs_dy.txt
U test_suite/shared_data/frame_order/cam/pseudo_ellipse_torsionless/pcs_tm.txt
U test_suite/shared_data/frame_order/cam/pseudo_ellipse_torsionless/generate_distribution.log.bz2
U test_suite/shared_data/frame_order/cam/pseudo_ellipse_torsionless/frame_order_matrix
U test_suite/shared_data/frame_order/cam/pseudo_ellipse_torsionless/rdc_tb.txt
U test_suite/shared_data/frame_order/cam/pseudo_ellipse_torsionless/rdc_er.txt
[edau@... relax-trunk]$ svn merge -r15356:15357 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15357 into '.':
U test_suite/shared_data/frame_order/cam/free_rotor/generate_distribution.py
U test_suite/shared_data/frame_order/cam/free_rotor/rdc_dy.txt
U test_suite/shared_data/frame_order/cam/free_rotor/rdc_tm.txt
U test_suite/shared_data/frame_order/cam/free_rotor/pcs_tb.txt
U test_suite/shared_data/frame_order/cam/free_rotor/pcs_er.txt
U test_suite/shared_data/frame_order/cam/free_rotor/pcs_dy.txt
U test_suite/shared_data/frame_order/cam/free_rotor/pcs_tm.txt
U test_suite/shared_data/frame_order/cam/free_rotor/generate_distribution.log.bz2
U test_suite/shared_data/frame_order/cam/free_rotor/rdc_tb.txt
U test_suite/shared_data/frame_order/cam/free_rotor/rdc_er.txt
[edau@... relax-trunk]$ svn merge -r15357:15358 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15358 into '.':
U test_suite/system_tests/scripts/frame_order/cam/rotor2.py
[edau@... relax-trunk]$ svn merge -r15358:15359 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15359 into '.':
U test_suite/system_tests/scripts/frame_order/cam/pseudo_ellipse_torsionless.py
[edau@... relax-trunk]$ svn merge -r15359:15360 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15360 into '.':
U test_suite/shared_data/frame_order/cam/rotor_2_state/generate_distribution.py
U test_suite/shared_data/frame_order/cam/rotor_2_state/rdc_dy.txt
U test_suite/shared_data/frame_order/cam/rotor_2_state/rdc_tm.txt
U test_suite/shared_data/frame_order/cam/rotor_2_state/pcs_tb.txt
U test_suite/shared_data/frame_order/cam/rotor_2_state/pcs_er.txt
U test_suite/shared_data/frame_order/cam/rotor_2_state/pcs_dy.txt
U test_suite/shared_data/frame_order/cam/rotor_2_state/pcs_tm.txt
A test_suite/shared_data/frame_order/cam/rotor_2_state/generate_distribution.log.bz2
A test_suite/shared_data/frame_order/cam/rotor_2_state/axis_system
U test_suite/shared_data/frame_order/cam/rotor_2_state/axis.pdb
A test_suite/shared_data/frame_order/cam/rotor_2_state/frame_order_matrix
U test_suite/shared_data/frame_order/cam/rotor_2_state/rdc_tb.txt
U test_suite/shared_data/frame_order/cam/rotor_2_state/rdc_er.txt
D test_suite/shared_data/frame_order/cam/rotor_2_state/generate_distribution.log
[edau@... relax-trunk]$

bugman 2013-03-22

1 2 3 > >> (Page 1 of 3)
copied /branches/frame_order_testing/test_suite/shared_data/frame_order/cam/rotor2/axis_system -> /trunk/test_suite/shared_data/frame_order/cam/rotor2/axis_system
changed /trunk/extern/sobol/test.py
changed /trunk/maths_fns/frame_order.py
changed /trunk/test_suite/shared_data/frame_order/cam/free_rotor/generate_distribution.log.bz2
changed /trunk/test_suite/shared_data/frame_order/cam/free_rotor/generate_distribution.py
changed /trunk/test_suite/shared_data/frame_order/cam/free_rotor/pcs_dy.txt
changed /trunk/test_suite/shared_data/frame_order/cam/free_rotor/pcs_er.txt
changed /trunk/test_suite/shared_data/frame_order/cam/free_rotor/pcs_tb.txt
changed /trunk/test_suite/shared_data/frame_order/cam/free_rotor/pcs_tm.txt
changed /trunk/test_suite/shared_data/frame_order/cam/free_rotor/rdc_dy.txt
changed /trunk/test_suite/shared_data/frame_order/cam/free_rotor/rdc_er.txt
changed /trunk/test_suite/shared_data/frame_order/cam/free_rotor/rdc_tb.txt
changed /trunk/test_suite/shared_data/frame_order/cam/free_rotor/rdc_tm.txt
changed /trunk/test_suite/shared_data/frame_order/cam/opt_stats
changed /trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse_torsionless/frame_order_matrix
changed /trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse_torsionless/generate_distribution.log.bz2
changed /trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse_torsionless/pcs_dy.txt
changed /trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse_torsionless/pcs_er.txt
changed /trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse_torsionless/pcs_tb.txt
changed /trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse_torsionless/pcs_tm.txt
changed /trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse_torsionless/rdc_dy.txt
changed /trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse_torsionless/rdc_er.txt
changed /trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse_torsionless/rdc_tb.txt
changed /trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse_torsionless/rdc_tm.txt
changed /trunk/test_suite/shared_data/frame_order/cam/rotor2/axis.pdb
/trunk/extern/sobol/test.py Diff Switch to side-by-side view
Loading...
/trunk/maths_fns/frame_order.py Diff Switch to side-by-side view
Loading...
/trunk/test_suite/shared_data/frame_order/cam/free_rotor/generate_distribution.py Diff Switch to side-by-side view
Loading...
/trunk/test_suite/shared_data/frame_order/cam/free_rotor/pcs_dy.txt Diff Switch to side-by-side view
Loading...
/trunk/test_suite/shared_data/frame_order/cam/free_rotor/pcs_er.txt Diff Switch to side-by-side view
Loading...
/trunk/test_suite/shared_data/frame_order/cam/free_rotor/pcs_tb.txt Diff Switch to side-by-side view
Loading...
/trunk/test_suite/shared_data/frame_order/cam/free_rotor/pcs_tm.txt Diff Switch to side-by-side view
Loading...
/trunk/test_suite/shared_data/frame_order/cam/free_rotor/rdc_dy.txt Diff Switch to side-by-side view
Loading...
/trunk/test_suite/shared_data/frame_order/cam/free_rotor/rdc_er.txt Diff Switch to side-by-side view
Loading...
/trunk/test_suite/shared_data/frame_order/cam/free_rotor/rdc_tb.txt Diff Switch to side-by-side view
Loading...
/trunk/test_suite/shared_data/frame_order/cam/free_rotor/rdc_tm.txt Diff Switch to side-by-side view
Loading...
/trunk/test_suite/shared_data/frame_order/cam/opt_stats Diff Switch to side-by-side view
Loading...
/trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse_torsionless/frame_order_matrix Diff Switch to side-by-side view
Loading...
/trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse_torsionless/pcs_dy.txt Diff Switch to side-by-side view
Loading...
/trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse_torsionless/pcs_er.txt Diff Switch to side-by-side view
Loading...
/trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse_torsionless/pcs_tb.txt Diff Switch to side-by-side view
Loading...
/trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse_torsionless/pcs_tm.txt Diff Switch to side-by-side view
Loading...
/trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse_torsionless/rdc_dy.txt Diff Switch to side-by-side view
Loading...
/trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse_torsionless/rdc_er.txt Diff Switch to side-by-side view
Loading...
/trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse_torsionless/rdc_tb.txt Diff Switch to side-by-side view
Loading...
/trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse_torsionless/rdc_tm.txt Diff Switch to side-by-side view
Loading...
/trunk/test_suite/shared_data/frame_order/cam/rotor2/axis.pdb Diff Switch to side-by-side view
Loading...
1 2 3 > >> (Page 1 of 3)
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.