relax SVN archive

Next block of the manual merger of the frame_order_testing branch.

The commands used were:
svn merge -r15110:15111 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15111:15112 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15112:15113 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15113:15114 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15114:15115 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15115:15116 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15116:15117 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15117:15118 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15118:15119 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15119:15120 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .

The console messages were:
[edau@... relax-trunk]$ svn merge -r15110:15111 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15111 into '.':
U maths_fns/frame_order.py
[edau@... relax-trunk]$ svn merge -r15111:15112 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
Conflict discovered in 'specific_fns/frame_order.py'.
Select: (p) postpone, (df) diff-full, (e) edit,
(mc) mine-conflict, (tc) theirs-conflict,
(s) show all options: p
--- Merging r15112 into '.':
C specific_fns/frame_order.py
Summary of conflicts:
Text conflicts: 1
[edau@... relax-trunk]$ svn merge -r15112:15113 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15113 into '.':
U generic_fns/pymol_control.py
[edau@... relax-trunk]$ svn merge -r15113:15114 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
Conflict discovered in 'specific_fns/frame_order.py'.
Select: (p) postpone, (df) diff-full, (e) edit,
(mc) mine-conflict, (tc) theirs-conflict,
(s) show all options: p
--- Merging r15114 into '.':
C specific_fns/frame_order.py
Summary of conflicts:
Text conflicts: 1
[edau@... relax-trunk]$ svn merge -r15114:15115 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15115 into '.':
U test_suite/shared_data/frame_order/pseudo_ellipse/frame_order.bz2
U test_suite/shared_data/frame_order/pseudo_ellipse/cone.pdb
U test_suite/shared_data/frame_order/pseudo_ellipse/ave_pos.pdb
U test_suite/shared_data/frame_order/pseudo_ellipse/frame_order.log.bz2
U test_suite/shared_data/frame_order/pseudo_ellipse/frame_order.py
[edau@... relax-trunk]$ svn merge -r15115:15116 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15116 into '.':
U test_suite/shared_data/frame_order/pseudo_ellipse/tensors.py
U test_suite/shared_data/frame_order/pseudo_ellipse/tensor_fit.log.bz2
[edau@... relax-trunk]$ svn merge -r15116:15117 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
Conflict discovered in 'generic_fns/structure/internal.py'.
Select: (p) postpone, (df) diff-full, (e) edit,
(mc) mine-conflict, (tc) theirs-conflict,
(s) show all options: p
--- Merging r15117 into '.':
C generic_fns/structure/internal.py
Summary of conflicts:
Text conflicts: 1
[edau@... relax-trunk]$ svn merge -r15117:15118 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
Conflict discovered in 'generic_fns/structure/main.py'.
Select: (p) postpone, (df) diff-full, (e) edit,
(mc) mine-conflict, (tc) theirs-conflict,
(s) show all options: p
--- Merging r15118 into '.':
C generic_fns/structure/main.py
Summary of conflicts:
Text conflicts: 1
[edau@... relax-trunk]$ svn merge -r15118:15119 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15119 into '.':
G generic_fns/structure/internal.py
[edau@... relax-trunk]$ svn merge -r15119:15120 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
Conflict discovered in 'prompt/__init__.py'.
Select: (p) postpone, (df) diff-full, (e) edit,
(mc) mine-conflict, (tc) theirs-conflict,
(s) show all options: p
--- Merging r15120 into '.':
C prompt/__init__.py
U auto_analyses/__init__.py
Summary of conflicts:
Text conflicts: 1
[edau@... relax-trunk]$

Next block of the manual merger of the frame_order_testing branch.

The commands used were:
svn merge -r15100:15101 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15101:15102 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15102:15103 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15103:15104 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15104:15105 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15105:15106 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15106:15107 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15107:15108 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15108:15109 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15109:15110 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .

