relax SVN archive

Molecular dynamics by NMR data analysis

Brought to you by: edauvergne, troelslinnet

Commit [r18976] Maximize Restore History

Next block of the manual merger of the frame_order_testing branch.

The commands used were:
svn merge -r17280:17281 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r17281:17282 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r17282:17283 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r17283:17284 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r17284:17285 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r17285:17286 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r17286:17287 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r17287:17288 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r17288:17289 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r17289:17290 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .

The console messages were:
[edau@... relax-trunk]$ svn merge -r17280:17281 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r17281 into '.':
U maths_fns/frame_order.py
U specific_fns/frame_order.py
[edau@... relax-trunk]$ svn merge -r17281:17282 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r17282 into '.':
G maths_fns/frame_order.py
[edau@... relax-trunk]$ svn merge -r17282:17283 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r17283 into '.':
U test_suite/shared_data/frame_order/cam/pseudo_ellipse_torsionless/tensor_fit.py
U test_suite/shared_data/frame_order/cam/pseudo_ellipse_torsionless/frame_order.py
U test_suite/shared_data/frame_order/cam/iso_cone_free_rotor/tensor_fit.py
U test_suite/shared_data/frame_order/cam/iso_cone_free_rotor/frame_order.py
U test_suite/shared_data/frame_order/cam/rotor_2_state/tensor_fit.py
U test_suite/shared_data/frame_order/cam/rotor2/tensor_fit.py
U test_suite/shared_data/frame_order/cam/rotor2/frame_order.py
U test_suite/shared_data/frame_order/cam/free_rotor2/tensor_fit.py
U test_suite/shared_data/frame_order/cam/free_rotor2/frame_order.py
U test_suite/shared_data/frame_order/cam/rigid/tensor_fit.py
U test_suite/shared_data/frame_order/cam/rigid/frame_order.py
U test_suite/shared_data/frame_order/cam/iso_cone/tensor_fit.py
U test_suite/shared_data/frame_order/cam/iso_cone/frame_order.py
U test_suite/shared_data/frame_order/cam/pseudo_ellipse2/tensor_fit.py
U test_suite/shared_data/frame_order/cam/pseudo_ellipse2/frame_order.py
U test_suite/shared_data/frame_order/cam/pseudo_ellipse_free_rotor/tensor_fit.py
U test_suite/shared_data/frame_order/cam/pseudo_ellipse_free_rotor/frame_order_pseudo_ellipse.py
U test_suite/shared_data/frame_order/cam/pseudo_ellipse_free_rotor/frame_order.py
U test_suite/shared_data/frame_order/cam/iso_cone_torsionless/tensor_fit.py
U test_suite/shared_data/frame_order/cam/iso_cone_torsionless/frame_order.py
U test_suite/shared_data/frame_order/cam/rotor/tensor_fit.py
U test_suite/shared_data/frame_order/cam/rotor/frame_order.py
U test_suite/shared_data/frame_order/cam/iso_cone_free_rotor2/tensor_fit.py
U test_suite/shared_data/frame_order/cam/iso_cone_free_rotor2/frame_order.py
U test_suite/shared_data/frame_order/cam/free_rotor/tensor_fit.py
U test_suite/shared_data/frame_order/cam/free_rotor/frame_order.py
U test_suite/shared_data/frame_order/cam/pseudo_ellipse/tensor_fit.py
U test_suite/shared_data/frame_order/cam/pseudo_ellipse/frame_order.py
[edau@... relax-trunk]$ svn merge -r17283:17284 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r17284 into '.':
G maths_fns/frame_order.py
[edau@... relax-trunk]$ svn merge -r17284:17285 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r17285 into '.':
G maths_fns/frame_order.py
[edau@... relax-trunk]$ svn merge -r17285:17286 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r17286 into '.':
G maths_fns/frame_order.py
[edau@... relax-trunk]$ svn merge -r17286:17287 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r17287 into '.':
U test_suite/shared_data/frame_order/cam/generate_base.py
[edau@... relax-trunk]$ svn merge -r17287:17288 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r17288 into '.':
G test_suite/shared_data/frame_order/cam/pseudo_ellipse_torsionless/frame_order.py
G test_suite/shared_data/frame_order/cam/iso_cone_free_rotor/frame_order.py
G test_suite/shared_data/frame_order/cam/rotor2/frame_order.py
G test_suite/shared_data/frame_order/cam/free_rotor2/frame_order.py
G test_suite/shared_data/frame_order/cam/rigid/frame_order.py
G test_suite/shared_data/frame_order/cam/iso_cone/frame_order.py
G test_suite/shared_data/frame_order/cam/pseudo_ellipse2/frame_order.py
G test_suite/shared_data/frame_order/cam/pseudo_ellipse_free_rotor/frame_order_pseudo_ellipse.py
G test_suite/shared_data/frame_order/cam/pseudo_ellipse_free_rotor/frame_order.py
G test_suite/shared_data/frame_order/cam/iso_cone_torsionless/frame_order.py
G test_suite/shared_data/frame_order/cam/rotor/frame_order.py
G test_suite/shared_data/frame_order/cam/iso_cone_free_rotor2/frame_order.py
G test_suite/shared_data/frame_order/cam/free_rotor/frame_order.py
G test_suite/shared_data/frame_order/cam/pseudo_ellipse/frame_order.py
[edau@... relax-trunk]$ svn merge -r17288:17289 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r17289 into '.':
G test_suite/shared_data/frame_order/cam/pseudo_ellipse_torsionless/frame_order.py
G test_suite/shared_data/frame_order/cam/iso_cone_free_rotor/frame_order.py
G test_suite/shared_data/frame_order/cam/rotor2/frame_order.py
G test_suite/shared_data/frame_order/cam/free_rotor2/frame_order.py
G test_suite/shared_data/frame_order/cam/iso_cone/frame_order.py
G test_suite/shared_data/frame_order/cam/pseudo_ellipse2/frame_order.py
G test_suite/shared_data/frame_order/cam/pseudo_ellipse_free_rotor/frame_order_pseudo_ellipse.py
G test_suite/shared_data/frame_order/cam/pseudo_ellipse_free_rotor/frame_order.py
G test_suite/shared_data/frame_order/cam/iso_cone_torsionless/frame_order.py
G test_suite/shared_data/frame_order/cam/rotor/frame_order.py
G test_suite/shared_data/frame_order/cam/iso_cone_free_rotor2/frame_order.py
G test_suite/shared_data/frame_order/cam/free_rotor/frame_order.py
G test_suite/shared_data/frame_order/cam/pseudo_ellipse/frame_order.py
[edau@... relax-trunk]$ svn merge -r17289:17290 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r17290 into '.':
G test_suite/shared_data/frame_order/cam/iso_cone_free_rotor2/frame_order.py
[edau@... relax-trunk]$

