relax SVN archive

Next block of the manual merger of the frame_order_testing branch.

The commands used were:
svn merge -r18860:18861 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18861:18862 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18862:18863 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18863:18864 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18864:18865 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .

The console messages were:
[edau@... relax-trunk]$ svn merge -r18860:18861 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18861 into '.':
U auto_analyses/frame_order.py
[edau@... relax-trunk]$ svn merge -r18861:18862 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18862 into '.':
G auto_analyses/frame_order.py
[edau@... relax-trunk]$ svn merge -r18862:18863 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18863 into '.':
U specific_fns/frame_order.py
U user_functions/frame_order.py
[edau@... relax-trunk]$ svn merge -r18863:18864 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18864 into '.':
G specific_fns/frame_order.py
[edau@... relax-trunk]$ svn merge -r18864:18865 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18865 into '.':
G specific_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 -r18761:18762 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18769:18770 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18803:18804 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18804:18805 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18829:18830 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18830:18831 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18831:18832 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18832:18833 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18833:18834 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18834:18835 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18835:18836 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .

The console messages were:
[edau@... relax-trunk]$ svn merge -r18761:18762 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
[edau@... relax-trunk]$ svn merge -r18769:18770 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18770 into '.':
U test_suite/system_tests/scripts/frame_order/rigid_test.py
[edau@... relax-trunk]$ svn merge -r18803:18804 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18804 into '.':
U generic_fns/domain.py
U specific_fns/frame_order.py
U test_suite/shared_data/frame_order/cam/pseudo_ellipse_torsionless/generate_distribution.py
U test_suite/shared_data/frame_order/cam/iso_cone_free_rotor/generate_distribution.py
U test_suite/shared_data/frame_order/cam/rotor_2_state/generate_distribution.py
U test_suite/shared_data/frame_order/cam/rotor2/generate_distribution.py
U test_suite/shared_data/frame_order/cam/rotor2/pcs_only/frame_order.py
U test_suite/shared_data/frame_order/cam/free_rotor2/generate_distribution.py
U test_suite/shared_data/frame_order/cam/free_rotor_missing_data/generate_distribution.py
U test_suite/shared_data/frame_order/cam/iso_cone/generate_distribution.py
U test_suite/shared_data/frame_order/cam/pseudo_ellipse2/generate_distribution.py
U test_suite/shared_data/frame_order/cam/iso_cone_torsionless/generate_distribution.py
U test_suite/shared_data/frame_order/cam/pseudo_ellipse_free_rotor/rotation_matrices.py
U test_suite/shared_data/frame_order/cam/pseudo_ellipse_free_rotor/generate_distribution.py
U test_suite/shared_data/frame_order/cam/rotor/generate_distribution.py
U test_suite/shared_data/frame_order/cam/iso_cone_free_rotor2/generate_distribution.py
U test_suite/shared_data/frame_order/cam/free_rotor/generate_distribution.py
U test_suite/shared_data/frame_order/cam/generate_base.py
U test_suite/shared_data/frame_order/cam/pseudo_ellipse/generate_distribution.py
U extern/sobol/sobol_lib-not_tested.py
U extern/sobol/sobol_test.py
U extern/sobol/sobol_lib.py
[edau@... relax-trunk]$ svn merge -r18804:18805 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18805 into '.':
G extern/sobol/sobol_test.py
U extern/sobol/test.py
[edau@... relax-trunk]$ svn merge -r18829:18830 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18830 into '.':
G specific_fns/frame_order.py
[edau@... relax-trunk]$ svn merge -r18830:18831 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18831 into '.':
G specific_fns/frame_order.py
[edau@... relax-trunk]$ svn merge -r18831:18832 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 r18832 into '.':
C specific_fns/frame_order.py
U user_functions/frame_order.py
Summary of conflicts:
Text conflicts: 1
[edau@... relax-trunk]$ svn merge -r18832:18833 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18833 into '.':
G specific_fns/frame_order.py
G user_functions/frame_order.py
[edau@... relax-trunk]$ svn merge -r18833:18834 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18834 into '.':
U auto_analyses/frame_order.py
[edau@... relax-trunk]$ svn merge -r18834:18835 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18835 into '.':
G specific_fns/frame_order.py
[edau@... relax-trunk]$ svn merge -r18835:18836 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18836 into '.':
G specific_fns/frame_order.py
G user_functions/frame_order.py
[edau@... relax-trunk]$