The console messages were:
[edau@... relax-trunk]$ svn merge -r15100:15101 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15101 into '.':
U test_suite/shared_data/frame_order/iso_cone/frame_order.bz2
U test_suite/shared_data/frame_order/iso_cone/rdc_dy.txt
U test_suite/shared_data/frame_order/iso_cone/tensors.py
U test_suite/shared_data/frame_order/iso_cone/rdc_tm.txt
U test_suite/shared_data/frame_order/iso_cone/tensor_fit.log.bz2
U test_suite/shared_data/frame_order/iso_cone/cone.pdb
U test_suite/shared_data/frame_order/iso_cone/pcs_tb.txt
U test_suite/shared_data/frame_order/iso_cone/pcs_er.txt
U test_suite/shared_data/frame_order/iso_cone/pcs_dy.txt
U test_suite/shared_data/frame_order/iso_cone/ave_pos.pdb
U test_suite/shared_data/frame_order/iso_cone/pcs_tm.txt
U test_suite/shared_data/frame_order/iso_cone/animate.py
U test_suite/shared_data/frame_order/iso_cone/rdc_tb.txt
U test_suite/shared_data/frame_order/iso_cone/frame_order.py
U test_suite/shared_data/frame_order/iso_cone/rdc_er.txt
[edau@... relax-trunk]$ svn merge -r15101:15102 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15102 into '.':
U relax.py
[edau@... relax-trunk]$ svn merge -r15102:15103 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15103 into '.':
U dep_check.py
[edau@... relax-trunk]$ svn merge -r15103:15104 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15104 into '.':
U maths_fns/frame_order_matrix_ops.py
U maths_fns/frame_order.py
[edau@... relax-trunk]$ svn merge -r15104:15105 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15105 into '.':
G maths_fns/frame_order_matrix_ops.py
G maths_fns/frame_order.py
[edau@... relax-trunk]$ svn merge -r15105:15106 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15106 into '.':
G maths_fns/frame_order.py
[edau@... relax-trunk]$ svn merge -r15106:15107 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15107 into '.':
U specific_fns/frame_order.py
[edau@... relax-trunk]$ svn merge -r15107:15108 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15108 into '.':
A test_suite/shared_data/frame_order/pseudo_ellipse
A test_suite/shared_data/frame_order/pseudo_ellipse/generate_distribution.py
A test_suite/shared_data/frame_order/pseudo_ellipse/frame_order.bz2
A test_suite/shared_data/frame_order/pseudo_ellipse/rdc_dy.txt
A test_suite/shared_data/frame_order/pseudo_ellipse/tensors.py
A test_suite/shared_data/frame_order/pseudo_ellipse/rdc_tm.txt
A test_suite/shared_data/frame_order/pseudo_ellipse/tensor_fit.log.bz2
A test_suite/shared_data/frame_order/pseudo_ellipse/cone.pdb
A test_suite/shared_data/frame_order/pseudo_ellipse/pcs_tb.txt
A test_suite/shared_data/frame_order/pseudo_ellipse/pcs_er.txt
A test_suite/shared_data/frame_order/pseudo_ellipse/README
A test_suite/shared_data/frame_order/pseudo_ellipse/pcs_dy.txt
A test_suite/shared_data/frame_order/pseudo_ellipse/ave_pos.pdb
A test_suite/shared_data/frame_order/pseudo_ellipse/frame_order.log.bz2
A test_suite/shared_data/frame_order/pseudo_ellipse/tensor_fit.py
A test_suite/shared_data/frame_order/pseudo_ellipse/pcs_tm.txt
A test_suite/shared_data/frame_order/pseudo_ellipse/generate_distribution.log.bz2
A test_suite/shared_data/frame_order/pseudo_ellipse/animate.py
A test_suite/shared_data/frame_order/pseudo_ellipse/axis.pdb
A test_suite/shared_data/frame_order/pseudo_ellipse/back_calc.py
A test_suite/shared_data/frame_order/pseudo_ellipse/rdc_tb.txt
A test_suite/shared_data/frame_order/pseudo_ellipse/frame_order.py
A test_suite/shared_data/frame_order/pseudo_ellipse/rdc_er.txt
[edau@... relax-trunk]$ svn merge -r15108:15109 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15109 into '.':
G maths_fns/frame_order.py
[edau@... relax-trunk]$ svn merge -r15109:15110 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15110 into '.':
G maths_fns/frame_order.py
[edau@... relax-trunk]$

Next block of the manual merger of the frame_order_testing branch.

The commands used were:
svn merge -r15090:15091 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15091:15092 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15092:15093 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15093:15094 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15094:15095 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15095:15096 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15096:15097 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15097:15098 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15098:15099 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15099:15100 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .

