Menu

Commit [r18948]  Maximize  Restore  History

Next block of the manual merger of the frame_order_testing branch.

The commands used were:
svn merge -r15080:15081 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15081:15082 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15082:15083 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15083:15084 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15084:15085 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15085:15086 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15086:15087 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15087:15088 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15088:15089 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15089:15090 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .

The console messages were:
[edau@... relax-trunk]$ svn merge -r15080:15081 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15081 into '.':
U specific_fns/frame_order.py
[edau@... relax-trunk]$ svn merge -r15081:15082 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15082 into '.':
U test_suite/shared_data/frame_order/rotor/frame_order.bz2
U test_suite/shared_data/frame_order/rotor/cone.pdb
U test_suite/shared_data/frame_order/rotor/ave_pos.pdb
U test_suite/shared_data/frame_order/rotor/frame_order.log.bz2
U test_suite/shared_data/frame_order/rotor/frame_order.py
[edau@... relax-trunk]$ svn merge -r15082:15083 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15083 into '.':
U test_suite/shared_data/frame_order/rotor2/frame_order.bz2
U test_suite/shared_data/frame_order/rotor2/ave_pos.pdb
U test_suite/shared_data/frame_order/rotor2/cone.pdb.gz
U test_suite/shared_data/frame_order/rotor2/frame_order.py
[edau@... relax-trunk]$ svn merge -r15083:15084 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15084 into '.':
U maths_fns/frame_order_matrix_ops.py
U maths_fns/frame_order.py
[edau@... relax-trunk]$ svn merge -r15084:15085 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15085 into '.':
U test_suite/shared_data/frame_order/free_rotor/frame_order.bz2
U test_suite/shared_data/frame_order/free_rotor/cone.pdb
U test_suite/shared_data/frame_order/free_rotor/ave_pos.pdb
U test_suite/shared_data/frame_order/free_rotor/frame_order.log.bz2
U test_suite/shared_data/frame_order/free_rotor/frame_order.py
[edau@... relax-trunk]$ svn merge -r15085:15086 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15086 into '.':
U test_suite/shared_data/frame_order/free_rotor2/frame_order.bz2
U test_suite/shared_data/frame_order/free_rotor2/cone.pdb
U test_suite/shared_data/frame_order/free_rotor2/ave_pos.pdb
U test_suite/shared_data/frame_order/free_rotor2/frame_order.log.bz2
U test_suite/shared_data/frame_order/free_rotor2/frame_order.py
[edau@... relax-trunk]$ svn merge -r15086:15087 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15087 into '.':
U test_suite/shared_data/frame_order/iso_cone_free_rotor/frame_order.py
[edau@... relax-trunk]$ svn merge -r15087:15088 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15088 into '.':
G maths_fns/frame_order_matrix_ops.py
G maths_fns/frame_order.py
[edau@... relax-trunk]$ svn merge -r15088:15089 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15089 into '.':
A test_suite/shared_data/frame_order/iso_cone
A test_suite/shared_data/frame_order/iso_cone/generate_distribution.py
A test_suite/shared_data/frame_order/iso_cone/frame_order.bz2
A test_suite/shared_data/frame_order/iso_cone/rdc_dy.txt
A test_suite/shared_data/frame_order/iso_cone/tensors.py
A test_suite/shared_data/frame_order/iso_cone/rdc_tm.txt
A test_suite/shared_data/frame_order/iso_cone/tensor_fit.log.bz2
A test_suite/shared_data/frame_order/iso_cone/cone.pdb
A test_suite/shared_data/frame_order/iso_cone/pcs_tb.txt
A test_suite/shared_data/frame_order/iso_cone/pcs_er.txt
A test_suite/shared_data/frame_order/iso_cone/README
A test_suite/shared_data/frame_order/iso_cone/pcs_dy.txt
A test_suite/shared_data/frame_order/iso_cone/ave_pos.pdb
A test_suite/shared_data/frame_order/iso_cone/frame_order.log.bz2
A test_suite/shared_data/frame_order/iso_cone/tensor_fit.py
A test_suite/shared_data/frame_order/iso_cone/pcs_tm.txt
A test_suite/shared_data/frame_order/iso_cone/generate_distribution.log.bz2
A test_suite/shared_data/frame_order/iso_cone/animate.py
A test_suite/shared_data/frame_order/iso_cone/axis.pdb
A test_suite/shared_data/frame_order/iso_cone/back_calc.py
A test_suite/shared_data/frame_order/iso_cone/rdc_tb.txt
A test_suite/shared_data/frame_order/iso_cone/frame_order.py
A test_suite/shared_data/frame_order/iso_cone/rdc_er.txt
[edau@... relax-trunk]$ svn merge -r15089:15090 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15090 into '.':
U test_suite/shared_data/frame_order/iso_cone_free_rotor2/frame_order.py
[edau@... relax-trunk]$

