Menu ▾ ▴

Commit [r18965]  Maximize  Restore  History

Next block of the manual merger of the frame_order_testing branch.

The commands used were:
svn merge -r15330:15331 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15331:15332 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15332:15333 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15335:15336 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15337:15338 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15338:15339 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15339:15340 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .

The console messages were:
[edau@... relax-trunk]$ svn merge -r15330:15331 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15331 into '.':
U test_suite/system_tests/scripts/frame_order/cam/iso_cone.py
U test_suite/system_tests/scripts/frame_order/cam/iso_cone_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.py
U test_suite/system_tests/scripts/frame_order/cam/free_rotor.py
[edau@... relax-trunk]$ svn merge -r15331:15332 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15332 into '.':
U test_suite/system_tests/frame_order.py
[edau@... relax-trunk]$ svn merge -r15332:15333 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15333 into '.':
U test_suite/shared_data/frame_order/cam/opt_stats
[edau@... relax-trunk]$ svn merge -r15335:15336 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15336 into '.':
U generic_fns/frame_order.py
[edau@... relax-trunk]$ svn merge -r15337:15338 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15338 into '.':
G test_suite/system_tests/frame_order.py
[edau@... relax-trunk]$ svn merge -r15338:15339 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15339 into '.':
G test_suite/shared_data/frame_order/cam/opt_stats
U test_suite/shared_data/frame_order/cam/pseudo_ellipse_torsionless/generate_distribution.py
U test_suite/shared_data/frame_order/cam/pseudo_ellipse_torsionless/rdc_dy.txt
U test_suite/shared_data/frame_order/cam/pseudo_ellipse_torsionless/rdc_tm.txt
U test_suite/shared_data/frame_order/cam/pseudo_ellipse_torsionless/pcs_tb.txt
U test_suite/shared_data/frame_order/cam/pseudo_ellipse_torsionless/pcs_er.txt
U test_suite/shared_data/frame_order/cam/pseudo_ellipse_torsionless/pcs_dy.txt
U test_suite/shared_data/frame_order/cam/pseudo_ellipse_torsionless/pcs_tm.txt
U 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/axis_system
A test_suite/shared_data/frame_order/cam/pseudo_ellipse_torsionless/frame_order_matrix
U test_suite/shared_data/frame_order/cam/pseudo_ellipse_torsionless/rdc_tb.txt
U test_suite/shared_data/frame_order/cam/pseudo_ellipse_torsionless/rdc_er.txt
D test_suite/shared_data/frame_order/cam/pseudo_ellipse_torsionless/back_calc.py
D test_suite/shared_data/frame_order/cam/pseudo_ellipse_torsionless/README
Conflict discovered in 'test_suite/shared_data/frame_order/cam/iso_cone_free_rotor/generate_distribution.py'.
Select: (p) postpone, (df) diff-full, (e) edit,
(mc) mine-conflict, (tc) theirs-conflict,
(s) show all options: p
C test_suite/shared_data/frame_order/cam/iso_cone_free_rotor/generate_distribution.py
U test_suite/shared_data/frame_order/cam/iso_cone_free_rotor/rdc_dy.txt
U test_suite/shared_data/frame_order/cam/iso_cone_free_rotor/rdc_tm.txt
U test_suite/shared_data/frame_order/cam/iso_cone_free_rotor/pcs_tb.txt
U test_suite/shared_data/frame_order/cam/iso_cone_free_rotor/pcs_er.txt
U test_suite/shared_data/frame_order/cam/iso_cone_free_rotor/pcs_dy.txt
U test_suite/shared_data/frame_order/cam/iso_cone_free_rotor/pcs_tm.txt
U 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/axis_system
U 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/frame_order_matrix
U test_suite/shared_data/frame_order/cam/iso_cone_free_rotor/rdc_tb.txt
U test_suite/shared_data/frame_order/cam/iso_cone_free_rotor/rdc_er.txt
D test_suite/shared_data/frame_order/cam/iso_cone_free_rotor/README
D test_suite/shared_data/frame_order/cam/iso_cone_free_rotor/back_calc.py
U test_suite/shared_data/frame_order/cam/rotor_2_state/generate_distribution.py
D test_suite/shared_data/frame_order/cam/rotor_2_state/back_calc.py
D test_suite/shared_data/frame_order/cam/rotor_2_state/README
D test_suite/shared_data/frame_order/cam/rotor_2_state/back_calc.bz2
U test_suite/shared_data/frame_order/cam/rotor2/generate_distribution.py
D test_suite/shared_data/frame_order/cam/rotor2/back_calc.py
D test_suite/shared_data/frame_order/cam/rotor2/README
D test_suite/shared_data/frame_order/cam/rotor2/back_calc.bz2
U test_suite/shared_data/frame_order/cam/free_rotor2/generate_distribution.py
D test_suite/shared_data/frame_order/cam/free_rotor2/back_calc.py
D test_suite/shared_data/frame_order/cam/free_rotor2/README
D test_suite/shared_data/frame_order/cam/free_rotor2/back_calc.bz2
U test_suite/shared_data/frame_order/cam/README
D test_suite/shared_data/frame_order/cam/rigid/back_calc.py
D test_suite/shared_data/frame_order/cam/rigid/back_calc.bz2
U test_suite/shared_data/frame_order/cam/iso_cone/generate_distribution.py
U test_suite/shared_data/frame_order/cam/iso_cone/rdc_dy.txt
U test_suite/shared_data/frame_order/cam/iso_cone/rdc_tm.txt
U test_suite/shared_data/frame_order/cam/iso_cone/pcs_tb.txt
U test_suite/shared_data/frame_order/cam/iso_cone/pcs_er.txt
U test_suite/shared_data/frame_order/cam/iso_cone/pcs_dy.txt
U test_suite/shared_data/frame_order/cam/iso_cone/pcs_tm.txt
U test_suite/shared_data/frame_order/cam/iso_cone/generate_distribution.log.bz2
A test_suite/shared_data/frame_order/cam/iso_cone/axis_system
U test_suite/shared_data/frame_order/cam/iso_cone/axis.pdb
A test_suite/shared_data/frame_order/cam/iso_cone/frame_order_matrix
U test_suite/shared_data/frame_order/cam/iso_cone/rdc_tb.txt
U test_suite/shared_data/frame_order/cam/iso_cone/rdc_er.txt
D test_suite/shared_data/frame_order/cam/iso_cone/back_calc.py
D test_suite/shared_data/frame_order/cam/iso_cone/README
U test_suite/shared_data/frame_order/cam/pseudo_ellipse_free_rotor/generate_distribution.py
U test_suite/shared_data/frame_order/cam/pseudo_ellipse_free_rotor/rdc_dy.txt
U test_suite/shared_data/frame_order/cam/pseudo_ellipse_free_rotor/rdc_tm.txt
U test_suite/shared_data/frame_order/cam/pseudo_ellipse_free_rotor/pcs_tb.txt
U test_suite/shared_data/frame_order/cam/pseudo_ellipse_free_rotor/pcs_er.txt
U test_suite/shared_data/frame_order/cam/pseudo_ellipse_free_rotor/pcs_dy.txt
U test_suite/shared_data/frame_order/cam/pseudo_ellipse_free_rotor/pcs_tm.txt
U 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/axis_system
A test_suite/shared_data/frame_order/cam/pseudo_ellipse_free_rotor/frame_order_matrix
U test_suite/shared_data/frame_order/cam/pseudo_ellipse_free_rotor/rdc_tb.txt
U test_suite/shared_data/frame_order/cam/pseudo_ellipse_free_rotor/rdc_er.txt
D test_suite/shared_data/frame_order/cam/pseudo_ellipse_free_rotor/README
D test_suite/shared_data/frame_order/cam/pseudo_ellipse_free_rotor/back_calc.py
U test_suite/shared_data/frame_order/cam/iso_cone_torsionless/generate_distribution.py
U test_suite/shared_data/frame_order/cam/iso_cone_torsionless/rdc_dy.txt
U test_suite/shared_data/frame_order/cam/iso_cone_torsionless/rdc_tm.txt
U test_suite/shared_data/frame_order/cam/iso_cone_torsionless/pcs_tb.txt
U test_suite/shared_data/frame_order/cam/iso_cone_torsionless/pcs_er.txt
U test_suite/shared_data/frame_order/cam/iso_cone_torsionless/pcs_dy.txt
U test_suite/shared_data/frame_order/cam/iso_cone_torsionless/pcs_tm.txt
U test_suite/shared_data/frame_order/cam/iso_cone_torsionless/generate_distribution.log.bz2
U test_suite/shared_data/frame_order/cam/iso_cone_torsionless/axis.pdb
U test_suite/shared_data/frame_order/cam/iso_cone_torsionless/rdc_tb.txt
U test_suite/shared_data/frame_order/cam/iso_cone_torsionless/rdc_er.txt
D test_suite/shared_data/frame_order/cam/iso_cone_torsionless/README
D test_suite/shared_data/frame_order/cam/iso_cone_torsionless/back_calc.py
U test_suite/shared_data/frame_order/cam/rotor/generate_distribution.py
D test_suite/shared_data/frame_order/cam/rotor/back_calc.py
D test_suite/shared_data/frame_order/cam/rotor/README
D test_suite/shared_data/frame_order/cam/rotor/back_calc.bz2
Conflict discovered in 'test_suite/shared_data/frame_order/cam/iso_cone_free_rotor2/generate_distribution.py'.
Select: (p) postpone, (df) diff-full, (e) edit,
(mc) mine-conflict, (tc) theirs-conflict,
(s) show all options: p
C test_suite/shared_data/frame_order/cam/iso_cone_free_rotor2/generate_distribution.py
U test_suite/shared_data/frame_order/cam/iso_cone_free_rotor2/rdc_dy.txt
U test_suite/shared_data/frame_order/cam/iso_cone_free_rotor2/rdc_tm.txt
U test_suite/shared_data/frame_order/cam/iso_cone_free_rotor2/pcs_tb.txt
U test_suite/shared_data/frame_order/cam/iso_cone_free_rotor2/pcs_er.txt
U test_suite/shared_data/frame_order/cam/iso_cone_free_rotor2/pcs_dy.txt
U test_suite/shared_data/frame_order/cam/iso_cone_free_rotor2/pcs_tm.txt
U 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/axis_system
A test_suite/shared_data/frame_order/cam/iso_cone_free_rotor2/frame_order_matrix
U test_suite/shared_data/frame_order/cam/iso_cone_free_rotor2/rdc_tb.txt
U test_suite/shared_data/frame_order/cam/iso_cone_free_rotor2/rdc_er.txt
D test_suite/shared_data/frame_order/cam/iso_cone_free_rotor2/back_calc.py
D test_suite/shared_data/frame_order/cam/iso_cone_free_rotor2/README
U test_suite/shared_data/frame_order/cam/free_rotor/generate_distribution.py
U test_suite/shared_data/frame_order/cam/free_rotor/rdc_dy.txt
U test_suite/shared_data/frame_order/cam/free_rotor/rdc_tm.txt
U test_suite/shared_data/frame_order/cam/free_rotor/pcs_tb.txt
U test_suite/shared_data/frame_order/cam/free_rotor/pcs_er.txt
U test_suite/shared_data/frame_order/cam/free_rotor/pcs_dy.txt
U test_suite/shared_data/frame_order/cam/free_rotor/distribution.pdb.gz
U test_suite/shared_data/frame_order/cam/free_rotor/pcs_tm.txt
U test_suite/shared_data/frame_order/cam/free_rotor/animate.py
A test_suite/shared_data/frame_order/cam/free_rotor/axis_system
A test_suite/shared_data/frame_order/cam/free_rotor/frame_order_matrix
U test_suite/shared_data/frame_order/cam/free_rotor/rdc_tb.txt
U test_suite/shared_data/frame_order/cam/free_rotor/rdc_er.txt
D test_suite/shared_data/frame_order/cam/free_rotor/back_calc.py
D test_suite/shared_data/frame_order/cam/free_rotor/README
D test_suite/shared_data/frame_order/cam/free_rotor/back_calc.bz2
A test_suite/shared_data/frame_order/cam/generate_base.py
U test_suite/shared_data/frame_order/cam/pseudo_ellipse/generate_distribution.py
U test_suite/shared_data/frame_order/cam/pseudo_ellipse/rdc_dy.txt
U test_suite/shared_data/frame_order/cam/pseudo_ellipse/rdc_tm.txt
U test_suite/shared_data/frame_order/cam/pseudo_ellipse/pcs_tb.txt
U test_suite/shared_data/frame_order/cam/pseudo_ellipse/pcs_er.txt
U test_suite/shared_data/frame_order/cam/pseudo_ellipse/pcs_dy.txt
U test_suite/shared_data/frame_order/cam/pseudo_ellipse/pcs_tm.txt
U test_suite/shared_data/frame_order/cam/pseudo_ellipse/generate_distribution.log.bz2
A test_suite/shared_data/frame_order/cam/pseudo_ellipse/axis_system
A test_suite/shared_data/frame_order/cam/pseudo_ellipse/frame_order_matrix
U test_suite/shared_data/frame_order/cam/pseudo_ellipse/rdc_tb.txt
U test_suite/shared_data/frame_order/cam/pseudo_ellipse/rdc_er.txt
D test_suite/shared_data/frame_order/cam/pseudo_ellipse/back_calc.py
D test_suite/shared_data/frame_order/cam/pseudo_ellipse/README
Summary of conflicts:
Text conflicts: 2
[edau@... relax-trunk]$ svn merge -r15339:15340 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15340 into '.':
U test_suite/system_tests/scripts/frame_order/cam/pseudo_ellipse.py
U test_suite/system_tests/scripts/frame_order/cam/pseudo_ellipse_free_rotor.py
U test_suite/system_tests/scripts/frame_order/cam/iso_cone_free_rotor2.py
[edau@... relax-trunk]$