The console messages were:
[edau@... relax-trunk]$ svn merge -r15090:15091 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15091 into '.':
U maths_fns/frame_order.py
[edau@... relax-trunk]$ svn merge -r15091:15092 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15092 into '.':
U maths_fns/frame_order_matrix_ops.py
G maths_fns/frame_order.py
[edau@... relax-trunk]$ svn merge -r15092:15093 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15093 into '.':
G maths_fns/frame_order_matrix_ops.py
G maths_fns/frame_order.py
[edau@... relax-trunk]$ svn merge -r15093:15094 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15094 into '.':
G maths_fns/frame_order_matrix_ops.py
[edau@... relax-trunk]$ svn merge -r15094:15095 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15095 into '.':
G maths_fns/frame_order_matrix_ops.py
G maths_fns/frame_order.py
[edau@... relax-trunk]$ svn merge -r15095:15096 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15096 into '.':
U test_suite/shared_data/frame_order/iso_cone_free_rotor/back_calc.py
U test_suite/shared_data/frame_order/rotor_2_state/back_calc.py
U test_suite/shared_data/frame_order/rotor2/back_calc.py
U test_suite/shared_data/frame_order/free_rotor2/back_calc.py
U test_suite/shared_data/frame_order/iso_cone/back_calc.py
U test_suite/shared_data/frame_order/rigid/back_calc.py
U test_suite/shared_data/frame_order/rotor/back_calc.py
U test_suite/shared_data/frame_order/iso_cone_free_rotor2/back_calc.py
U test_suite/shared_data/frame_order/free_rotor/back_calc.py
[edau@... relax-trunk]$ svn merge -r15096:15097 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15097 into '.':
G maths_fns/frame_order.py
[edau@... relax-trunk]$ svn merge -r15097:15098 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15098 into '.':
G maths_fns/frame_order.py
Conflict discovered in 'specific_fns/frame_order.py'.
Select: (p) postpone, (df) diff-full, (e) edit,
(mc) mine-conflict, (tc) theirs-conflict,
(s) show all options: p
C specific_fns/frame_order.py
Summary of conflicts:
Text conflicts: 1
[edau@... relax-trunk]$ svn merge -r15098:15099 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15099 into '.':
G specific_fns/frame_order.py
[edau@... relax-trunk]$ svn merge -r15099:15100 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15100 into '.':
G maths_fns/frame_order_matrix_ops.py
[edau@... relax-trunk]$

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]$

Next block of the manual merger of the frame_order_testing branch.

The commands used were:
svn merge -r15070:15071 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15071:15072 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15072:15073 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15073:15074 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15074:15075 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15075:15076 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15076:15077 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15077:15078 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15078:15079 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15079:15080 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .

The console messages were:
[edau@... relax-trunk]$ svn merge -r15070:15071 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15071 into '.':
U specific_fns/frame_order.py
[edau@... relax-trunk]$ svn merge -r15071:15072 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15072 into '.':
U maths_fns/frame_order.py
[edau@... relax-trunk]$ svn merge -r15072:15073 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15073 into '.':
U test_suite/shared_data/frame_order/rotor2/frame_order.py
[edau@... relax-trunk]$ svn merge -r15073:15074 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15074 into '.':
G specific_fns/frame_order.py
[edau@... relax-trunk]$ svn merge -r15074:15075 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15075 into '.':
G maths_fns/frame_order.py
[edau@... relax-trunk]$ svn merge -r15075:15076 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
Conflict discovered in 'specific_fns/frame_order.py'.
Select: (p) postpone, (df) diff-full, (e) edit,
(mc) mine-conflict, (tc) theirs-conflict,
(s) show all options: p
--- Merging r15076 into '.':
C specific_fns/frame_order.py
Summary of conflicts:
Text conflicts: 1
[edau@... relax-trunk]$ svn merge -r15076:15077 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15077 into '.':
G specific_fns/frame_order.py
[edau@... relax-trunk]$ svn merge -r15077:15078 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15078 into '.':
G specific_fns/frame_order.py
[edau@... relax-trunk]$ svn merge -r15078:15079 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15079 into '.':
G specific_fns/frame_order.py
[edau@... relax-trunk]$ svn merge -r15079:15080 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15080 into '.':
U test_suite/shared_data/frame_order/rigid/frame_order.bz2
U test_suite/shared_data/frame_order/rigid/ave_pos.pdb
A test_suite/shared_data/frame_order/rigid/frame_order.log.bz2
U test_suite/shared_data/frame_order/rigid/frame_order.py
[edau@... relax-trunk]$

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.