Menu

Commit [r18996]  Maximize  Restore  History

Next block of the manual merger of the frame_order_testing branch.

The commands used were:
svn merge -r18600:18601 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18601:18602 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18602:18603 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18610:18611 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18613:18614 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18614:18615 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18615:18616 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18616:18617 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18617:18618 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18618:18619 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .

The console messages were:
[edau@... relax-trunk]$ svn merge -r18600:18601 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18601 into '.':
U test_suite/shared_data/frame_order/cam/full_analysis.py
[edau@... relax-trunk]$ svn merge -r18601:18602 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18602 into '.':
A test_suite/shared_data/frame_order/cam/1J7P_1st_NH_rot_trans.pdb
[edau@... relax-trunk]$ svn merge -r18602:18603 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18603 into '.':
A test_suite/shared_data/frame_order/cam/displacements.py
[edau@... relax-trunk]$ svn merge -r18610:18611 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18611 into '.':
A test_suite/shared_data/frame_order/displacements
A test_suite/shared_data/frame_order/displacements/create_pdb.py
A test_suite/shared_data/frame_order/displacements/rdc_yb.txt
A test_suite/shared_data/frame_order/displacements/rdc_dy.txt
A test_suite/shared_data/frame_order/displacements/rdc_tm.txt
A test_suite/shared_data/frame_order/displacements/pcs_tb.txt
A test_suite/shared_data/frame_order/displacements/pcs_er.txt
A test_suite/shared_data/frame_order/displacements/pcs_ho.txt
A test_suite/shared_data/frame_order/displacements/displaced.pdb
A test_suite/shared_data/frame_order/displacements/pcs_yb.txt
A test_suite/shared_data/frame_order/displacements/pcs_dy.txt
A test_suite/shared_data/frame_order/displacements/pcs_tm.txt
A test_suite/shared_data/frame_order/displacements/generate_data.py
A test_suite/shared_data/frame_order/displacements/displace.py
A test_suite/shared_data/frame_order/displacements/fancy_mol.pdb
A test_suite/shared_data/frame_order/displacements/rdc_tb.txt
A test_suite/shared_data/frame_order/displacements/rdc_ho.txt
A test_suite/shared_data/frame_order/displacements/rdc_er.txt
[edau@... relax-trunk]$ svn merge -r18613:18614 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18614 into '.':
U test_suite/shared_data/frame_order/displacements/rdc_yb.txt
U test_suite/shared_data/frame_order/displacements/rdc_dy.txt
U test_suite/shared_data/frame_order/displacements/rdc_tm.txt
U test_suite/shared_data/frame_order/displacements/pcs_tb.txt
U test_suite/shared_data/frame_order/displacements/pcs_er.txt
U test_suite/shared_data/frame_order/displacements/pcs_ho.txt
U test_suite/shared_data/frame_order/displacements/pcs_yb.txt
U test_suite/shared_data/frame_order/displacements/pcs_dy.txt
U test_suite/shared_data/frame_order/displacements/pcs_tm.txt
U test_suite/shared_data/frame_order/displacements/generate_data.py
U test_suite/shared_data/frame_order/displacements/rdc_tb.txt
U test_suite/shared_data/frame_order/displacements/rdc_ho.txt
U test_suite/shared_data/frame_order/displacements/rdc_er.txt
[edau@... relax-trunk]$ svn merge -r18614:18615 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18615 into '.':
U test_suite/shared_data/frame_order/displacements/displace.py
[edau@... relax-trunk]$ svn merge -r18615:18616 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18616 into '.':
A test_suite/shared_data/frame_order/displacements/rigid_test.py
[edau@... relax-trunk]$ svn merge -r18616:18617 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18617 into '.':
U test_suite/shared_data/frame_order/displacements/rigid_test.py
[edau@... relax-trunk]$ svn merge -r18617:18618 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18618 into '.':
U maths_fns/frame_order/__init__.py
U specific_fns/frame_order.py
[edau@... relax-trunk]$ svn merge -r18618:18619 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18619 into '.':
G maths_fns/frame_order/__init__.py
[edau@... relax-trunk]$