Authored by: bugman 2013-03-22

Browse code at this revision

Parent: [r18975]

Child: [r18977]

1 2 > >> (Page 1 of 2)

changed	/trunk/maths_fns/frame_order.py
changed	/trunk/specific_fns/frame_order.py
changed	/trunk/test_suite/shared_data/frame_order/cam/free_rotor/frame_order.py
changed	/trunk/test_suite/shared_data/frame_order/cam/free_rotor/tensor_fit.py
changed	/trunk/test_suite/shared_data/frame_order/cam/free_rotor2/frame_order.py
changed	/trunk/test_suite/shared_data/frame_order/cam/free_rotor2/tensor_fit.py
changed	/trunk/test_suite/shared_data/frame_order/cam/generate_base.py
changed	/trunk/test_suite/shared_data/frame_order/cam/iso_cone/frame_order.py
changed	/trunk/test_suite/shared_data/frame_order/cam/iso_cone/tensor_fit.py
changed	/trunk/test_suite/shared_data/frame_order/cam/iso_cone_free_rotor/frame_order.py
changed	/trunk/test_suite/shared_data/frame_order/cam/iso_cone_free_rotor/tensor_fit.py
changed	/trunk/test_suite/shared_data/frame_order/cam/iso_cone_free_rotor2/frame_order.py
changed	/trunk/test_suite/shared_data/frame_order/cam/iso_cone_free_rotor2/tensor_fit.py
changed	/trunk/test_suite/shared_data/frame_order/cam/iso_cone_torsionless/frame_order.py
changed	/trunk/test_suite/shared_data/frame_order/cam/iso_cone_torsionless/tensor_fit.py
changed	/trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse/frame_order.py
changed	/trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse/tensor_fit.py
changed	/trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse2/frame_order.py
changed	/trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse2/tensor_fit.py
changed	/trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse_free_rotor/frame_order.py
changed	/trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse_free_rotor/frame_order_pseudo_ellipse.py
changed	/trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse_free_rotor/tensor_fit.py
changed	/trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse_torsionless/frame_order.py
changed	/trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse_torsionless/tensor_fit.py
changed	/trunk/test_suite/shared_data/frame_order/cam/rigid/frame_order.py