bugman 2013-03-22

Browse code at this revision

Parent: [r18964]

Child: [r18966]

1 2 3 .. 6 > >> (Page 1 of 6)
copied /branches/frame_order_testing/test_suite/shared_data/frame_order/cam/free_rotor/axis_system -> /trunk/test_suite/shared_data/frame_order/cam/free_rotor/axis_system
copied /branches/frame_order_testing/test_suite/shared_data/frame_order/cam/free_rotor/frame_order_matrix -> /trunk/test_suite/shared_data/frame_order/cam/free_rotor/frame_order_matrix
copied /branches/frame_order_testing/test_suite/shared_data/frame_order/cam/generate_base.py -> /trunk/test_suite/shared_data/frame_order/cam/generate_base.py
changed /trunk/generic_fns/frame_order.py
changed /trunk/test_suite/shared_data/frame_order/cam/README
removed /trunk/test_suite/shared_data/frame_order/cam/free_rotor/README
changed /trunk/test_suite/shared_data/frame_order/cam/free_rotor/animate.py
removed /trunk/test_suite/shared_data/frame_order/cam/free_rotor/back_calc.bz2
removed /trunk/test_suite/shared_data/frame_order/cam/free_rotor/back_calc.py
changed /trunk/test_suite/shared_data/frame_order/cam/free_rotor/distribution.pdb.gz
changed /trunk/test_suite/shared_data/frame_order/cam/free_rotor/generate_distribution.py
changed /trunk/test_suite/shared_data/frame_order/cam/free_rotor/pcs_dy.txt
changed /trunk/test_suite/shared_data/frame_order/cam/free_rotor/pcs_er.txt
changed /trunk/test_suite/shared_data/frame_order/cam/free_rotor/pcs_tb.txt
changed /trunk/test_suite/shared_data/frame_order/cam/free_rotor/pcs_tm.txt
changed /trunk/test_suite/shared_data/frame_order/cam/free_rotor/rdc_dy.txt
changed /trunk/test_suite/shared_data/frame_order/cam/free_rotor/rdc_er.txt
changed /trunk/test_suite/shared_data/frame_order/cam/free_rotor/rdc_tb.txt
changed /trunk/test_suite/shared_data/frame_order/cam/free_rotor/rdc_tm.txt
removed /trunk/test_suite/shared_data/frame_order/cam/free_rotor2/README
removed /trunk/test_suite/shared_data/frame_order/cam/free_rotor2/back_calc.bz2
removed /trunk/test_suite/shared_data/frame_order/cam/free_rotor2/back_calc.py
changed /trunk/test_suite/shared_data/frame_order/cam/free_rotor2/generate_distribution.py
removed /trunk/test_suite/shared_data/frame_order/cam/iso_cone/README
changed /trunk/test_suite/shared_data/frame_order/cam/iso_cone/axis.pdb
/branches/frame_order_testing/test_suite/shared_data/frame_order/cam/free_rotor/axis_system to /trunk/test_suite/shared_data/frame_order/cam/free_rotor/axis_system
File was copied.
/branches/frame_order_testing/test_suite/shared_data/frame_order/cam/free_rotor/frame_order_matrix to /trunk/test_suite/shared_data/frame_order/cam/free_rotor/frame_order_matrix
File was copied.
/branches/frame_order_testing/test_suite/shared_data/frame_order/cam/generate_base.py to /trunk/test_suite/shared_data/frame_order/cam/generate_base.py
File was copied.
/trunk/generic_fns/frame_order.py Diff Switch to side-by-side view
Loading...
/trunk/test_suite/shared_data/frame_order/cam/README Diff Switch to side-by-side view
Loading...
/trunk/test_suite/shared_data/frame_order/cam/free_rotor/README
File was removed.
/trunk/test_suite/shared_data/frame_order/cam/free_rotor/animate.py Diff Switch to side-by-side view
Loading...
/trunk/test_suite/shared_data/frame_order/cam/free_rotor/back_calc.bz2
File was removed.
/trunk/test_suite/shared_data/frame_order/cam/free_rotor/back_calc.py
File was removed.
/trunk/test_suite/shared_data/frame_order/cam/free_rotor/distribution.pdb.gz
Binary file was changed.
/trunk/test_suite/shared_data/frame_order/cam/free_rotor/generate_distribution.py Diff Switch to side-by-side view
Loading...
/trunk/test_suite/shared_data/frame_order/cam/free_rotor/pcs_dy.txt Diff Switch to side-by-side view
Loading...
/trunk/test_suite/shared_data/frame_order/cam/free_rotor/pcs_er.txt Diff Switch to side-by-side view
Loading...
/trunk/test_suite/shared_data/frame_order/cam/free_rotor/pcs_tb.txt Diff Switch to side-by-side view
Loading...
/trunk/test_suite/shared_data/frame_order/cam/free_rotor/pcs_tm.txt Diff Switch to side-by-side view
Loading...
/trunk/test_suite/shared_data/frame_order/cam/free_rotor/rdc_dy.txt Diff Switch to side-by-side view
Loading...
/trunk/test_suite/shared_data/frame_order/cam/free_rotor/rdc_er.txt Diff Switch to side-by-side view
Loading...
/trunk/test_suite/shared_data/frame_order/cam/free_rotor/rdc_tb.txt Diff Switch to side-by-side view
Loading...
/trunk/test_suite/shared_data/frame_order/cam/free_rotor/rdc_tm.txt Diff Switch to side-by-side view
Loading...
/trunk/test_suite/shared_data/frame_order/cam/free_rotor2/README
File was removed.
/trunk/test_suite/shared_data/frame_order/cam/free_rotor2/back_calc.bz2
File was removed.
/trunk/test_suite/shared_data/frame_order/cam/free_rotor2/back_calc.py
File was removed.
/trunk/test_suite/shared_data/frame_order/cam/free_rotor2/generate_distribution.py Diff Switch to side-by-side view
Loading...
/trunk/test_suite/shared_data/frame_order/cam/iso_cone/README
File was removed.
/trunk/test_suite/shared_data/frame_order/cam/iso_cone/axis.pdb Diff Switch to side-by-side view
Loading...
1 2 3 .. 6 > >> (Page 1 of 6)
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.