Next block of the manual merger of the frame_order_testing branch.

The commands used were:
svn merge -r18650:18651 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18651:18652 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18652:18653 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18653:18654 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18654:18655 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18655:18656 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18657:18658 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18719:18720 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18729:18730 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .

The console messages were:
[edau@... relax-trunk]$ svn merge -r18650:18651 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
[edau@... relax-trunk]$ svn merge -r18651:18652 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18652 into '.':
U auto_analyses/frame_order.py
[edau@... relax-trunk]$ svn merge -r18652:18653 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18653 into '.':
G auto_analyses/frame_order.py
[edau@... relax-trunk]$ svn merge -r18653:18654 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18654 into '.':
G auto_analyses/frame_order.py
[edau@... relax-trunk]$ svn merge -r18654:18655 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18655 into '.':
U maths_fns/frame_order/__init__.py
[edau@... relax-trunk]$ svn merge -r18655:18656 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18656 into '.':
U test_suite/system_tests/frame_order.py
[edau@... relax-trunk]$ svn merge -r18657:18658 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18658 into '.':
A test_suite/shared_data/frame_order/displacements/optimisation.log.bz2
[edau@... relax-trunk]$ svn merge -r18719:18720 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18720 into '.':
A sample_scripts/frame_order
[edau@... relax-trunk]$ svn merge -r18729:18730 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18730 into '.':
U specific_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 -r18640:18641 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18641:18642 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18642:18643 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18643:18644 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18644:18645 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18647:18648 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18648:18649 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18649:18650 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .

The console messages were:
[edau@... relax-trunk]$ svn merge -r18640:18641 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
[edau@... relax-trunk]$ svn merge -r18641:18642 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18642 into '.':
U test_suite/system_tests/scripts/frame_order/cam/pseudo_ellipse.py
[edau@... relax-trunk]$ svn merge -r18642:18643 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18643 into '.':
A test_suite/shared_data/frame_order/displacements/optimisation.py
[edau@... relax-trunk]$ svn merge -r18643:18644 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18644 into '.':
U test_suite/shared_data/frame_order/cam/full_analysis.py
[edau@... relax-trunk]$ svn merge -r18644:18645 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18645 into '.':
U test_suite/system_tests/frame_order.py
[edau@... relax-trunk]$ svn merge -r18647:18648 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18648 into '.':
U test_suite/shared_data/frame_order/cam/generate_base.py
[edau@... relax-trunk]$ svn merge -r18648:18649 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18649 into '.':
G test_suite/shared_data/frame_order/cam/generate_base.py
[edau@... relax-trunk]$ svn merge -r18649:18650 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18650 into '.':
G test_suite/system_tests/frame_order.py
[edau@... relax-trunk]$

Next block of the manual merger of the frame_order_testing branch.

The commands used were:
svn merge -r18630:18631 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18631:18632 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18632:18633 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18633:18634 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18634:18635 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18635:18636 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18636:18637 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18637:18638 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18638:18639 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18639:18640 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .

The console messages were:
[edau@... relax-trunk]$ svn merge -r18630:18631 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18631 into '.':
U maths_fns/frame_order/__init__.py
U specific_fns/frame_order.py
[edau@... relax-trunk]$ svn merge -r18631:18632 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18632 into '.':
G specific_fns/frame_order.py
[edau@... relax-trunk]$ svn merge -r18632:18633 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18633 into '.':
G specific_fns/frame_order.py
[edau@... relax-trunk]$ svn merge -r18633:18634 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18634 into '.':
U auto_analyses/frame_order.py
[edau@... relax-trunk]$ svn merge -r18634:18635 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
[edau@... relax-trunk]$ svn merge -r18635:18636 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18636 into '.':
G maths_fns/frame_order/__init__.py
[edau@... relax-trunk]$ svn merge -r18636:18637 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18637 into '.':
G maths_fns/frame_order/__init__.py
[edau@... relax-trunk]$ svn merge -r18637:18638 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18638 into '.':
U test_suite/system_tests/scripts/frame_order/rigid_test.py
[edau@... relax-trunk]$ svn merge -r18638:18639 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18639 into '.':
U test_suite/system_tests/scripts/frame_order/cam/free_rotor2.py
U test_suite/system_tests/scripts/frame_order/cam/free_rotor_missing_data.py
U test_suite/system_tests/scripts/frame_order/cam/iso_cone.py
U test_suite/system_tests/scripts/frame_order/cam/pseudo_ellipse2.py
U test_suite/system_tests/scripts/frame_order/cam/rigid.py
U test_suite/system_tests/scripts/frame_order/cam/iso_cone_torsionless.py
U test_suite/system_tests/scripts/frame_order/cam/pseudo_ellipse_free_rotor.py
U test_suite/system_tests/scripts/frame_order/cam/rotor.py
U test_suite/system_tests/scripts/frame_order/cam/free_rotor.py
U test_suite/system_tests/scripts/frame_order/cam/iso_cone_free_rotor2.py
U test_suite/system_tests/scripts/frame_order/cam/pseudo_ellipse.py
U test_suite/system_tests/scripts/frame_order/cam/pseudo_ellipse_torsionless.py
U test_suite/system_tests/scripts/frame_order/cam/iso_cone_free_rotor.py
U test_suite/system_tests/scripts/frame_order/cam/rotor_2_state.py
U test_suite/system_tests/scripts/frame_order/cam/rotor2.py
[edau@... relax-trunk]$ svn merge -r18639:18640 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18640 into '.':
U test_suite/system_tests/frame_order.py
[edau@... relax-trunk]$

Next block of the manual merger of the frame_order_testing branch.

The commands used were:
svn merge -r18619:18620 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18620:18621 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18621:18622 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18622:18623 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18623:18624 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18624:18625 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18625:18626 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18626:18627 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18627:18628 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18628:18629 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18629:18630 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .

The console messages were:
[edau@... relax-trunk]$ svn merge -r18619:18620 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18620 into '.':
U maths_fns/frame_order/__init__.py
[edau@... relax-trunk]$ svn merge -r18620:18621 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18621 into '.':
U maths_fns/frame_order/iso_cone.py
U maths_fns/frame_order/pseudo_ellipse_torsionless.py
U maths_fns/frame_order/iso_cone_torsionless.py
U maths_fns/frame_order/pseudo_ellipse_free_rotor.py
U maths_fns/frame_order/iso_cone_free_rotor.py
U maths_fns/frame_order/rotor.py
U maths_fns/frame_order/free_rotor.py
[edau@... relax-trunk]$ svn merge -r18621:18622 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18622 into '.':
U maths_fns/frame_order/pseudo_ellipse.py
G maths_fns/frame_order/__init__.py
[edau@... relax-trunk]$ svn merge -r18622:18623 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18623 into '.':
G maths_fns/frame_order/__init__.py
U maths_fns/frame_order/matrix_ops.py
G maths_fns/frame_order/rotor.py
[edau@... relax-trunk]$ svn merge -r18623:18624 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18624 into '.':
G maths_fns/frame_order/__init__.py
[edau@... relax-trunk]$ svn merge -r18624:18625 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18625 into '.':
U test_suite/shared_data/frame_order/displacements/rigid_test.py
A test_suite/shared_data/frame_order/displacements/rigid_test.log
[edau@... relax-trunk]$ svn merge -r18625:18626 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18626 into '.':
A test_suite/system_tests/scripts/frame_order/rigid_test.py
U test_suite/system_tests/frame_order.py
[edau@... relax-trunk]$ svn merge -r18626:18627 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18627 into '.':
U specific_fns/frame_order.py
U user_functions/frame_order.py
[edau@... relax-trunk]$ svn merge -r18627:18628 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18628 into '.':
G test_suite/shared_data/frame_order/displacements/rigid_test.py
[edau@... relax-trunk]$ svn merge -r18628:18629 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18629 into '.':
U auto_analyses/frame_order.py
[edau@... relax-trunk]$ svn merge -r18629:18630 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18630 into '.':
G auto_analyses/frame_order.py
[edau@... relax-trunk]$

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