bugman 2013-03-22

copied /branches/frame_order_testing/test_suite/shared_data/frame_order/iso_cone -> /trunk/test_suite/shared_data/frame_order/iso_cone
changed /trunk/maths_fns/frame_order.py
changed /trunk/maths_fns/frame_order_matrix_ops.py
changed /trunk/specific_fns/frame_order.py
changed /trunk/test_suite/shared_data/frame_order/free_rotor/ave_pos.pdb
changed /trunk/test_suite/shared_data/frame_order/free_rotor/cone.pdb
changed /trunk/test_suite/shared_data/frame_order/free_rotor/frame_order.bz2
changed /trunk/test_suite/shared_data/frame_order/free_rotor/frame_order.log.bz2
changed /trunk/test_suite/shared_data/frame_order/free_rotor/frame_order.py
changed /trunk/test_suite/shared_data/frame_order/free_rotor2/ave_pos.pdb
changed /trunk/test_suite/shared_data/frame_order/free_rotor2/cone.pdb
changed /trunk/test_suite/shared_data/frame_order/free_rotor2/frame_order.bz2
changed /trunk/test_suite/shared_data/frame_order/free_rotor2/frame_order.log.bz2
changed /trunk/test_suite/shared_data/frame_order/free_rotor2/frame_order.py
changed /trunk/test_suite/shared_data/frame_order/iso_cone_free_rotor/frame_order.py
changed /trunk/test_suite/shared_data/frame_order/iso_cone_free_rotor2/frame_order.py
changed /trunk/test_suite/shared_data/frame_order/rotor/ave_pos.pdb
changed /trunk/test_suite/shared_data/frame_order/rotor/cone.pdb
changed /trunk/test_suite/shared_data/frame_order/rotor/frame_order.bz2
changed /trunk/test_suite/shared_data/frame_order/rotor/frame_order.log.bz2
changed /trunk/test_suite/shared_data/frame_order/rotor/frame_order.py
changed /trunk/test_suite/shared_data/frame_order/rotor2/ave_pos.pdb
changed /trunk/test_suite/shared_data/frame_order/rotor2/cone.pdb.gz
changed /trunk/test_suite/shared_data/frame_order/rotor2/frame_order.bz2
changed /trunk/test_suite/shared_data/frame_order/rotor2/frame_order.py
/trunk/maths_fns/frame_order.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/specific_fns/frame_order.py Diff Switch to side-by-side view
Loading...
/trunk/test_suite/shared_data/frame_order/free_rotor/ave_pos.pdb Diff Switch to side-by-side view
Loading...
/trunk/test_suite/shared_data/frame_order/free_rotor/cone.pdb Diff Switch to side-by-side view
Loading...
/trunk/test_suite/shared_data/frame_order/free_rotor/frame_order.py Diff Switch to side-by-side view
Loading...
/trunk/test_suite/shared_data/frame_order/free_rotor2/ave_pos.pdb Diff Switch to side-by-side view
Loading...
/trunk/test_suite/shared_data/frame_order/free_rotor2/cone.pdb Diff Switch to side-by-side view
Loading...
/trunk/test_suite/shared_data/frame_order/free_rotor2/frame_order.py Diff Switch to side-by-side view
Loading...
/trunk/test_suite/shared_data/frame_order/iso_cone_free_rotor/frame_order.py Diff Switch to side-by-side view
Loading...
/trunk/test_suite/shared_data/frame_order/iso_cone_free_rotor2/frame_order.py Diff Switch to side-by-side view
Loading...
/trunk/test_suite/shared_data/frame_order/rotor/ave_pos.pdb Diff Switch to side-by-side view
Loading...
/trunk/test_suite/shared_data/frame_order/rotor/cone.pdb Diff Switch to side-by-side view
Loading...
/trunk/test_suite/shared_data/frame_order/rotor/frame_order.py Diff Switch to side-by-side view
Loading...
/trunk/test_suite/shared_data/frame_order/rotor2/ave_pos.pdb Diff Switch to side-by-side view
Loading...
/trunk/test_suite/shared_data/frame_order/rotor2/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.