relax SVN archive

Molecular dynamics by NMR data analysis

Commit [r18976] Maximize Restore History

/trunk/maths_fns/frame_order.py Diff Switch to side-by-side view

/trunk/specific_fns/frame_order.py Diff Switch to side-by-side view

/trunk/test_suite/shared_data/frame_order/cam/free_rotor/frame_order.py Diff Switch to side-by-side view

/trunk/test_suite/shared_data/frame_order/cam/free_rotor/tensor_fit.py Diff Switch to side-by-side view

/trunk/test_suite/shared_data/frame_order/cam/free_rotor2/frame_order.py Diff Switch to side-by-side view

/trunk/test_suite/shared_data/frame_order/cam/free_rotor2/tensor_fit.py Diff Switch to side-by-side view

/trunk/test_suite/shared_data/frame_order/cam/generate_base.py Diff Switch to side-by-side view

/trunk/test_suite/shared_data/frame_order/cam/iso_cone/frame_order.py Diff Switch to side-by-side view

/trunk/test_suite/shared_data/frame_order/cam/iso_cone/tensor_fit.py Diff Switch to side-by-side view

/trunk/test_suite/shared_data/frame_order/cam/iso_cone_free_rotor/frame_order.py Diff Switch to side-by-side view

/trunk/test_suite/shared_data/frame_order/cam/iso_cone_free_rotor/tensor_fit.py Diff Switch to side-by-side view

/trunk/test_suite/shared_data/frame_order/cam/iso_cone_free_rotor2/frame_order.py Diff Switch to side-by-side view

/trunk/test_suite/shared_data/frame_order/cam/iso_cone_free_rotor2/tensor_fit.py Diff Switch to side-by-side view

/trunk/test_suite/shared_data/frame_order/cam/iso_cone_torsionless/frame_order.py Diff Switch to side-by-side view

/trunk/test_suite/shared_data/frame_order/cam/iso_cone_torsionless/tensor_fit.py Diff Switch to side-by-side view

/trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse/frame_order.py Diff Switch to side-by-side view

/trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse/tensor_fit.py Diff Switch to side-by-side view

/trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse2/frame_order.py Diff Switch to side-by-side view

/trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse2/tensor_fit.py Diff Switch to side-by-side view

/trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse_free_rotor/frame_order.py Diff Switch to side-by-side view

/trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse_free_rotor/frame_order_pseudo_ellipse.py Diff Switch to side-by-side view

/trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse_free_rotor/tensor_fit.py Diff Switch to side-by-side view

/trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse_torsionless/frame_order.py Diff Switch to side-by-side view

/trunk/test_suite/shared_data/frame_order/cam/pseudo_ellipse_torsionless/tensor_fit.py Diff Switch to side-by-side view

/trunk/test_suite/shared_data/frame_order/cam/rigid/frame_order.py Diff Switch to side-by-side view