Next block of the manual merger of the frame_order_testing branch.

The commands used were:
svn merge -r18570:18571 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18571:18572 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18594:18595 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18595:18596 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18596:18597 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18597:18598 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18598:18599 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18599:18600 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .

The console messages were:
[edau@... relax-trunk]$ svn merge -r18570:18571 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18571 into '.':
U specific_fns/frame_order.py
[edau@... relax-trunk]$ svn merge -r18571:18572 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18572 into '.':
G specific_fns/frame_order.py
[edau@... relax-trunk]$ svn merge -r18594:18595 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18595 into '.':
G specific_fns/frame_order.py
[edau@... relax-trunk]$ svn merge -r18595:18596 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18596 into '.':
G specific_fns/frame_order.py
[edau@... relax-trunk]$ svn merge -r18596:18597 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18597 into '.':
G specific_fns/frame_order.py
[edau@... relax-trunk]$ svn merge -r18597:18598 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18598 into '.':
U maths_fns/frame_order/__init__.py
G specific_fns/frame_order.py
U user_functions/frame_order.py
U auto_analyses/frame_order.py
[edau@... relax-trunk]$ svn merge -r18598:18599 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18599 into '.':
U test_suite/shared_data/frame_order/cam/full_analysis.py
[edau@... relax-trunk]$ svn merge -r18599:18600 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18600 into '.':
U generic_fns/structure/mass.py
[edau@... relax-trunk]$

Next block of the manual merger of the frame_order_testing branch.

The commands used were:
svn merge -r18552:18553 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18563:18564 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18564:18565 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18565:18566 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18566:18567 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18568:18569 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18569:18570 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .

The console messages were:
[edau@... relax-trunk]$ svn merge -r18552:18553 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18553 into '.':
U generic_fns/align_tensor.py
[edau@... relax-trunk]$ svn merge -r18563:18564 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18564 into '.':
U specific_fns/frame_order.py
[edau@... relax-trunk]$ svn merge -r18564:18565 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18565 into '.':
U maths_fns/frame_order/__init__.py
[edau@... relax-trunk]$ svn merge -r18565:18566 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18566 into '.':
G specific_fns/frame_order.py
[edau@... relax-trunk]$ svn merge -r18566:18567 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18567 into '.':
G specific_fns/frame_order.py
[edau@... relax-trunk]$ svn merge -r18568:18569 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18569 into '.':
U auto_analyses/frame_order.py
[edau@... relax-trunk]$ svn merge -r18569:18570 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18570 into '.':
G specific_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 -r18460:18461 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18466:18467 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18467:18468 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18468:18469 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18469:18470 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18472:18473 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18546:18547 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18547:18548 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .

The console messages were:
[edau@... relax-trunk]$ svn merge -r18460:18461 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18461 into '.':
U specific_fns/frame_order.py
[edau@... relax-trunk]$ svn merge -r18466:18467 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 r18467 into '.':
C generic_fns/structure/main.py
Summary of conflicts:
Text conflicts: 1
[edau@... relax-trunk]$ svn merge -r18467:18468 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18468 into '.':
G specific_fns/frame_order.py
[edau@... relax-trunk]$ svn merge -r18468:18469 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18469 into '.':
G specific_fns/frame_order.py
[edau@... relax-trunk]$ svn merge -r18469:18470 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18470 into '.':
U test_suite/shared_data/frame_order/cam/full_analysis.py
[edau@... relax-trunk]$ svn merge -r18472:18473 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18473 into '.':
U auto_analyses/frame_order.py
[edau@... relax-trunk]$ svn merge -r18546:18547 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 r18547 into '.':
C generic_fns/structure/main.py
Summary of conflicts:
Text conflicts: 1
[edau@... relax-trunk]$ svn merge -r18547:18548 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18548 into '.':
G specific_fns/frame_order.py
[edau@... relax-trunk]$