Author: bugman
Date: Fri Mar 22 17:02:35 2013
New Revision: 18988
URL: http://svn.gna.org/viewcvs/relax?rev=18988&view=rev
Log:
Next block of the manual merger of the frame_order_testing branch.
The commands used were:
svn merge -r18020:18021
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r18021:18022
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r18022:18023
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r18023:18024
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r18024:18025
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r18025:18026
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r18026:18027
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
svn merge -r18028:18029
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
The console messages were:
[edau@localhost relax-trunk]$ svn merge -r18020:18021
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r18021 into '.':
U auto_analyses/frame_order.py
[edau@localhost relax-trunk]$ svn merge -r18021:18022
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r18022 into '.':
U specific_fns/frame_order.py
U user_functions/frame_order.py
[edau@localhost relax-trunk]$ svn merge -r18022:18023
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r18023 into '.':
G auto_analyses/frame_order.py
[edau@localhost relax-trunk]$ svn merge -r18023:18024
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r18024 into '.':
U test_suite/shared_data/frame_order/cam/full_analysis.py
[edau@localhost relax-trunk]$ svn merge -r18024:18025
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r18025 into '.':
A test_suite/shared_data/frame_order/cam/rigid/clean
[edau@localhost relax-trunk]$ svn merge -r18025:18026
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r18026 into '.':
U test_suite/shared_data/frame_order/cam/rigid/clean
[edau@localhost relax-trunk]$ svn merge -r18026:18027
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r18027 into '.':
A test_suite/shared_data/frame_order/cam/pseudo_ellipse_torsionless/clean
A test_suite/shared_data/frame_order/cam/iso_cone_free_rotor/clean
A test_suite/shared_data/frame_order/cam/rotor_2_state/clean
A test_suite/shared_data/frame_order/cam/rotor2/clean
A test_suite/shared_data/frame_order/cam/free_rotor2/clean
A test_suite/shared_data/frame_order/cam/iso_cone/clean
A test_suite/shared_data/frame_order/cam/pseudo_ellipse2/clean
A test_suite/shared_data/frame_order/cam/iso_cone_torsionless/clean
A test_suite/shared_data/frame_order/cam/pseudo_ellipse_free_rotor/clean
A test_suite/shared_data/frame_order/cam/rotor/clean
A test_suite/shared_data/frame_order/cam/iso_cone_free_rotor2/clean
A test_suite/shared_data/frame_order/cam/free_rotor/clean
A test_suite/shared_data/frame_order/cam/pseudo_ellipse/clean
[edau@localhost relax-trunk]$ svn merge -r18028:18029
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/frame_order_testing .
--- Merging r18029 into '.':
A
test_suite/shared_data/frame_order/cam/pseudo_ellipse_torsionless/subset_pcs.py
A
test_suite/shared_data/frame_order/cam/iso_cone_free_rotor/pcs_dy_subset.txt
A
test_suite/shared_data/frame_order/cam/iso_cone_free_rotor/pcs_tm_subset.txt
A test_suite/shared_data/frame_order/cam/iso_cone_free_rotor/subset_pcs.py
A
test_suite/shared_data/frame_order/cam/iso_cone_free_rotor/pcs_tb_subset.txt
A
test_suite/shared_data/frame_order/cam/iso_cone_free_rotor/pcs_er_subset.txt
A test_suite/shared_data/frame_order/cam/rotor_2_state/pcs_dy_subset.txt
A test_suite/shared_data/frame_order/cam/rotor_2_state/pcs_tm_subset.txt
A test_suite/shared_data/frame_order/cam/rotor_2_state/subset_pcs.py
A test_suite/shared_data/frame_order/cam/rotor_2_state/pcs_tb_subset.txt
A test_suite/shared_data/frame_order/cam/rotor_2_state/pcs_er_subset.txt
A test_suite/shared_data/frame_order/cam/rotor2/pcs_dy_subset.txt
A test_suite/shared_data/frame_order/cam/rotor2/pcs_tm_subset.txt
A test_suite/shared_data/frame_order/cam/rotor2/subset_pcs.py
A test_suite/shared_data/frame_order/cam/rotor2/pcs_tb_subset.txt
A test_suite/shared_data/frame_order/cam/rotor2/pcs_er_subset.txt
A test_suite/shared_data/frame_order/cam/free_rotor2/pcs_dy_subset.txt
A test_suite/shared_data/frame_order/cam/free_rotor2/pcs_tm_subset.txt
A test_suite/shared_data/frame_order/cam/free_rotor2/subset_pcs.py
A test_suite/shared_data/frame_order/cam/free_rotor2/pcs_tb_subset.txt
A test_suite/shared_data/frame_order/cam/free_rotor2/pcs_er_subset.txt
A test_suite/shared_data/frame_order/cam/rigid/subset_pcs.py
A test_suite/shared_data/frame_order/cam/iso_cone/pcs_dy_subset.txt
A test_suite/shared_data/frame_order/cam/iso_cone/pcs_tm_subset.txt
A test_suite/shared_data/frame_order/cam/iso_cone/subset_pcs.py
A test_suite/shared_data/frame_order/cam/iso_cone/pcs_tb_subset.txt
A test_suite/shared_data/frame_order/cam/iso_cone/pcs_er_subset.txt
A test_suite/shared_data/frame_order/cam/pseudo_ellipse2/pcs_dy_subset.txt
A test_suite/shared_data/frame_order/cam/pseudo_ellipse2/pcs_tm_subset.txt
A test_suite/shared_data/frame_order/cam/pseudo_ellipse2/subset_pcs.py
A test_suite/shared_data/frame_order/cam/pseudo_ellipse2/pcs_tb_subset.txt
A test_suite/shared_data/frame_order/cam/pseudo_ellipse2/pcs_er_subset.txt
A test_suite/shared_data/frame_order/cam/subset_pcs.py
A
test_suite/shared_data/frame_order/cam/iso_cone_torsionless/pcs_dy_subset.txt
A
test_suite/shared_data/frame_order/cam/iso_cone_torsionless/pcs_tm_subset.txt
A test_suite/shared_data/frame_order/cam/iso_cone_torsionless/subset_pcs.py
A
test_suite/shared_data/frame_order/cam/iso_cone_torsionless/pcs_tb_subset.txt
A
test_suite/shared_data/frame_order/cam/iso_cone_torsionless/pcs_er_subset.txt
A
test_suite/shared_data/frame_order/cam/pseudo_ellipse_free_rotor/subset_pcs.py
A test_suite/shared_data/frame_order/cam/rotor/pcs_dy_subset.txt
A test_suite/shared_data/frame_order/cam/rotor/pcs_tm_subset.txt
A test_suite/shared_data/frame_order/cam/rotor/subset_pcs.py
A test_suite/shared_data/frame_order/cam/rotor/pcs_tb_subset.txt
A test_suite/shared_data/frame_order/cam/rotor/pcs_er_subset.txt
A
test_suite/shared_data/frame_order/cam/iso_cone_free_rotor2/pcs_dy_subset.txt
A
test_suite/shared_data/frame_order/cam/iso_cone_free_rotor2/pcs_tm_subset.txt
A test_suite/shared_data/frame_order/cam/iso_cone_free_rotor2/subset_pcs.py
A
test_suite/shared_data/frame_order/cam/iso_cone_free_rotor2/pcs_tb_subset.txt
A
test_suite/shared_data/frame_order/cam/iso_cone_free_rotor2/pcs_er_subset.txt
A test_suite/shared_data/frame_order/cam/free_rotor/pcs_dy_subset.txt
A test_suite/shared_data/frame_order/cam/free_rotor/pcs_tm_subset.txt
A test_suite/shared_data/frame_order/cam/free_rotor/subset_pcs.py
A test_suite/shared_data/frame_order/cam/free_rotor/pcs_tb_subset.txt
A test_suite/shared_data/frame_order/cam/free_rotor/pcs_er_subset.txt
A test_suite/shared_data/frame_order/cam/pseudo_ellipse/subset_pcs.py
[edau@localhost relax-trunk]$
Added:
trunk/test_suite/shared_data/frame_order/cam/free_rotor/clean
- copied unchanged from r18027,
branches/frame_order_testing/test_suite/shared_data/frame_order/cam/free_rotor/clean
trunk/test_suite/shared_data/frame_order/cam/free_rotor/pcs_dy_subset.txt
- copied unchanged from r18029,
branches/frame_order_testing/test_suite/shared_data/frame_order/cam/free_rotor/pcs_dy_subset.txt
trunk/test_suite/shared_data/frame_order/cam/free_rotor/pcs_er_subset.txt
- copied unchanged from r18029,
branches/frame_order_testing/test_suite/shared_data/frame_order/cam/free_rotor/pcs_er_subset.txt
trunk/test_suite/shared_data/frame_order/cam/free_rotor/pcs_tb_subset.txt
- copied unchanged from r18029,
branches/frame_order_testing/test_suite/shared_data/frame_order/cam/free_rotor/pcs_tb_subset.txt
trunk/test_suite/shared_data/frame_order/cam/free_rotor/pcs_tm_subset.txt
- copied unchanged from r18029,
branches/frame_order_testing/test_suite/shared_data/frame_order/cam/free_rotor/pcs_tm_subset.txt
trunk/test_suite/shared_data/frame_order/cam/free_rotor/subset_pcs.py
- copied unchanged from r18029,
branches/frame_order_testing/test_suite/shared_data/frame_order/cam/free_rotor/subset_pcs.py
trunk/test_suite/shared_data/frame_order/cam/free_rotor2/clean
- copied unchanged from r18027,
branches/frame_order_testing/test_suite/shared_data/frame_order/cam/free_rotor2/clean
trunk/test_suite/shared_data/frame_order/cam/free_rotor2/pcs_dy_subset.txt
- copied unchanged from r18029,
branches/frame_order_testing/test_suite/shared_data/frame_order/cam/free_rotor2/pcs_dy_subset.txt
trunk/test_suite/shared_data/frame_order/cam/free_rotor2/pcs_er_subset.txt
- copied unchanged from r18029,
branches/frame_order_testing/test_suite/shared_data/frame_order/cam/free_rotor2/pcs_er_subset.txt
trunk/test_suite/shared_data/frame_order/cam/free_rotor2/pcs_tb_subset.txt
- copied unchanged from r18029,
branches/frame_order_testing/test_suite/shared_data/frame_order/cam/free_rotor2/pcs_tb_subset.txt
trunk/test_suite/shared_data/frame_order/cam/free_rotor2/pcs_tm_subset.txt
- copied unchanged from r18029,
branches/frame_order_testing/test_suite/shared_data/frame_order/cam/free_rotor2/pcs_tm_subset.txt
trunk/test_suite/shared_data/frame_order/cam/free_rotor2/subset_pcs.py
- copied unchanged from r18029,
branches/frame_order_testing/test_suite/shared_data/frame_order/cam/free_rotor2/subset_pcs.py
trunk/test_suite/shared_data/frame_order/cam/iso_cone/clean
- copied unchanged from r18027,
branches/frame_order_testing/test_suite/shared_data/frame_order/cam/iso_cone/clean
trunk/test_suite/shared_data/frame_order/cam/iso_cone/pcs_dy_subset.txt
- copied unchanged from r18029,
branches/frame_order_testing/test_suite/shared_data/frame_order/cam/iso_cone/pcs_dy_subset.txt
trunk/test_suite/shared_data/frame_order/cam/iso_cone/pcs_er_subset.txt
- copied unchanged from r18029,
branches/frame_order_testing/test_suite/shared_data/frame_order/cam/iso_cone/pcs_er_subset.txt
trunk/test_suite/shared_data/frame_order/cam/iso_cone/pcs_tb_subset.txt
- copied unchanged from r18029,
branches/frame_order_testing/test_suite/shared_data/frame_order/cam/iso_cone/pcs_tb_subset.txt
trunk/test_suite/shared_data/frame_order/cam/iso_cone/pcs_tm_subset.txt
- copied unchanged from r18029,
branches/frame_order_testing/test_suite/shared_data/frame_order/cam/iso_cone/pcs_tm_subset.txt
trunk/test_suite/shared_data/frame_order/cam/iso_cone/subset_pcs.py
- copied unchanged from r18029,
branches/frame_order_testing/test_suite/shared_data/frame_order/cam/iso_cone/subset_pcs.py
trunk/test_suite/shared_data/frame_order/cam/iso_cone_free_rotor/clean
- copied unchanged from r18027,
branches/frame_order_testing/test_suite/shared_data/frame_order/cam/iso_cone_free_rotor/clean
trunk/test_suite/shared_data/frame_order/cam/iso_cone_free_rotor/pcs_dy_subset.txt
- copied unchanged from r18029,
branches/frame_order_testing/test_suite/shared_data/frame_order/cam/iso_cone_free_rotor/pcs_dy_subset.txt
trunk/test_suite/shared_data/frame_order/cam/iso_cone_free_rotor/pcs_er_subset.txt
- copied unchanged from r18029,
branches/frame_order_testing/test_suite/shared_data/frame_order/cam/iso_cone_free_rotor/pcs_er_subset.txt
trunk/test_suite/shared_data/frame_order/cam/iso_cone_free_rotor/pcs_tb_subset.txt
- copied unchanged from r18029,
branches/frame_order_testing/test_suite/shared_data/frame_order/cam/iso_cone_free_rotor/pcs_tb_subset.txt
trunk/test_suite/shared_data/frame_order/cam/iso_cone_free_rotor/pcs_tm_subset.txt
- copied unchanged from r18029,
branches/frame_order_testing/test_suite/shared_data/frame_order/cam/iso_cone_free_rotor/pcs_tm_subset.txt
trunk/test_suite/shared_data/frame_order/cam/iso_cone_free_rotor/subset_pcs.py
- copied unchanged from r18029,
branches/frame_order_testing/test_suite/shared_data/frame_order/cam/iso_cone_free_rotor/subset_pcs.py
trunk/test_suite/shared_data/frame_order/cam/iso_cone_free_rotor2/clean
- copied unchanged from r18027,
branches/frame_order_testing/test_suite/shared_data/frame_order/cam/iso_cone_free_rotor2/clean
trunk/test_suite/shared_data/frame_order/cam/iso_cone_free_rotor2/pcs_dy_subset.txt
- copied unchanged from r18029,
branches/frame_order_testing/test_suite/shared_data/frame_order/cam/iso_cone_free_rotor2/pcs_dy_subset.txt
trunk/test_suite/shared_data/frame_order/cam/iso_cone_free_rotor2/pcs_er_subset.txt
- copied unchanged from r18029,
branches/frame_order_testing/test_suite/shared_data/frame_order/cam/iso_cone_free_rotor2/pcs_er_subset.txt
trunk/test_suite/shared_data/frame_order/cam/iso_cone_free_rotor2/pcs_tb_subset.txt
- copied unchanged from r18029,
branches/frame_order_testing/test_suite/shared_data/frame_order/cam/iso_cone_free_rotor2/pcs_tb_subset.txt
trunk/test_suite/shared_data/frame_order/cam/iso_cone_free_rotor2/pcs_tm_subset.txt
- copied unchanged from r18029,
branches/frame_order_testing/test_suite/shared_data/frame_order/cam/iso_cone_free_rotor2/pcs_tm_subset.txt
trunk/test_suite/shared_data/frame_order/cam/iso_cone_free_rotor2/subset_pcs.py
- copied unchanged from r18029,
branches/frame_order_testing/test_suite/shared_data/frame_order/cam/iso_cone_free_rotor2/subset_pcs.py
trunk/test_suite/shared_data/frame_order/cam/iso_cone_torsionless/clean
- copied unchanged from r18027,
branches/frame_order_testing/test_suite/shared_data/frame_order/cam/iso_cone_torsionless/clean
trunk/test_suite/shared_data/frame_order/cam/iso_cone_torsionless/pcs_dy_subset.txt
- copied unchanged from r18029,
branches/frame_order_testing/test_suite/shared_data/frame_order/cam/iso_cone_torsionless/pcs_dy_subset.txt
trunk/test_suite/shared_data/frame_order/cam/iso_cone_torsionless/pcs_er_subset.txt
- copied unchanged from r18029,
branches/frame_order_testing/test_suite/shared_data/frame_order/cam/iso_cone_torsionless/pcs_er_subset.txt
trunk/test_suite/shared_data/frame_order/cam/iso_cone_torsionless/pcs_tb_subset.txt
- copied unchanged from r18029,
branches/frame_order_testing/test_suite/shared_data/frame_order/cam/iso_cone_torsionless/pcs_tb_subset.txt
trunk/test_suite/shared_data/frame_order/cam/iso_cone_torsionless/pcs_tm_subset.txt
- copied unchanged from r18029,
branches/frame_order_testing/test_suite/shared_data/frame_order/cam/iso_cone_torsionless/pcs_tm_subset.txt
trunk/test_suite/shared_data/frame_order/cam/iso_cone_torsionless/subset_pcs.py
- copied unchanged from r18029,
branches/frame_order_testing/test_suite/shared_data/frame_order/cam/iso_cone_torsionless/subset_pcs.py
trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse/clean
- copied unchanged from r18027,
branches/frame_order_testing/test_suite/shared_data/frame_order/cam/pseudo_ellipse/clean
trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse/subset_pcs.py
- copied unchanged from r18029,
branches/frame_order_testing/test_suite/shared_data/frame_order/cam/pseudo_ellipse/subset_pcs.py
trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse2/clean
- copied unchanged from r18027,
branches/frame_order_testing/test_suite/shared_data/frame_order/cam/pseudo_ellipse2/clean
trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse2/pcs_dy_subset.txt
- copied unchanged from r18029,
branches/frame_order_testing/test_suite/shared_data/frame_order/cam/pseudo_ellipse2/pcs_dy_subset.txt
trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse2/pcs_er_subset.txt
- copied unchanged from r18029,
branches/frame_order_testing/test_suite/shared_data/frame_order/cam/pseudo_ellipse2/pcs_er_subset.txt
trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse2/pcs_tb_subset.txt
- copied unchanged from r18029,
branches/frame_order_testing/test_suite/shared_data/frame_order/cam/pseudo_ellipse2/pcs_tb_subset.txt
trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse2/pcs_tm_subset.txt
- copied unchanged from r18029,
branches/frame_order_testing/test_suite/shared_data/frame_order/cam/pseudo_ellipse2/pcs_tm_subset.txt
trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse2/subset_pcs.py
- copied unchanged from r18029,
branches/frame_order_testing/test_suite/shared_data/frame_order/cam/pseudo_ellipse2/subset_pcs.py
trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse_free_rotor/clean
- copied unchanged from r18027,
branches/frame_order_testing/test_suite/shared_data/frame_order/cam/pseudo_ellipse_free_rotor/clean
trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse_free_rotor/subset_pcs.py
- copied unchanged from r18029,
branches/frame_order_testing/test_suite/shared_data/frame_order/cam/pseudo_ellipse_free_rotor/subset_pcs.py
trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse_torsionless/clean
- copied unchanged from r18027,
branches/frame_order_testing/test_suite/shared_data/frame_order/cam/pseudo_ellipse_torsionless/clean
trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse_torsionless/subset_pcs.py
- copied unchanged from r18029,
branches/frame_order_testing/test_suite/shared_data/frame_order/cam/pseudo_ellipse_torsionless/subset_pcs.py
trunk/test_suite/shared_data/frame_order/cam/rigid/clean
- copied, changed from r18025,
branches/frame_order_testing/test_suite/shared_data/frame_order/cam/rigid/clean
trunk/test_suite/shared_data/frame_order/cam/rigid/subset_pcs.py
- copied unchanged from r18029,
branches/frame_order_testing/test_suite/shared_data/frame_order/cam/rigid/subset_pcs.py
trunk/test_suite/shared_data/frame_order/cam/rotor/clean
- copied unchanged from r18027,
branches/frame_order_testing/test_suite/shared_data/frame_order/cam/rotor/clean
trunk/test_suite/shared_data/frame_order/cam/rotor/pcs_dy_subset.txt
- copied unchanged from r18029,
branches/frame_order_testing/test_suite/shared_data/frame_order/cam/rotor/pcs_dy_subset.txt
trunk/test_suite/shared_data/frame_order/cam/rotor/pcs_er_subset.txt
- copied unchanged from r18029,
branches/frame_order_testing/test_suite/shared_data/frame_order/cam/rotor/pcs_er_subset.txt
trunk/test_suite/shared_data/frame_order/cam/rotor/pcs_tb_subset.txt
- copied unchanged from r18029,
branches/frame_order_testing/test_suite/shared_data/frame_order/cam/rotor/pcs_tb_subset.txt
trunk/test_suite/shared_data/frame_order/cam/rotor/pcs_tm_subset.txt
- copied unchanged from r18029,
branches/frame_order_testing/test_suite/shared_data/frame_order/cam/rotor/pcs_tm_subset.txt
trunk/test_suite/shared_data/frame_order/cam/rotor/subset_pcs.py
- copied unchanged from r18029,
branches/frame_order_testing/test_suite/shared_data/frame_order/cam/rotor/subset_pcs.py
trunk/test_suite/shared_data/frame_order/cam/rotor2/clean
- copied unchanged from r18027,
branches/frame_order_testing/test_suite/shared_data/frame_order/cam/rotor2/clean
trunk/test_suite/shared_data/frame_order/cam/rotor2/pcs_dy_subset.txt
- copied unchanged from r18029,
branches/frame_order_testing/test_suite/shared_data/frame_order/cam/rotor2/pcs_dy_subset.txt
trunk/test_suite/shared_data/frame_order/cam/rotor2/pcs_er_subset.txt
[... 44 lines stripped ...]
r18988 - in /trunk: auto_analyses/ specific_fns/ test_suite/shared_data/frame_order/cam/ test_suite/shared_data/frame_order/...