bugman 2013-03-22

copied /branches/frame_order_testing/test_suite/shared_data/frame_order/cam/1J7P_1st_NH_rot_trans.pdb -> /trunk/test_suite/shared_data/frame_order/cam/1J7P_1st_NH_rot_trans.pdb
copied /branches/frame_order_testing/test_suite/shared_data/frame_order/cam/displacements.py -> /trunk/test_suite/shared_data/frame_order/cam/displacements.py
copied /branches/frame_order_testing/test_suite/shared_data/frame_order/displacements -> /trunk/test_suite/shared_data/frame_order/displacements
copied /branches/frame_order_testing/test_suite/shared_data/frame_order/displacements/rigid_test.py -> /trunk/test_suite/shared_data/frame_order/displacements/rigid_test.py
changed /trunk/maths_fns/frame_order/__init__.py
changed /trunk/specific_fns/frame_order.py
changed /trunk/test_suite/shared_data/frame_order/cam/full_analysis.py
changed /trunk/test_suite/shared_data/frame_order/displacements/displace.py
changed /trunk/test_suite/shared_data/frame_order/displacements/generate_data.py
changed /trunk/test_suite/shared_data/frame_order/displacements/pcs_dy.txt
changed /trunk/test_suite/shared_data/frame_order/displacements/pcs_er.txt
changed /trunk/test_suite/shared_data/frame_order/displacements/pcs_ho.txt
changed /trunk/test_suite/shared_data/frame_order/displacements/pcs_tb.txt
changed /trunk/test_suite/shared_data/frame_order/displacements/pcs_tm.txt
changed /trunk/test_suite/shared_data/frame_order/displacements/pcs_yb.txt
changed /trunk/test_suite/shared_data/frame_order/displacements/rdc_dy.txt
changed /trunk/test_suite/shared_data/frame_order/displacements/rdc_er.txt
changed /trunk/test_suite/shared_data/frame_order/displacements/rdc_ho.txt
changed /trunk/test_suite/shared_data/frame_order/displacements/rdc_tb.txt
changed /trunk/test_suite/shared_data/frame_order/displacements/rdc_tm.txt
changed /trunk/test_suite/shared_data/frame_order/displacements/rdc_yb.txt
/trunk/maths_fns/frame_order/__init__.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/cam/full_analysis.py Diff Switch to side-by-side view
Loading...
/trunk/test_suite/shared_data/frame_order/displacements/displace.py Diff Switch to side-by-side view
Loading...
/trunk/test_suite/shared_data/frame_order/displacements/generate_data.py Diff Switch to side-by-side view
Loading...
/trunk/test_suite/shared_data/frame_order/displacements/pcs_dy.txt Diff Switch to side-by-side view
Loading...
/trunk/test_suite/shared_data/frame_order/displacements/pcs_er.txt Diff Switch to side-by-side view
Loading...
/trunk/test_suite/shared_data/frame_order/displacements/pcs_ho.txt Diff Switch to side-by-side view
Loading...
/trunk/test_suite/shared_data/frame_order/displacements/pcs_tb.txt Diff Switch to side-by-side view
Loading...
/trunk/test_suite/shared_data/frame_order/displacements/pcs_tm.txt Diff Switch to side-by-side view
Loading...
/trunk/test_suite/shared_data/frame_order/displacements/pcs_yb.txt Diff Switch to side-by-side view
Loading...
/trunk/test_suite/shared_data/frame_order/displacements/rdc_dy.txt Diff Switch to side-by-side view
Loading...
/trunk/test_suite/shared_data/frame_order/displacements/rdc_er.txt Diff Switch to side-by-side view
Loading...
/trunk/test_suite/shared_data/frame_order/displacements/rdc_ho.txt Diff Switch to side-by-side view
Loading...
/trunk/test_suite/shared_data/frame_order/displacements/rdc_tb.txt Diff Switch to side-by-side view
Loading...
/trunk/test_suite/shared_data/frame_order/displacements/rdc_tm.txt Diff Switch to side-by-side view
Loading...
/trunk/test_suite/shared_data/frame_order/displacements/rdc_yb.txt 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.