Menu ▾ ▴

Commit [r18966]  Maximize  Restore  History

Next block of the manual merger of the frame_order_testing branch.

The commands used were:
svn merge -r15340:15341 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15341:15342 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15342:15343 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15343:15344 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15344:15345 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15345:15346 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15346:15347 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15347:15348 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15348:15349 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15349:15350 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .

The console messages were:
[edau@... relax-trunk]$ svn merge -r15340:15341 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15341 into '.':
U test_suite/shared_data/frame_order/cam/iso_cone_free_rotor/generate_distribution.py
U test_suite/shared_data/frame_order/cam/iso_cone_free_rotor/rdc_dy.txt
U test_suite/shared_data/frame_order/cam/iso_cone_free_rotor/rdc_tm.txt
U test_suite/shared_data/frame_order/cam/iso_cone_free_rotor/pcs_tb.txt
U test_suite/shared_data/frame_order/cam/iso_cone_free_rotor/pcs_er.txt
U test_suite/shared_data/frame_order/cam/iso_cone_free_rotor/pcs_dy.txt
U test_suite/shared_data/frame_order/cam/iso_cone_free_rotor/pcs_tm.txt
U test_suite/shared_data/frame_order/cam/iso_cone_free_rotor/generate_distribution.log.bz2
U test_suite/shared_data/frame_order/cam/iso_cone_free_rotor/frame_order_matrix
U test_suite/shared_data/frame_order/cam/iso_cone_free_rotor/rdc_tb.txt
U test_suite/shared_data/frame_order/cam/iso_cone_free_rotor/rdc_er.txt
[edau@... relax-trunk]$ svn merge -r15341:15342 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15342 into '.':
U test_suite/shared_data/frame_order/cam/opt_stats
[edau@... relax-trunk]$ svn merge -r15342:15343 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15343 into '.':
U test_suite/system_tests/scripts/frame_order/cam/iso_cone.py
U test_suite/system_tests/scripts/frame_order/cam/iso_cone_free_rotor.py
[edau@... relax-trunk]$ svn merge -r15343:15344 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15344 into '.':
U test_suite/shared_data/frame_order/cam/iso_cone_free_rotor2/generate_distribution.py
U test_suite/shared_data/frame_order/cam/iso_cone_free_rotor2/rdc_dy.txt
U test_suite/shared_data/frame_order/cam/iso_cone_free_rotor2/rdc_tm.txt
U test_suite/shared_data/frame_order/cam/iso_cone_free_rotor2/pcs_tb.txt
U test_suite/shared_data/frame_order/cam/iso_cone_free_rotor2/pcs_er.txt
U test_suite/shared_data/frame_order/cam/iso_cone_free_rotor2/pcs_dy.txt
U test_suite/shared_data/frame_order/cam/iso_cone_free_rotor2/pcs_tm.txt
U test_suite/shared_data/frame_order/cam/iso_cone_free_rotor2/generate_distribution.log.bz2
U test_suite/shared_data/frame_order/cam/iso_cone_free_rotor2/frame_order_matrix
U test_suite/shared_data/frame_order/cam/iso_cone_free_rotor2/rdc_tb.txt
U test_suite/shared_data/frame_order/cam/iso_cone_free_rotor2/rdc_er.txt
[edau@... relax-trunk]$ svn merge -r15344:15345 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15345 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
A test_suite/shared_data/frame_order/cam/free_rotor/generate_distribution.log.bz2
U test_suite/shared_data/frame_order/cam/free_rotor/frame_order_matrix
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
D test_suite/shared_data/frame_order/cam/free_rotor/generate_distribution.log
[edau@... relax-trunk]$ svn merge -r15345:15346 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15346 into '.':
U test_suite/shared_data/frame_order/cam/free_rotor2/generate_distribution.py
U test_suite/shared_data/frame_order/cam/free_rotor2/rdc_dy.txt
U test_suite/shared_data/frame_order/cam/free_rotor2/rdc_tm.txt
U test_suite/shared_data/frame_order/cam/free_rotor2/pcs_tb.txt
U test_suite/shared_data/frame_order/cam/free_rotor2/pcs_er.txt
U test_suite/shared_data/frame_order/cam/free_rotor2/pcs_dy.txt
U test_suite/shared_data/frame_order/cam/free_rotor2/pcs_tm.txt
A test_suite/shared_data/frame_order/cam/free_rotor2/generate_distribution.log.bz2
A test_suite/shared_data/frame_order/cam/free_rotor2/axis_system
U test_suite/shared_data/frame_order/cam/free_rotor2/axis.pdb
A test_suite/shared_data/frame_order/cam/free_rotor2/frame_order_matrix
U test_suite/shared_data/frame_order/cam/free_rotor2/rdc_tb.txt
U test_suite/shared_data/frame_order/cam/free_rotor2/rdc_er.txt
[edau@... relax-trunk]$ svn merge -r15346:15347 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15347 into '.':
U test_suite/shared_data/frame_order/cam/rotor/generate_distribution.py
U test_suite/shared_data/frame_order/cam/rotor/rdc_dy.txt
U test_suite/shared_data/frame_order/cam/rotor/rdc_tm.txt
U test_suite/shared_data/frame_order/cam/rotor/pcs_tb.txt
U test_suite/shared_data/frame_order/cam/rotor/pcs_er.txt
U test_suite/shared_data/frame_order/cam/rotor/pcs_dy.txt
U test_suite/shared_data/frame_order/cam/rotor/pcs_tm.txt
A test_suite/shared_data/frame_order/cam/rotor/generate_distribution.log.bz2
A test_suite/shared_data/frame_order/cam/rotor/axis_system
U test_suite/shared_data/frame_order/cam/rotor/axis.pdb
A test_suite/shared_data/frame_order/cam/rotor/frame_order_matrix
U test_suite/shared_data/frame_order/cam/rotor/rdc_tb.txt
U test_suite/shared_data/frame_order/cam/rotor/rdc_er.txt
D test_suite/shared_data/frame_order/cam/rotor/generate_distribution.log
[edau@... relax-trunk]$ svn merge -r15347:15348 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15348 into '.':
A extern/sobol/test.log
A extern/sobol/test.py
[edau@... relax-trunk]$ svn merge -r15348:15349 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15349 into '.':
G test_suite/shared_data/frame_order/cam/rotor/generate_distribution.py
[edau@... relax-trunk]$ svn merge -r15349:15350 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15350 into '.':
G test_suite/shared_data/frame_order/cam/free_rotor2/generate_distribution.py
[edau@... relax-trunk]$

bugman 2013-03-22

Browse code at this revision

Parent: [r18965]

Child: [r18967]

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