relax SVN archive

Next block of the manual merger of the frame_order_testing branch.

The commands used were:
svn merge -r15060:15061 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15061:15062 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15062:15063 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15063:15064 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15064:15065 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15065:15066 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15066:15067 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15067:15068 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15068:15069 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15069:15070 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .

The console messages were:
[edau@... relax-trunk]$ svn merge -r15060:15061 svn+ssh://bugman@.../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@... relax-trunk]$ svn merge -r15061:15062 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15062 into '.':
A test_suite/shared_data/frame_order/rotor2/pcs_only/frame_order.py
[edau@... relax-trunk]$ svn merge -r15062:15063 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15063 into '.':
U test_suite/shared_data/frame_order/rotor2/pcs_only/frame_order.py
[edau@... relax-trunk]$ svn merge -r15063:15064 svn+ssh://bugman@.../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@... relax-trunk]$ svn merge -r15064:15065 svn+ssh://bugman@.../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@... relax-trunk]$ svn merge -r15065:15066 svn+ssh://bugman@.../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@... relax-trunk]$ svn merge -r15066:15067 svn+ssh://bugman@.../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@... relax-trunk]$ svn merge -r15067:15068 svn+ssh://bugman@.../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@... relax-trunk]$ svn merge -r15068:15069 svn+ssh://bugman@.../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@... relax-trunk]$ svn merge -r15069:15070 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15070 into '.':
D test_suite/shared_data/frame_order/rotor2/frame_order_pcs_only.py

Next block of the manual merger of the frame_order_testing branch.

The commands used were:
svn merge -r15050:15051 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15051:15052 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15052:15053 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15053:15054 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15054:15055 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15055:15056 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15056:15057 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15057:15058 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15058:15059 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15059:15060 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .

The console messages were:

[edau@... relax-trunk]$ svn merge -r15050:15051 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15051 into '.':
U specific_fns/frame_order.py
[edau@... relax-trunk]$ svn merge -r15051:15052 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15052 into '.':
G specific_fns/frame_order.py
[edau@... relax-trunk]$ svn merge -r15052:15053 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15053 into '.':
U maths_fns/frame_order_matrix_ops.py
U maths_fns/frame_order.py
[edau@... relax-trunk]$ svn merge -r15053:15054 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15054 into '.':
G maths_fns/frame_order_matrix_ops.py
[edau@... relax-trunk]$ svn merge -r15054:15055 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15055 into '.':
G specific_fns/frame_order.py
[edau@... relax-trunk]$ svn merge -r15055:15056 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15056 into '.':
U test_suite/shared_data/frame_order/tensors.py
[edau@... relax-trunk]$ svn merge -r15056:15057 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15057 into '.':
U generic_fns/align_tensor.py
[edau@... relax-trunk]$ svn merge -r15057:15058 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
Conflict discovered in 'data/align_tensor.py'.
Select: (p) postpone, (df) diff-full, (e) edit,
(mc) mine-conflict, (tc) theirs-conflict,
(s) show all options: p
--- Merging r15058 into '.':
C data/align_tensor.py
Summary of conflicts:
Text conflicts: 1
[edau@... relax-trunk]$ svn merge -r15058:15059 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15059 into '.':
A test_suite/shared_data/frame_order/rotor2/frame_order_pcs_only.py
[edau@... relax-trunk]$ svn merge -r15059:15060 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15060 into '.':
A test_suite/shared_data/frame_order/rotor2/pcs_only
[edau@... relax-trunk]$

Next block of the manual merger of the frame_order_testing branch.

The commands used were:
svn merge -r15040:15041 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15041:15042 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15042:15043 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15043:15044 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15044:15045 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15045:15046 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15046:15047 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15047:15048 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15048:15049 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15049:15050 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .

A few missing user functions in prompt/ had to be resolved.

Next block of the manual merger of the frame_order_testing branch.

The commands used were:
svn merge -r15030:15031 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15031:15032 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15032:15033 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15033:15034 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15034:15035 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15035:15036 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15036:15037 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15037:15038 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15038:15039 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15039:15040 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .

No conflicts needed to be resolved.

Next block of the manual merger of the frame_order_testing branch.

The commands used were:
svn merge -r15024:15025 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15025:15026 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15026:15027 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15027:15028 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15028:15029 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15029:15030 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .

Again much conflict resolution was required.

Started the manual merger of the frame_order_testing branch back to trunk.

The commands used were:
svn merge -r15014:15015 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15019:15020 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15020:15021 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15021:15022 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15022:15023 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15023:15024 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .

This manual merger is required because the switch from the 1.3 line to the trunk (at r16829 and
r16830) has resulted in the svnmerge.py script being unusable. Therefore a manual and painful merge
procedure is required. Each branch revision which is not part of an svnmerge.py commit will be
manually ported, one by one. Many conflicts had to be resolved for this commit.

Removed merge tracking for "svnmerge" for
svn+ssh://bugman@.../svn/relax/branches/frame_order_testing

Initialized merge tracking via "svnmerge" with revisions "1-18938" from
svn+ssh://bugman@.../svn/relax/branches/frame_order_testing

Removed merge tracking for "svnmerge" for
svn+ssh://bugman@.../svn/relax/branches/frame_order_testing

Initialized merge tracking via "svnmerge" with revisions "1-18936" from
svn+ssh://bugman@.../svn/relax/branches/frame_order_testing