Author: bugman
Date: Fri Mar 22 11:56:17 2013
New Revision: 18946
URL: http://svn.gna.org/viewcvs/relax?rev=18946&view=rev
Log:
Next block of the manual merger of the frame_order_testing branch.
The commands used were:
svn merge -r15060:15061
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r15061:15062
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r15062:15063
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r15063:15064
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r15064:15065
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r15065:15066
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r15066:15067
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r15067:15068
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r15068:15069
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r15069:15070
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
The console messages were:
[edau@localhost relax-trunk]$ svn merge -r15060:15061
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r15061 into '.':
A test_suite/shared_data/frame_order/rotor2/pcs_only/ave_pos_back_calc.py
[edau@localhost relax-trunk]$ svn merge -r15061:15062
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r15062 into '.':
A test_suite/shared_data/frame_order/rotor2/pcs_only/frame_order.py
[edau@localhost relax-trunk]$ svn merge -r15062:15063
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r15063 into '.':
U test_suite/shared_data/frame_order/rotor2/pcs_only/frame_order.py
[edau@localhost relax-trunk]$ svn merge -r15063:15064
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r15064 into '.':
A test_suite/shared_data/frame_order/rotor2/pcs_only/ave_pos.pdb
A test_suite/shared_data/frame_order/rotor2/pcs_only/frame_order.bz2
A test_suite/shared_data/frame_order/rotor2/pcs_only/frame_order.log.bz2
U test_suite/shared_data/frame_order/rotor2/pcs_only/ave_pos_back_calc.py
A test_suite/shared_data/frame_order/rotor2/pcs_only/cone.pdb
[edau@localhost relax-trunk]$ svn merge -r15064:15065
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r15065 into '.':
G test_suite/shared_data/frame_order/rotor2/pcs_only/ave_pos_back_calc.py
[edau@localhost relax-trunk]$ svn merge -r15065:15066
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r15066 into '.':
G test_suite/shared_data/frame_order/rotor2/pcs_only/ave_pos_back_calc.py
[edau@localhost relax-trunk]$ svn merge -r15066:15067
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
Conflict discovered in 'generic_fns/align_tensor.py'.
Select: (p) postpone, (df) diff-full, (e) edit,
(mc) mine-conflict, (tc) theirs-conflict,
(s) show all options: p
--- Merging r15067 into '.':
C generic_fns/align_tensor.py
Conflict discovered in 'generic_fns/rdc.py'.
Select: (p) postpone, (df) diff-full, (e) edit,
(mc) mine-conflict, (tc) theirs-conflict,
(s) show all options: p
C generic_fns/rdc.py
U generic_fns/pcs.py
Summary of conflicts:
Text conflicts: 2
[edau@localhost relax-trunk]$ svn merge -r15067:15068
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r15068 into '.':
A test_suite/shared_data/frame_order/rotor2/pcs_only/ave_pos_pcs_tm.txt
G test_suite/shared_data/frame_order/rotor2/pcs_only/ave_pos_back_calc.py
A test_suite/shared_data/frame_order/rotor2/pcs_only/ave_pos_rdc_tb.txt
A test_suite/shared_data/frame_order/rotor2/pcs_only/ave_pos_rdc_er.txt
A test_suite/shared_data/frame_order/rotor2/pcs_only/ave_pos_back_calc.bz2
A test_suite/shared_data/frame_order/rotor2/pcs_only/rdc_comp.agr
A test_suite/shared_data/frame_order/rotor2/pcs_only/ave_pos_rdc_dy.txt
A test_suite/shared_data/frame_order/rotor2/pcs_only/ave_pos_rdc_tm.txt
A test_suite/shared_data/frame_order/rotor2/pcs_only/ave_pos_pcs_tb.txt
A test_suite/shared_data/frame_order/rotor2/pcs_only/ave_pos_pcs_er.txt
A test_suite/shared_data/frame_order/rotor2/pcs_only/ave_pos_pcs_dy.txt
A test_suite/shared_data/frame_order/rotor2/pcs_only/pcs_comp.agr
[edau@localhost relax-trunk]$ svn merge -r15068:15069
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r15069 into '.':
U test_suite/shared_data/frame_order/rotor2/pcs_only/frame_order.bz2
A test_suite/shared_data/frame_order/rotor2/pcs_only/animate.py
G test_suite/shared_data/frame_order/rotor2/pcs_only/frame_order.py
[edau@localhost relax-trunk]$ svn merge -r15069:15070
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r15070 into '.':
D test_suite/shared_data/frame_order/rotor2/frame_order_pcs_only.py
Added:
trunk/test_suite/shared_data/frame_order/rotor2/pcs_only/animate.py
- copied unchanged from r15069,
branches/frame_order_testing/test_suite/shared_data/frame_order/rotor2/pcs_only/animate.py
trunk/test_suite/shared_data/frame_order/rotor2/pcs_only/ave_pos.pdb
- copied unchanged from r15064,
branches/frame_order_testing/test_suite/shared_data/frame_order/rotor2/pcs_only/ave_pos.pdb
trunk/test_suite/shared_data/frame_order/rotor2/pcs_only/ave_pos_back_calc.bz2
- copied unchanged from r15068,
branches/frame_order_testing/test_suite/shared_data/frame_order/rotor2/pcs_only/ave_pos_back_calc.bz2
trunk/test_suite/shared_data/frame_order/rotor2/pcs_only/ave_pos_back_calc.py
- copied, changed from r15061,
branches/frame_order_testing/test_suite/shared_data/frame_order/rotor2/pcs_only/ave_pos_back_calc.py
trunk/test_suite/shared_data/frame_order/rotor2/pcs_only/ave_pos_pcs_dy.txt
- copied unchanged from r15068,
branches/frame_order_testing/test_suite/shared_data/frame_order/rotor2/pcs_only/ave_pos_pcs_dy.txt
trunk/test_suite/shared_data/frame_order/rotor2/pcs_only/ave_pos_pcs_er.txt
- copied unchanged from r15068,
branches/frame_order_testing/test_suite/shared_data/frame_order/rotor2/pcs_only/ave_pos_pcs_er.txt
trunk/test_suite/shared_data/frame_order/rotor2/pcs_only/ave_pos_pcs_tb.txt
- copied unchanged from r15068,
branches/frame_order_testing/test_suite/shared_data/frame_order/rotor2/pcs_only/ave_pos_pcs_tb.txt
trunk/test_suite/shared_data/frame_order/rotor2/pcs_only/ave_pos_pcs_tm.txt
- copied unchanged from r15068,
branches/frame_order_testing/test_suite/shared_data/frame_order/rotor2/pcs_only/ave_pos_pcs_tm.txt
trunk/test_suite/shared_data/frame_order/rotor2/pcs_only/ave_pos_rdc_dy.txt
- copied unchanged from r15068,
branches/frame_order_testing/test_suite/shared_data/frame_order/rotor2/pcs_only/ave_pos_rdc_dy.txt
trunk/test_suite/shared_data/frame_order/rotor2/pcs_only/ave_pos_rdc_er.txt
- copied unchanged from r15068,
branches/frame_order_testing/test_suite/shared_data/frame_order/rotor2/pcs_only/ave_pos_rdc_er.txt
trunk/test_suite/shared_data/frame_order/rotor2/pcs_only/ave_pos_rdc_tb.txt
- copied unchanged from r15068,
branches/frame_order_testing/test_suite/shared_data/frame_order/rotor2/pcs_only/ave_pos_rdc_tb.txt
trunk/test_suite/shared_data/frame_order/rotor2/pcs_only/ave_pos_rdc_tm.txt
- copied unchanged from r15068,
branches/frame_order_testing/test_suite/shared_data/frame_order/rotor2/pcs_only/ave_pos_rdc_tm.txt
trunk/test_suite/shared_data/frame_order/rotor2/pcs_only/cone.pdb
- copied unchanged from r15064,
branches/frame_order_testing/test_suite/shared_data/frame_order/rotor2/pcs_only/cone.pdb
trunk/test_suite/shared_data/frame_order/rotor2/pcs_only/frame_order.bz2
- copied, changed from r15064,
branches/frame_order_testing/test_suite/shared_data/frame_order/rotor2/pcs_only/frame_order.bz2
trunk/test_suite/shared_data/frame_order/rotor2/pcs_only/frame_order.log.bz2
- copied unchanged from r15064,
branches/frame_order_testing/test_suite/shared_data/frame_order/rotor2/pcs_only/frame_order.log.bz2
trunk/test_suite/shared_data/frame_order/rotor2/pcs_only/frame_order.py
- copied, changed from r15062,
branches/frame_order_testing/test_suite/shared_data/frame_order/rotor2/pcs_only/frame_order.py
trunk/test_suite/shared_data/frame_order/rotor2/pcs_only/pcs_comp.agr
- copied unchanged from r15068,
branches/frame_order_testing/test_suite/shared_data/frame_order/rotor2/pcs_only/pcs_comp.agr
trunk/test_suite/shared_data/frame_order/rotor2/pcs_only/rdc_comp.agr
- copied unchanged from r15068,
branches/frame_order_testing/test_suite/shared_data/frame_order/rotor2/pcs_only/rdc_comp.agr
Removed:
trunk/test_suite/shared_data/frame_order/rotor2/frame_order_pcs_only.py
Modified:
trunk/generic_fns/align_tensor.py
trunk/generic_fns/pcs.py
trunk/generic_fns/rdc.py
[This mail would be too long, it was shortened to contain the URLs only.]
Modified: trunk/generic_fns/align_tensor.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/generic_fns/align_tensor.py?rev=18946&r1=18945&r2=18946&view=diff
Modified: trunk/generic_fns/pcs.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/generic_fns/pcs.py?rev=18946&r1=18945&r2=18946&view=diff
Modified: trunk/generic_fns/rdc.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/generic_fns/rdc.py?rev=18946&r1=18945&r2=18946&view=diff
Removed:
trunk/test_suite/shared_data/frame_order/rotor2/frame_order_pcs_only.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/rotor2/frame_order_pcs_only.py?rev=18945&view=auto
Copied:
trunk/test_suite/shared_data/frame_order/rotor2/pcs_only/ave_pos_back_calc.py
(from r15061,
branches/frame_order_testing/test_suite/shared_data/frame_order/rotor2/pcs_only/ave_pos_back_calc.py)
URL:
http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/rotor2/pcs_only/ave_pos_back_calc.py?p2=trunk/test_suite/shared_data/frame_order/rotor2/pcs_only/ave_pos_back_calc.py&p1=branches/frame_order_testing/test_suite/shared_data/frame_order/rotor2/pcs_only/ave_pos_back_calc.py&r1=15061&r2=18946&rev=18946&view=diff
Copied:
trunk/test_suite/shared_data/frame_order/rotor2/pcs_only/frame_order.bz2
(from r15064,
branches/frame_order_testing/test_suite/shared_data/frame_order/rotor2/pcs_only/frame_order.bz2)
URL:
http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/rotor2/pcs_only/frame_order.bz2?p2=trunk/test_suite/shared_data/frame_order/rotor2/pcs_only/frame_order.bz2&p1=branches/frame_order_testing/test_suite/shared_data/frame_order/rotor2/pcs_only/frame_order.bz2&r1=15064&r2=18946&rev=18946&view=diff
Copied:
trunk/test_suite/shared_data/frame_order/rotor2/pcs_only/frame_order.py (from
r15062,
branches/frame_order_testing/test_suite/shared_data/frame_order/rotor2/pcs_only/frame_order.py)
URL:
http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/rotor2/pcs_only/frame_order.py?p2=trunk/test_suite/shared_data/frame_order/rotor2/pcs_only/frame_order.py&p1=branches/frame_order_testing/test_suite/shared_data/frame_order/rotor2/pcs_only/frame_order.py&r1=15062&r2=18946&rev=18946&view=diff
r18946 - in /trunk: generic_fns/ test_suite/shared_data/frame_order/rotor2/ test_suite/shared_data/frame_order/rotor2/pcs_only/