The commands used were:
svn merge -r15160:15161 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15161:15162 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15162:15163 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15163:15164 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15208:15209 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15209:15210 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15215:15216 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15216:15217 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15217:15218 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15218:15219 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
The console messages were:
[edau@... relax-trunk]$ svn merge -r15160:15161 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15161 into '.':
U test_suite/shared_data/frame_order/iso_cone_free_rotor/generate_distribution.py
[edau@... relax-trunk]$ svn merge -r15161:15162 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15162 into '.':
U test_suite/shared_data/frame_order/iso_cone_free_rotor/animate.py
[edau@... relax-trunk]$ svn merge -r15162:15163 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15163 into '.':
U test_suite/shared_data/frame_order/iso_cone_torsionless/generate_distribution.py
U test_suite/shared_data/frame_order/iso_cone_torsionless/frame_order.bz2
U test_suite/shared_data/frame_order/iso_cone_torsionless/rdc_dy.txt
U test_suite/shared_data/frame_order/iso_cone_torsionless/tensors.py
U test_suite/shared_data/frame_order/iso_cone_torsionless/rdc_tm.txt
U test_suite/shared_data/frame_order/iso_cone_torsionless/tensor_fit.log.bz2
U test_suite/shared_data/frame_order/iso_cone_torsionless/cone.pdb
U test_suite/shared_data/frame_order/iso_cone_torsionless/pcs_tb.txt
U test_suite/shared_data/frame_order/iso_cone_torsionless/pcs_er.txt
U test_suite/shared_data/frame_order/iso_cone_torsionless/pcs_dy.txt
U test_suite/shared_data/frame_order/iso_cone_torsionless/ave_pos.pdb
U test_suite/shared_data/frame_order/iso_cone_torsionless/frame_order.log.bz2
U test_suite/shared_data/frame_order/iso_cone_torsionless/pcs_tm.txt
U test_suite/shared_data/frame_order/iso_cone_torsionless/generate_distribution.log.bz2
U test_suite/shared_data/frame_order/iso_cone_torsionless/rdc_tb.txt
U test_suite/shared_data/frame_order/iso_cone_torsionless/frame_order.py
U test_suite/shared_data/frame_order/iso_cone_torsionless/rdc_er.txt
[edau@... relax-trunk]$ svn merge -r15163:15164 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15164 into '.':
U test_suite/shared_data/frame_order/iso_cone/generate_distribution.py
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/frame_order.log.bz2
U test_suite/shared_data/frame_order/iso_cone/pcs_tm.txt
U test_suite/shared_data/frame_order/iso_cone/generate_distribution.log.bz2
U test_suite/shared_data/frame_order/iso_cone/rdc_tb.txt
U test_suite/shared_data/frame_order/iso_cone/rdc_er.txt
[edau@... relax-trunk]$ svn merge -r15208:15209 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15209 into '.':
U maths_fns/frame_order_matrix_ops.py
U maths_fns/frame_order.py
[edau@... relax-trunk]$ svn merge -r15209:15210 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15210 into '.':
U test_suite/shared_data/frame_order/pseudo_ellipse/frame_order.py
[edau@... relax-trunk]$ svn merge -r15215:15216 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15216 into '.':
A test_suite/shared_data/frame_order/cam
[edau@... relax-trunk]$ svn merge -r15216:15217 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15217 into '.':
A test_suite/shared_data/frame_order/cam/pseudo_ellipse_torsionless
A test_suite/shared_data/frame_order/cam/pseudo_ellipse_torsionless/generate_distribution.py
A test_suite/shared_data/frame_order/cam/pseudo_ellipse_torsionless/frame_order.bz2
A test_suite/shared_data/frame_order/cam/pseudo_ellipse_torsionless/rdc_dy.txt
A test_suite/shared_data/frame_order/cam/pseudo_ellipse_torsionless/tensors.py
A test_suite/shared_data/frame_order/cam/pseudo_ellipse_torsionless/rdc_tm.txt
A test_suite/shared_data/frame_order/cam/pseudo_ellipse_torsionless/tensor_fit.log.bz2
A test_suite/shared_data/frame_order/cam/pseudo_ellipse_torsionless/cone.pdb
A test_suite/shared_data/frame_order/cam/pseudo_ellipse_torsionless/pcs_tb.txt
A test_suite/shared_data/frame_order/cam/pseudo_ellipse_torsionless/pcs_er.txt
A test_suite/shared_data/frame_order/cam/pseudo_ellipse_torsionless/README
A test_suite/shared_data/frame_order/cam/pseudo_ellipse_torsionless/pcs_dy.txt
A test_suite/shared_data/frame_order/cam/pseudo_ellipse_torsionless/ave_pos.pdb
A test_suite/shared_data/frame_order/cam/pseudo_ellipse_torsionless/frame_order.log.bz2
A test_suite/shared_data/frame_order/cam/pseudo_ellipse_torsionless/tensor_fit.py
A test_suite/shared_data/frame_order/cam/pseudo_ellipse_torsionless/pcs_tm.txt
A test_suite/shared_data/frame_order/cam/pseudo_ellipse_torsionless/generate_distribution.log.bz2
A test_suite/shared_data/frame_order/cam/pseudo_ellipse_torsionless/animate.py
A test_suite/shared_data/frame_order/cam/pseudo_ellipse_torsionless/axis.pdb
A test_suite/shared_data/frame_order/cam/pseudo_ellipse_torsionless/back_calc.py
A test_suite/shared_data/frame_order/cam/pseudo_ellipse_torsionless/rdc_tb.txt
A test_suite/shared_data/frame_order/cam/pseudo_ellipse_torsionless/frame_order.py
A test_suite/shared_data/frame_order/cam/pseudo_ellipse_torsionless/rdc_er.txt
A test_suite/shared_data/frame_order/cam/iso_cone_free_rotor
A test_suite/shared_data/frame_order/cam/iso_cone_free_rotor/generate_distribution.py
A test_suite/shared_data/frame_order/cam/iso_cone_free_rotor/frame_order.bz2
A test_suite/shared_data/frame_order/cam/iso_cone_free_rotor/rdc_dy.txt
A test_suite/shared_data/frame_order/cam/iso_cone_free_rotor/tensors.py
A test_suite/shared_data/frame_order/cam/iso_cone_free_rotor/rdc_tm.txt
A test_suite/shared_data/frame_order/cam/iso_cone_free_rotor/tensor_fit.log.bz2
A test_suite/shared_data/frame_order/cam/iso_cone_free_rotor/cone.pdb
A test_suite/shared_data/frame_order/cam/iso_cone_free_rotor/pcs_tb.txt
A test_suite/shared_data/frame_order/cam/iso_cone_free_rotor/pcs_er.txt
A test_suite/shared_data/frame_order/cam/iso_cone_free_rotor/README
A test_suite/shared_data/frame_order/cam/iso_cone_free_rotor/pcs_dy.txt
A test_suite/shared_data/frame_order/cam/iso_cone_free_rotor/ave_pos.pdb
A test_suite/shared_data/frame_order/cam/iso_cone_free_rotor/frame_order.log.bz2
A test_suite/shared_data/frame_order/cam/iso_cone_free_rotor/tensor_fit.py
A test_suite/shared_data/frame_order/cam/iso_cone_free_rotor/pcs_tm.txt
A test_suite/shared_data/frame_order/cam/iso_cone_free_rotor/generate_distribution.log.bz2
A test_suite/shared_data/frame_order/cam/iso_cone_free_rotor/animate.py
A test_suite/shared_data/frame_order/cam/iso_cone_free_rotor/axis.pdb
A test_suite/shared_data/frame_order/cam/iso_cone_free_rotor/back_calc.py
A test_suite/shared_data/frame_order/cam/iso_cone_free_rotor/rdc_tb.txt
A test_suite/shared_data/frame_order/cam/iso_cone_free_rotor/frame_order.py
A test_suite/shared_data/frame_order/cam/iso_cone_free_rotor/rdc_er.txt
A test_suite/shared_data/frame_order/cam/1J7P_1st_NH_rot.pdb
A test_suite/shared_data/frame_order/cam/rotor_2_state
A test_suite/shared_data/frame_order/cam/rotor_2_state/generate_distribution.py
A test_suite/shared_data/frame_order/cam/rotor_2_state/frame_order.bz2
A test_suite/shared_data/frame_order/cam/rotor_2_state/rdc_dy.txt
A test_suite/shared_data/frame_order/cam/rotor_2_state/tensors.py
A test_suite/shared_data/frame_order/cam/rotor_2_state/rdc_tm.txt
A test_suite/shared_data/frame_order/cam/rotor_2_state/tensor_fit.log.bz2
A test_suite/shared_data/frame_order/cam/rotor_2_state/cone.pdb
A test_suite/shared_data/frame_order/cam/rotor_2_state/pcs_tb.txt
A test_suite/shared_data/frame_order/cam/rotor_2_state/pcs_er.txt
A test_suite/shared_data/frame_order/cam/rotor_2_state/README
A test_suite/shared_data/frame_order/cam/rotor_2_state/pcs_dy.txt
A test_suite/shared_data/frame_order/cam/rotor_2_state/ave_pos.pdb
A test_suite/shared_data/frame_order/cam/rotor_2_state/frame_order.log.bz2
A test_suite/shared_data/frame_order/cam/rotor_2_state/distribution.pdb.gz
A test_suite/shared_data/frame_order/cam/rotor_2_state/tensor_fit.py
A test_suite/shared_data/frame_order/cam/rotor_2_state/pcs_tm.txt
A test_suite/shared_data/frame_order/cam/rotor_2_state/animate.py
A test_suite/shared_data/frame_order/cam/rotor_2_state/axis.pdb
A test_suite/shared_data/frame_order/cam/rotor_2_state/generate_distribution.log
A test_suite/shared_data/frame_order/cam/rotor_2_state/back_calc.py
A test_suite/shared_data/frame_order/cam/rotor_2_state/rdc_tb.txt
A test_suite/shared_data/frame_order/cam/rotor_2_state/frame_order.py
A test_suite/shared_data/frame_order/cam/rotor_2_state/rdc_er.txt
A test_suite/shared_data/frame_order/cam/rotor_2_state/back_calc.bz2
A test_suite/shared_data/frame_order/cam/system.pdb
A test_suite/shared_data/frame_order/cam/free_rotor2
A test_suite/shared_data/frame_order/cam/free_rotor2/generate_distribution.py
A test_suite/shared_data/frame_order/cam/free_rotor2/frame_order.bz2
A test_suite/shared_data/frame_order/cam/free_rotor2/rdc_dy.txt
A test_suite/shared_data/frame_order/cam/free_rotor2/tensors.py
A test_suite/shared_data/frame_order/cam/free_rotor2/rdc_tm.txt
A test_suite/shared_data/frame_order/cam/free_rotor2/tensor_fit.log.bz2
A test_suite/shared_data/frame_order/cam/free_rotor2/cone.pdb
A test_suite/shared_data/frame_order/cam/free_rotor2/pcs_tb.txt
A test_suite/shared_data/frame_order/cam/free_rotor2/pcs_er.txt
A test_suite/shared_data/frame_order/cam/free_rotor2/README
A test_suite/shared_data/frame_order/cam/free_rotor2/pcs_dy.txt
A test_suite/shared_data/frame_order/cam/free_rotor2/ave_pos.pdb
A test_suite/shared_data/frame_order/cam/free_rotor2/frame_order.log.bz2
A test_suite/shared_data/frame_order/cam/free_rotor2/distribution.pdb.gz
A test_suite/shared_data/frame_order/cam/free_rotor2/tensor_fit.py
A test_suite/shared_data/frame_order/cam/free_rotor2/pcs_tm.txt
A test_suite/shared_data/frame_order/cam/free_rotor2/animate.py
A test_suite/shared_data/frame_order/cam/free_rotor2/axis.pdb
A test_suite/shared_data/frame_order/cam/free_rotor2/generate_distribution.log
A test_suite/shared_data/frame_order/cam/free_rotor2/back_calc.py
A test_suite/shared_data/frame_order/cam/free_rotor2/rdc_tb.txt
A test_suite/shared_data/frame_order/cam/free_rotor2/frame_order.py
A test_suite/shared_data/frame_order/cam/free_rotor2/rdc_er.txt
A test_suite/shared_data/frame_order/cam/free_rotor2/back_calc.bz2
A test_suite/shared_data/frame_order/cam/iso_cone
A test_suite/shared_data/frame_order/cam/iso_cone/generate_distribution.py
A test_suite/shared_data/frame_order/cam/iso_cone/frame_order.bz2
A test_suite/shared_data/frame_order/cam/iso_cone/rdc_dy.txt
A test_suite/shared_data/frame_order/cam/iso_cone/tensors.py
A test_suite/shared_data/frame_order/cam/iso_cone/rdc_tm.txt
A test_suite/shared_data/frame_order/cam/iso_cone/tensor_fit.log.bz2
A test_suite/shared_data/frame_order/cam/iso_cone/cone.pdb
A test_suite/shared_data/frame_order/cam/iso_cone/pcs_tb.txt
A test_suite/shared_data/frame_order/cam/iso_cone/pcs_er.txt
A test_suite/shared_data/frame_order/cam/iso_cone/README
A test_suite/shared_data/frame_order/cam/iso_cone/pcs_dy.txt
A test_suite/shared_data/frame_order/cam/iso_cone/ave_pos.pdb
A test_suite/shared_data/frame_order/cam/iso_cone/frame_order.log.bz2
A test_suite/shared_data/frame_order/cam/iso_cone/tensor_fit.py
A test_suite/shared_data/frame_order/cam/iso_cone/pcs_tm.txt
A test_suite/shared_data/frame_order/cam/iso_cone/generate_distribution.log.bz2
A test_suite/shared_data/frame_order/cam/iso_cone/animate.py
A test_suite/shared_data/frame_order/cam/iso_cone/axis.pdb
A test_suite/shared_data/frame_order/cam/iso_cone/back_calc.py
A test_suite/shared_data/frame_order/cam/iso_cone/rdc_tb.txt
A test_suite/shared_data/frame_order/cam/iso_cone/frame_order.py
A test_suite/shared_data/frame_order/cam/iso_cone/rdc_er.txt
A test_suite/shared_data/frame_order/cam/rigid
A test_suite/shared_data/frame_order/cam/rigid/frame_order.bz2
A test_suite/shared_data/frame_order/cam/rigid/rdc_dy.txt
A test_suite/shared_data/frame_order/cam/rigid/tensors.py
A test_suite/shared_data/frame_order/cam/rigid/rdc_tm.txt
A test_suite/shared_data/frame_order/cam/rigid/pcs_tb.txt
A test_suite/shared_data/frame_order/cam/rigid/tensor_fit.log.bz2
A test_suite/shared_data/frame_order/cam/rigid/pcs_er.txt
A test_suite/shared_data/frame_order/cam/rigid/pcs_dy.txt
A test_suite/shared_data/frame_order/cam/rigid/ave_pos.pdb
A test_suite/shared_data/frame_order/cam/rigid/frame_order.log.bz2
A test_suite/shared_data/frame_order/cam/rigid/pcs_tm.txt
A test_suite/shared_data/frame_order/cam/rigid/tensor_fit.py
A test_suite/shared_data/frame_order/cam/rigid/back_calc.py
A test_suite/shared_data/frame_order/cam/rigid/rdc_tb.txt
A test_suite/shared_data/frame_order/cam/rigid/frame_order.py
A test_suite/shared_data/frame_order/cam/rigid/rdc_er.txt
A test_suite/shared_data/frame_order/cam/rigid/back_calc.bz2
A test_suite/shared_data/frame_order/cam/1J7O_1st_NH.pdb
A test_suite/shared_data/frame_order/cam/1J7P_1st_NH.pdb
A test_suite/shared_data/frame_order/cam/iso_cone_torsionless
A test_suite/shared_data/frame_order/cam/iso_cone_torsionless/generate_distribution.py
A test_suite/shared_data/frame_order/cam/iso_cone_torsionless/frame_order.bz2
A test_suite/shared_data/frame_order/cam/iso_cone_torsionless/rdc_dy.txt
A test_suite/shared_data/frame_order/cam/iso_cone_torsionless/tensors.py
A test_suite/shared_data/frame_order/cam/iso_cone_torsionless/rdc_tm.txt
A test_suite/shared_data/frame_order/cam/iso_cone_torsionless/tensor_fit.log.bz2
A test_suite/shared_data/frame_order/cam/iso_cone_torsionless/cone.pdb
A test_suite/shared_data/frame_order/cam/iso_cone_torsionless/pcs_tb.txt
A test_suite/shared_data/frame_order/cam/iso_cone_torsionless/pcs_er.txt
A test_suite/shared_data/frame_order/cam/iso_cone_torsionless/README
A test_suite/shared_data/frame_order/cam/iso_cone_torsionless/pcs_dy.txt
A test_suite/shared_data/frame_order/cam/iso_cone_torsionless/ave_pos.pdb
A test_suite/shared_data/frame_order/cam/iso_cone_torsionless/frame_order.log.bz2
A test_suite/shared_data/frame_order/cam/iso_cone_torsionless/tensor_fit.py
A test_suite/shared_data/frame_order/cam/iso_cone_torsionless/pcs_tm.txt
A test_suite/shared_data/frame_order/cam/iso_cone_torsionless/generate_distribution.log.bz2
A test_suite/shared_data/frame_order/cam/iso_cone_torsionless/animate.py
A test_suite/shared_data/frame_order/cam/iso_cone_torsionless/axis.pdb
A test_suite/shared_data/frame_order/cam/iso_cone_torsionless/back_calc.py
A test_suite/shared_data/frame_order/cam/iso_cone_torsionless/rdc_tb.txt
A test_suite/shared_data/frame_order/cam/iso_cone_torsionless/frame_order.py
A test_suite/shared_data/frame_order/cam/iso_cone_torsionless/rdc_er.txt
A test_suite/shared_data/frame_order/cam/pseudo_ellipse_free_rotor
A test_suite/shared_data/frame_order/cam/pseudo_ellipse_free_rotor/generate_distribution.py
A test_suite/shared_data/frame_order/cam/pseudo_ellipse_free_rotor/frame_order.bz2
A test_suite/shared_data/frame_order/cam/pseudo_ellipse_free_rotor/rdc_dy.txt
A test_suite/shared_data/frame_order/cam/pseudo_ellipse_free_rotor/tensors.py
A test_suite/shared_data/frame_order/cam/pseudo_ellipse_free_rotor/cone_pseudo_ellipse.pdb
A test_suite/shared_data/frame_order/cam/pseudo_ellipse_free_rotor/rdc_tm.txt
A test_suite/shared_data/frame_order/cam/pseudo_ellipse_free_rotor/tensor_fit.log.bz2
A test_suite/shared_data/frame_order/cam/pseudo_ellipse_free_rotor/pcs_tb.txt
A test_suite/shared_data/frame_order/cam/pseudo_ellipse_free_rotor/cone.pdb
A test_suite/shared_data/frame_order/cam/pseudo_ellipse_free_rotor/pcs_er.txt
A test_suite/shared_data/frame_order/cam/pseudo_ellipse_free_rotor/frame_order_matrix.log
A test_suite/shared_data/frame_order/cam/pseudo_ellipse_free_rotor/ave_pos_pseudo_ellipse.pdb
A test_suite/shared_data/frame_order/cam/pseudo_ellipse_free_rotor/README
A test_suite/shared_data/frame_order/cam/pseudo_ellipse_free_rotor/frame_order_pseudo_ellipse.log.bz2
A test_suite/shared_data/frame_order/cam/pseudo_ellipse_free_rotor/pcs_dy.txt
A test_suite/shared_data/frame_order/cam/pseudo_ellipse_free_rotor/frame_order_matrix.py
A test_suite/shared_data/frame_order/cam/pseudo_ellipse_free_rotor/ave_pos.pdb
A test_suite/shared_data/frame_order/cam/pseudo_ellipse_free_rotor/frame_order.log.bz2
A test_suite/shared_data/frame_order/cam/pseudo_ellipse_free_rotor/pcs_tm.txt
A test_suite/shared_data/frame_order/cam/pseudo_ellipse_free_rotor/tensor_fit.py
A test_suite/shared_data/frame_order/cam/pseudo_ellipse_free_rotor/animate.py
A test_suite/shared_data/frame_order/cam/pseudo_ellipse_free_rotor/generate_distribution.log.bz2
A test_suite/shared_data/frame_order/cam/pseudo_ellipse_free_rotor/frame_order_pseudo_ellipse.py
A test_suite/shared_data/frame_order/cam/pseudo_ellipse_free_rotor/axis.pdb
A test_suite/shared_data/frame_order/cam/pseudo_ellipse_free_rotor/back_calc.py
A test_suite/shared_data/frame_order/cam/pseudo_ellipse_free_rotor/rdc_tb.txt
A test_suite/shared_data/frame_order/cam/pseudo_ellipse_free_rotor/frame_order.py
A test_suite/shared_data/frame_order/cam/pseudo_ellipse_free_rotor/rdc_er.txt
A test_suite/shared_data/frame_order/cam/pseudo_ellipse_free_rotor/frame_order_pseudo_ellipse.bz2
A test_suite/shared_data/frame_order/cam/pseudo_ellipse_free_rotor/rotation_matrices.py
A test_suite/shared_data/frame_order/cam/CoM.py
A test_suite/shared_data/frame_order/cam/rotor
A test_suite/shared_data/frame_order/cam/rotor/generate_distribution.py
A test_suite/shared_data/frame_order/cam/rotor/frame_order.bz2
A test_suite/shared_data/frame_order/cam/rotor/rdc_dy.txt
A test_suite/shared_data/frame_order/cam/rotor/tensors.py
A test_suite/shared_data/frame_order/cam/rotor/rdc_tm.txt
A test_suite/shared_data/frame_order/cam/rotor/tensor_fit.log.bz2
A test_suite/shared_data/frame_order/cam/rotor/cone.pdb
A test_suite/shared_data/frame_order/cam/rotor/pcs_tb.txt
A test_suite/shared_data/frame_order/cam/rotor/pcs_er.txt
A test_suite/shared_data/frame_order/cam/rotor/README
A test_suite/shared_data/frame_order/cam/rotor/pcs_dy.txt
A test_suite/shared_data/frame_order/cam/rotor/ave_pos.pdb
A test_suite/shared_data/frame_order/cam/rotor/frame_order.log.bz2
A test_suite/shared_data/frame_order/cam/rotor/distribution.pdb.gz
A test_suite/shared_data/frame_order/cam/rotor/tensor_fit.py
A test_suite/shared_data/frame_order/cam/rotor/pcs_tm.txt
A test_suite/shared_data/frame_order/cam/rotor/animate.py
A test_suite/shared_data/frame_order/cam/rotor/axis.pdb
A test_suite/shared_data/frame_order/cam/rotor/generate_distribution.log
A test_suite/shared_data/frame_order/cam/rotor/back_calc.py
A test_suite/shared_data/frame_order/cam/rotor/rdc_tb.txt
A test_suite/shared_data/frame_order/cam/rotor/frame_order.py
A test_suite/shared_data/frame_order/cam/rotor/rdc_er.txt
A test_suite/shared_data/frame_order/cam/rotor/back_calc.bz2
A test_suite/shared_data/frame_order/cam/free_rotor
A test_suite/shared_data/frame_order/cam/free_rotor/generate_distribution.py
A test_suite/shared_data/frame_order/cam/free_rotor/frame_order.bz2
A test_suite/shared_data/frame_order/cam/free_rotor/rdc_dy.txt
A test_suite/shared_data/frame_order/cam/free_rotor/tensors.py
A test_suite/shared_data/frame_order/cam/free_rotor/rdc_tm.txt
A test_suite/shared_data/frame_order/cam/free_rotor/tensor_fit.log.bz2
A test_suite/shared_data/frame_order/cam/free_rotor/cone.pdb
A test_suite/shared_data/frame_order/cam/free_rotor/pcs_tb.txt
A test_suite/shared_data/frame_order/cam/free_rotor/pcs_er.txt
A test_suite/shared_data/frame_order/cam/free_rotor/README
A test_suite/shared_data/frame_order/cam/free_rotor/pcs_dy.txt
A test_suite/shared_data/frame_order/cam/free_rotor/ave_pos.pdb
A test_suite/shared_data/frame_order/cam/free_rotor/frame_order.log.bz2
A test_suite/shared_data/frame_order/cam/free_rotor/distribution.pdb.gz
A test_suite/shared_data/frame_order/cam/free_rotor/tensor_fit.py
A test_suite/shared_data/frame_order/cam/free_rotor/pcs_tm.txt
A test_suite/shared_data/frame_order/cam/free_rotor/animate.py
A test_suite/shared_data/frame_order/cam/free_rotor/generate_distribution.log
A test_suite/shared_data/frame_order/cam/free_rotor/back_calc.py
A test_suite/shared_data/frame_order/cam/free_rotor/rdc_tb.txt
A test_suite/shared_data/frame_order/cam/free_rotor/frame_order.py
A test_suite/shared_data/frame_order/cam/free_rotor/rdc_er.txt
A test_suite/shared_data/frame_order/cam/free_rotor/back_calc.bz2
A test_suite/shared_data/frame_order/cam/iso_cone_free_rotor2
A test_suite/shared_data/frame_order/cam/iso_cone_free_rotor2/generate_distribution.py
A test_suite/shared_data/frame_order/cam/iso_cone_free_rotor2/frame_order.bz2
A test_suite/shared_data/frame_order/cam/iso_cone_free_rotor2/rdc_dy.txt
A test_suite/shared_data/frame_order/cam/iso_cone_free_rotor2/tensors.py
A test_suite/shared_data/frame_order/cam/iso_cone_free_rotor2/rdc_tm.txt
A test_suite/shared_data/frame_order/cam/iso_cone_free_rotor2/tensor_fit.log.bz2
A test_suite/shared_data/frame_order/cam/iso_cone_free_rotor2/cone.pdb
A test_suite/shared_data/frame_order/cam/iso_cone_free_rotor2/pcs_tb.txt
A test_suite/shared_data/frame_order/cam/iso_cone_free_rotor2/pcs_er.txt
A test_suite/shared_data/frame_order/cam/iso_cone_free_rotor2/README
A test_suite/shared_data/frame_order/cam/iso_cone_free_rotor2/pcs_dy.txt
A test_suite/shared_data/frame_order/cam/iso_cone_free_rotor2/ave_pos.pdb
A test_suite/shared_data/frame_order/cam/iso_cone_free_rotor2/frame_order.log.bz2
A test_suite/shared_data/frame_order/cam/iso_cone_free_rotor2/tensor_fit.py
A test_suite/shared_data/frame_order/cam/iso_cone_free_rotor2/pcs_tm.txt
A test_suite/shared_data/frame_order/cam/iso_cone_free_rotor2/generate_distribution.log.bz2
A test_suite/shared_data/frame_order/cam/iso_cone_free_rotor2/animate.py
A test_suite/shared_data/frame_order/cam/iso_cone_free_rotor2/axis.pdb
A test_suite/shared_data/frame_order/cam/iso_cone_free_rotor2/back_calc.py
A test_suite/shared_data/frame_order/cam/iso_cone_free_rotor2/rdc_tb.txt
A test_suite/shared_data/frame_order/cam/iso_cone_free_rotor2/frame_order.py
A test_suite/shared_data/frame_order/cam/iso_cone_free_rotor2/rdc_er.txt
A test_suite/shared_data/frame_order/cam/pseudo_ellipse
A test_suite/shared_data/frame_order/cam/pseudo_ellipse/generate_distribution.py
A test_suite/shared_data/frame_order/cam/pseudo_ellipse/frame_order.bz2
A test_suite/shared_data/frame_order/cam/pseudo_ellipse/rdc_dy.txt
A test_suite/shared_data/frame_order/cam/pseudo_ellipse/tensors.py
A test_suite/shared_data/frame_order/cam/pseudo_ellipse/rdc_tm.txt
A test_suite/shared_data/frame_order/cam/pseudo_ellipse/tensor_fit.log.bz2
A test_suite/shared_data/frame_order/cam/pseudo_ellipse/cone.pdb
A test_suite/shared_data/frame_order/cam/pseudo_ellipse/pcs_tb.txt
A test_suite/shared_data/frame_order/cam/pseudo_ellipse/pcs_er.txt
A test_suite/shared_data/frame_order/cam/pseudo_ellipse/README
A test_suite/shared_data/frame_order/cam/pseudo_ellipse/pcs_dy.txt
A test_suite/shared_data/frame_order/cam/pseudo_ellipse/ave_pos.pdb
A test_suite/shared_data/frame_order/cam/pseudo_ellipse/frame_order.log.bz2
A test_suite/shared_data/frame_order/cam/pseudo_ellipse/tensor_fit.py
A test_suite/shared_data/frame_order/cam/pseudo_ellipse/pcs_tm.txt
A test_suite/shared_data/frame_order/cam/pseudo_ellipse/generate_distribution.log.bz2
A test_suite/shared_data/frame_order/cam/pseudo_ellipse/animate.py
A test_suite/shared_data/frame_order/cam/pseudo_ellipse/axis.pdb
A test_suite/shared_data/frame_order/cam/pseudo_ellipse/back_calc.py
A test_suite/shared_data/frame_order/cam/pseudo_ellipse/rdc_tb.txt
A test_suite/shared_data/frame_order/cam/pseudo_ellipse/frame_order.py
A test_suite/shared_data/frame_order/cam/pseudo_ellipse/rdc_er.txt
C test_suite/shared_data/frame_order/iso_cone_torsionless
D test_suite/shared_data/frame_order/pseudo_ellipse_free_rotor
D test_suite/shared_data/frame_order/rotor
D test_suite/shared_data/frame_order/CoM.py
D test_suite/shared_data/frame_order/free_rotor
D test_suite/shared_data/frame_order/iso_cone_free_rotor2
C test_suite/shared_data/frame_order/pseudo_ellipse
D test_suite/shared_data/frame_order/pseudo_ellipse_torsionless
C test_suite/shared_data/frame_order/iso_cone_free_rotor
D test_suite/shared_data/frame_order/1J7P_1st_NH_rot.pdb
D test_suite/shared_data/frame_order/rotor_2_state
D test_suite/shared_data/frame_order/free_rotor2
D test_suite/shared_data/frame_order/system.pdb
D test_suite/shared_data/frame_order/rigid
C test_suite/shared_data/frame_order/iso_cone
D test_suite/shared_data/frame_order/1J7O_1st_NH.pdb
D test_suite/shared_data/frame_order/1J7P_1st_NH.pdb
Summary of conflicts:
Tree conflicts: 4
[edau@... relax-trunk]$ svn merge -r15217:15218 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15218 into '.':
A test_suite/shared_data/frame_order/cam/tensors.py
A test_suite/shared_data/frame_order/cam/rotate.py
A test_suite/shared_data/frame_order/cam/rotor2
A test_suite/shared_data/frame_order/cam/rotor2/generate_distribution.py
A test_suite/shared_data/frame_order/cam/rotor2/frame_order.bz2
A test_suite/shared_data/frame_order/cam/rotor2/rdc_dy.txt
A test_suite/shared_data/frame_order/cam/rotor2/tensors.py
A test_suite/shared_data/frame_order/cam/rotor2/rdc_tm.txt
A test_suite/shared_data/frame_order/cam/rotor2/pcs_only
A test_suite/shared_data/frame_order/cam/rotor2/pcs_only/ave_pos_pcs_tm.txt
A test_suite/shared_data/frame_order/cam/rotor2/pcs_only/frame_order.bz2
A test_suite/shared_data/frame_order/cam/rotor2/pcs_only/ave_pos_back_calc.py
A test_suite/shared_data/frame_order/cam/rotor2/pcs_only/ave_pos_rdc_tb.txt
A test_suite/shared_data/frame_order/cam/rotor2/pcs_only/ave_pos_rdc_er.txt
A test_suite/shared_data/frame_order/cam/rotor2/pcs_only/cone.pdb
A test_suite/shared_data/frame_order/cam/rotor2/pcs_only/ave_pos_back_calc.bz2
A test_suite/shared_data/frame_order/cam/rotor2/pcs_only/rdc_comp.agr
A test_suite/shared_data/frame_order/cam/rotor2/pcs_only/ave_pos_rdc_dy.txt
A test_suite/shared_data/frame_order/cam/rotor2/pcs_only/ave_pos.pdb
A test_suite/shared_data/frame_order/cam/rotor2/pcs_only/frame_order.log.bz2
A test_suite/shared_data/frame_order/cam/rotor2/pcs_only/ave_pos_rdc_tm.txt
A test_suite/shared_data/frame_order/cam/rotor2/pcs_only/ave_pos_pcs_tb.txt
A test_suite/shared_data/frame_order/cam/rotor2/pcs_only/animate.py
A test_suite/shared_data/frame_order/cam/rotor2/pcs_only/ave_pos_pcs_er.txt
A test_suite/shared_data/frame_order/cam/rotor2/pcs_only/ave_pos_pcs_dy.txt
A test_suite/shared_data/frame_order/cam/rotor2/pcs_only/pcs_comp.agr
A test_suite/shared_data/frame_order/cam/rotor2/pcs_only/frame_order.py
A test_suite/shared_data/frame_order/cam/rotor2/tensor_fit.log.bz2
A test_suite/shared_data/frame_order/cam/rotor2/pcs_tb.txt
A test_suite/shared_data/frame_order/cam/rotor2/pcs_er.txt
A test_suite/shared_data/frame_order/cam/rotor2/README
A test_suite/shared_data/frame_order/cam/rotor2/pcs_dy.txt
A test_suite/shared_data/frame_order/cam/rotor2/ave_pos.pdb
A test_suite/shared_data/frame_order/cam/rotor2/frame_order.log.bz2
A test_suite/shared_data/frame_order/cam/rotor2/distribution.pdb.gz
A test_suite/shared_data/frame_order/cam/rotor2/tensor_fit.py
A test_suite/shared_data/frame_order/cam/rotor2/pcs_tm.txt
A test_suite/shared_data/frame_order/cam/rotor2/animate.py
A test_suite/shared_data/frame_order/cam/rotor2/cone.pdb.gz
A test_suite/shared_data/frame_order/cam/rotor2/axis.pdb
A test_suite/shared_data/frame_order/cam/rotor2/generate_distribution.log
A test_suite/shared_data/frame_order/cam/rotor2/back_calc.py
A test_suite/shared_data/frame_order/cam/rotor2/rdc_tb.txt
A test_suite/shared_data/frame_order/cam/rotor2/frame_order.py
A test_suite/shared_data/frame_order/cam/rotor2/rdc_er.txt
A test_suite/shared_data/frame_order/cam/rotor2/back_calc.bz2
A test_suite/shared_data/frame_order/cam/README
A test_suite/shared_data/frame_order/cam/rotate.log
D test_suite/shared_data/frame_order/tensors.py
D test_suite/shared_data/frame_order/rotate.py
D test_suite/shared_data/frame_order/rotor2
D test_suite/shared_data/frame_order/README
D test_suite/shared_data/frame_order/rotate.log
[edau@... relax-trunk]$ svn merge -r15218:15219 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15219 into '.':
A test_suite/shared_data/frame_order/synth_tensors
A test_suite/shared_data/frame_order/synth_tensors/pseudo_ellipse_out_of_frame_theta_x_tensors_beta112_5.py
A test_suite/shared_data/frame_order/synth_tensors/iso_cone_free_rotor_axis2_1_3_tensors_beta78_75.py
A test_suite/shared_data/frame_order/synth_tensors/free_rotor_axis2_1_3_rot_tensors.py
A test_suite/shared_data/frame_order/synth_tensors/iso_cone_out_of_frame_theta_z_tensors_beta78_75.py
A test_suite/shared_data/frame_order/synth_tensors/pseudo_ellipse_free_rotor_out_of_frame_theta_x_tensors_beta22_5.py
A test_suite/shared_data/frame_order/synth_tensors/pseudo_ellipse_torsionless_out_of_frame_theta_x_tensors_beta168_75.py
A test_suite/shared_data/frame_order/synth_tensors/rotor_out_of_frame_tensors_beta123_75.py
A test_suite/shared_data/frame_order/synth_tensors/tensors_rigid_rand_rot.py
A test_suite/shared_data/frame_order/synth_tensors/isotropic_cone_free_rotor_in_frame_tensors_beta101_25.py
A test_suite/shared_data/frame_order/synth_tensors/rotor_in_frame_tensors_beta22_5.py
A test_suite/shared_data/frame_order/synth_tensors/pseudo_ellipse_free_rotor_in_frame_theta_y_tensors_beta0_0.py
A test_suite/shared_data/frame_order/synth_tensors/free_rotor_in_frame_rot_tensors.py
D test_suite/system_tests/scripts/frame_order/tensors_rigid_rand_rot.py
D test_suite/system_tests/scripts/frame_order/tensors
C test_suite/system_tests/scripts/frame_order/pseudo_ellipse.py
C test_suite/system_tests/scripts/frame_order/opt_rigid_no_rot.py
C test_suite/system_tests/scripts/frame_order/pseudo_ellipse_torsionless.py
Summary of conflicts:
Tree conflicts: 3
[edau@... relax-trunk]$
