Menu ▾ ▴

SVN archive Commit Log


Commit Date  
[r18978] by bugman

Next block of the manual merger of the frame_order_testing branch.

The commands used were:
svn merge -r17300:17301 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r17301:17302 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r17302:17303 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r17303:17304 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r17304:17305 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r17305:17306 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r17306:17307 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r17307:17308 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r17308:17309 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r17309:17310 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .

The console messages were:
[edau@... relax-trunk]$ svn merge -r17300:17301 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
[edau@... relax-trunk]$ svn merge -r17301:17302 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r17302 into '.':
U test_suite/shared_data/frame_order/cam/opt_stats
[edau@... relax-trunk]$ svn merge -r17302:17303 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r17303 into '.':
G test_suite/shared_data/frame_order/cam/opt_stats
U test_suite/shared_data/frame_order/cam/free_rotor/frame_order.py
[edau@... relax-trunk]$ svn merge -r17303:17304 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r17304 into '.':
G test_suite/shared_data/frame_order/cam/opt_stats
U test_suite/shared_data/frame_order/cam/rotor2/frame_order.py
U test_suite/shared_data/frame_order/cam/rotor/frame_order.py
[edau@... relax-trunk]$ svn merge -r17304:17305 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r17305 into '.':
G test_suite/shared_data/frame_order/cam/opt_stats
[edau@... relax-trunk]$ svn merge -r17305:17306 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r17306 into '.':
U test_suite/system_tests/frame_order.py
[edau@... relax-trunk]$ svn merge -r17306:17307 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r17307 into '.':
G test_suite/shared_data/frame_order/cam/opt_stats
[edau@... relax-trunk]$ svn merge -r17307:17308 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r17308 into '.':
U test_suite/shared_data/frame_order/cam/generate_base.py
[edau@... relax-trunk]$ svn merge -r17308:17309 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r17309 into '.':
U test_suite/system_tests/scripts/n_state_model/5_state_xz.py
[edau@... relax-trunk]$ svn merge -r17309:17310 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r17310 into '.':
U generic_fns/align_tensor.py
U user_functions/align_tensor.py
[edau@... relax-trunk]$

 2013-03-22 15:42:12 Tree
[r18977] by bugman

Next block of the manual merger of the frame_order_testing branch.

The commands used were:
svn merge -r17290:17291 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r17291:17292 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r17292:17293 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r17293:17294 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r17295:17296 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r17296:17297 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r17297:17298 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r17298:17299 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r17299:17300 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .

The console messages were:
[edau@... relax-trunk]$ svn merge -r17290:17291 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r17291 into '.':
U maths_fns/frame_order.py
[edau@... relax-trunk]$ svn merge -r17291:17292 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r17292 into '.':
U specific_fns/frame_order.py
U user_functions/frame_order.py
[edau@... relax-trunk]$ svn merge -r17292:17293 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r17293 into '.':
G specific_fns/frame_order.py
G user_functions/frame_order.py
[edau@... relax-trunk]$ svn merge -r17293:17294 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r17294 into '.':
G specific_fns/frame_order.py
[edau@... relax-trunk]$ svn merge -r17295:17296 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 r17296 into '.':
C specific_fns/frame_order.py
Summary of conflicts:
Text conflicts: 1
[edau@... relax-trunk]$ svn merge -r17296:17297 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r17297 into '.':
G specific_fns/frame_order.py
[edau@... relax-trunk]$ svn merge -r17297:17298 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r17298 into '.':
G specific_fns/frame_order.py
[edau@... relax-trunk]$ svn merge -r17298:17299 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r17299 into '.':
G specific_fns/frame_order.py
[edau@... relax-trunk]$ svn merge -r17299:17300 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r17300 into '.':
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/frame_order.py
U test_suite/shared_data/frame_order/cam/rotor_2_state/frame_order.py
U test_suite/shared_data/frame_order/cam/rotor2/frame_order.py
U test_suite/shared_data/frame_order/cam/free_rotor2/frame_order.py
U test_suite/shared_data/frame_order/cam/rigid/frame_order.py
U test_suite/shared_data/frame_order/cam/iso_cone/frame_order.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/frame_order.py
U test_suite/shared_data/frame_order/cam/iso_cone_torsionless/frame_order.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/frame_order.py
U test_suite/shared_data/frame_order/cam/free_rotor/frame_order.py
U test_suite/shared_data/frame_order/cam/pseudo_ellipse/frame_order.py
[edau@... relax-trunk]$

 2013-03-22 15:40:06 Tree
[r18976] by bugman

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

 2013-03-22 15:37:50 Tree
[r18975] by bugman

Next block of the manual merger of the frame_order_testing branch.

The commands used were:
svn merge -r17270:17271 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r17275:17276 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r17276:17277 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r17277:17278 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r17278:17279 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r17279:17280 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .

The console messages were:
[edau@... relax-trunk]$ svn merge -r17270:17271 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r17271 into '.':
U specific_fns/frame_order.py
[edau@... relax-trunk]$ svn merge -r17275:17276 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 r17276 into '.':
C specific_fns/frame_order.py
Summary of conflicts:
Text conflicts: 1
[edau@... relax-trunk]$ svn merge -r17276:17277 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
Conflict discovered in 'test_suite/system_tests/scripts/frame_order/cam/base_script.py'.
Select: (p) postpone, (df) diff-full, (e) edit,
(mc) mine-conflict, (tc) theirs-conflict,
(s) show all options: p
--- Merging r17277 into '.':
C test_suite/system_tests/scripts/frame_order/cam/base_script.py
Summary of conflicts:
Text conflicts: 1
[edau@... relax-trunk]$ svn merge -r17277:17278 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r17278 into '.':
G specific_fns/frame_order.py
[edau@... relax-trunk]$ svn merge -r17278:17279 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r17279 into '.':
G specific_fns/frame_order.py
[edau@... relax-trunk]$ svn merge -r17279:17280 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r17280 into '.':
U test_suite/system_tests/frame_order.py
[edau@... relax-trunk]$

 2013-03-22 15:36:30 Tree
[r18974] by bugman

Next block of the manual merger of the frame_order_testing branch.

The commands used were:
svn merge -r17260:17261 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r17261:17262 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r17262:17263 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r17263:17264 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r17264:17265 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r17265:17266 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r17266:17267 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r17267:17268 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r17268:17269 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r17269:17270 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .

The console messages were:

calhost relax-trunk]$ svn merge -r17260:17261 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r17261 into '.':
U user_functions/align_tensor.py
[edau@... relax-trunk]$ svn merge -r17261:17262 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r17262 into '.':
U user_functions/frame_order.py
[edau@... relax-trunk]$ svn merge -r17262:17263 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
Conflict discovered in 'test_suite/system_tests/scripts/frame_order/cam/base_script.py'.
Select: (p) postpone, (df) diff-full, (e) edit,
(mc) mine-conflict, (tc) theirs-conflict,
(s) show all options: p
--- Merging r17263 into '.':
C test_suite/system_tests/scripts/frame_order/cam/base_script.py
Summary of conflicts:
Text conflicts: 1
[edau@... relax-trunk]$ svn merge -r17263:17264 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r17264 into '.':
U specific_fns/api_common.py
U specific_fns/frame_order.py
[edau@... relax-trunk]$ svn merge -r17264:17265 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r17265 into '.':
U maths_fns/frame_order.py
[edau@... relax-trunk]$ svn merge -r17265:17266 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
[edau@... relax-trunk]$ svn merge -r17266:17267 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r17267 into '.':
U test_suite/shared_data/frame_order/cam/rotor/rdc_dy.txt
U test_suite/shared_data/frame_order/cam/rotor/rdc_tm.txt
U test_suite/shared_data/frame_order/cam/rotor/rdc_tb.txt
U test_suite/shared_data/frame_order/cam/rotor/rdc_er.txt
[edau@... relax-trunk]$ svn merge -r17267:17268 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r17268 into '.':
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/rdc_tb.txt
U test_suite/shared_data/frame_order/cam/pseudo_ellipse_torsionless/rdc_er.txt
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/rdc_tb.txt
U test_suite/shared_data/frame_order/cam/iso_cone_free_rotor/rdc_er.txt
U test_suite/shared_data/frame_order/cam/rotor_2_state/rdc_dy.txt
U test_suite/shared_data/frame_order/cam/rotor_2_state/rdc_tm.txt
U test_suite/shared_data/frame_order/cam/rotor_2_state/rdc_tb.txt
U test_suite/shared_data/frame_order/cam/rotor_2_state/rdc_er.txt
U test_suite/shared_data/frame_order/cam/rotor2/rdc_dy.txt
U test_suite/shared_data/frame_order/cam/rotor2/rdc_tm.txt
U test_suite/shared_data/frame_order/cam/rotor2/rdc_tb.txt
U test_suite/shared_data/frame_order/cam/rotor2/rdc_er.txt
U test_suite/shared_data/frame_order/cam/free_rotor2/rdc_dy.txt
U test_suite/shared_data/frame_order/cam/free_rotor2/rdc_tm.txt
U test_suite/shared_data/frame_order/cam/free_rotor2/rdc_tb.txt
U test_suite/shared_data/frame_order/cam/free_rotor2/rdc_er.txt
U test_suite/shared_data/frame_order/cam/rigid/rdc_dy.txt
U test_suite/shared_data/frame_order/cam/rigid/rdc_tm.txt
U test_suite/shared_data/frame_order/cam/rigid/rdc_tb.txt
U test_suite/shared_data/frame_order/cam/rigid/rdc_er.txt
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/rdc_tb.txt
U test_suite/shared_data/frame_order/cam/iso_cone/rdc_er.txt
U test_suite/shared_data/frame_order/cam/pseudo_ellipse2/rdc_dy.txt
U test_suite/shared_data/frame_order/cam/pseudo_ellipse2/rdc_tm.txt
U test_suite/shared_data/frame_order/cam/pseudo_ellipse2/rdc_tb.txt
U test_suite/shared_data/frame_order/cam/pseudo_ellipse2/rdc_er.txt
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/rdc_tb.txt
U test_suite/shared_data/frame_order/cam/pseudo_ellipse_free_rotor/rdc_er.txt
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/rdc_tb.txt
U test_suite/shared_data/frame_order/cam/iso_cone_torsionless/rdc_er.txt
G test_suite/shared_data/frame_order/cam/rotor/rdc_dy.txt
G test_suite/shared_data/frame_order/cam/rotor/rdc_tm.txt
G test_suite/shared_data/frame_order/cam/rotor/rdc_tb.txt
G test_suite/shared_data/frame_order/cam/rotor/rdc_er.txt
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/rdc_tb.txt
U test_suite/shared_data/frame_order/cam/iso_cone_free_rotor2/rdc_er.txt
Conflict discovered in 'test_suite/shared_data/frame_order/cam/free_rotor/rdc_dy.txt'.
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/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/rdc_tb.txt
U test_suite/shared_data/frame_order/cam/free_rotor/rdc_er.txt
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/rdc_tb.txt
U test_suite/shared_data/frame_order/cam/pseudo_ellipse/rdc_er.txt
Summary of conflicts:
Text conflicts: 1
[edau@... relax-trunk]$ svn merge -r17268:17269 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r17269 into '.':
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/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/rotor_2_state/pcs_tb.txt
U test_suite/shared_data/frame_order/cam/rotor_2_state/pcs_er.txt
U test_suite/shared_data/frame_order/cam/rotor_2_state/pcs_dy.txt
U test_suite/shared_data/frame_order/cam/rotor_2_state/pcs_tm.txt
U test_suite/shared_data/frame_order/cam/rotor2/pcs_tb.txt
U test_suite/shared_data/frame_order/cam/rotor2/pcs_er.txt
U test_suite/shared_data/frame_order/cam/rotor2/pcs_dy.txt
U test_suite/shared_data/frame_order/cam/rotor2/pcs_tm.txt
U test_suite/shared_data/frame_order/cam/free_rotor2/pcs_tb.txt
U test_suite/shared_data/frame_order/cam/free_rotor2/pcs_er.txt
U test_suite/shared_data/frame_order/cam/free_rotor2/pcs_dy.txt
U test_suite/shared_data/frame_order/cam/free_rotor2/pcs_tm.txt
U test_suite/shared_data/frame_order/cam/rigid/pcs_dy.txt
U test_suite/shared_data/frame_order/cam/rigid/pcs_tm.txt
U test_suite/shared_data/frame_order/cam/rigid/pcs_tb.txt
U test_suite/shared_data/frame_order/cam/rigid/pcs_er.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/pseudo_ellipse2/pcs_tb.txt
U test_suite/shared_data/frame_order/cam/pseudo_ellipse2/pcs_er.txt
U test_suite/shared_data/frame_order/cam/pseudo_ellipse2/pcs_dy.txt
U test_suite/shared_data/frame_order/cam/pseudo_ellipse2/pcs_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/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/rotor/pcs_tb.txt
U test_suite/shared_data/frame_order/cam/rotor/pcs_er.txt
U test_suite/shared_data/frame_order/cam/rotor/pcs_dy.txt
U test_suite/shared_data/frame_order/cam/rotor/pcs_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/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/pcs_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
[edau@... relax-trunk]$ svn merge -r17269:17270 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
Conflict discovered in 'test_suite/system_tests/scripts/frame_order/cam/base_script.py'.
Select: (p) postpone, (df) diff-full, (e) edit,
(mc) mine-conflict, (tc) theirs-conflict,
(s) show all options: p
--- Merging r17270 into '.':
C test_suite/system_tests/scripts/frame_order/cam/base_script.py
Summary of conflicts:
Text conflicts: 1
[edau@... relax-trunk]$

 2013-03-22 15:31:24 Tree
[r18973] by bugman

Next block of the manual merger of the frame_order_testing branch.

The commands used were:
svn merge -r17250:17251 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r17255:17256 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r17257:17258 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r17258:17259 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r17259:17260 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .

The console messages were:
[edau@... relax-trunk]$ svn merge -r17250:17251 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r17251 into '.':
U prompt/domain.py
U generic_fns/domain.py
U test_suite/shared_data/frame_order/cam/generate_base.py
U test_suite/system_tests/scripts/frame_order/cam/free_rotor2.py
U test_suite/system_tests/scripts/frame_order/cam/base_script.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/__init__.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
U test_suite/system_tests/scripts/frame_order/__init__.py
U test_suite/system_tests/scripts/__init__.py
U extern/sobol/__init__.py
U auto_analyses/frame_order.py
[edau@... relax-trunk]$ svn merge -r17255:17256 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r17256 into '.':
U specific_fns/frame_order.py
[edau@... relax-trunk]$ svn merge -r17257:17258 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r17258 into '.':
U test_suite/shared_data/frame_order/cam/rotor/rdc_dy.txt
U test_suite/shared_data/frame_order/cam/rotor/rdc_tm.txt
U test_suite/shared_data/frame_order/cam/rotor/rdc_tb.txt
U test_suite/shared_data/frame_order/cam/rotor/rdc_er.txt
[edau@... relax-trunk]$ svn merge -r17258:17259 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r17259 into '.':
D prompt/domain.py
U user_functions/__init__.py
A user_functions/domain.py
[edau@... relax-trunk]$ svn merge -r17259:17260 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
Conflict discovered in 'test_suite/system_tests/scripts/frame_order/cam/base_script.py'.
Select: (p) postpone, (df) diff-full, (e) edit,
(mc) mine-conflict, (tc) theirs-conflict,
(s) show all options: p
--- Merging r17260 into '.':
C test_suite/system_tests/scripts/frame_order/cam/base_script.py
Summary of conflicts:
Text conflicts: 1
[edau@... relax-trunk]$

 2013-03-22 15:27:35 Tree
[r18972] by bugman

Next block of the manual merger of the frame_order_testing branch.

The commands used were:
svn merge -r16681:16682 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r16710:16711 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .

The console messages were:
[edau@... relax-trunk]$ svn merge -r16681:16682 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
Conflict discovered in 'test_suite/system_tests/__init__.py'.
Select: (p) postpone, (df) diff-full, (e) edit,
(mc) mine-conflict, (tc) theirs-conflict,
(s) show all options: p
--- Merging r16682 into '.':
C test_suite/system_tests/__init__.py
Summary of conflicts:
Text conflicts: 1
[edau@... relax-trunk]$ svn merge -r16710:16711 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r16711 into '.':
U generic_fns/align_tensor.py
[edau@... relax-trunk]$

 2013-03-22 15:24:53 Tree
[r18971] by bugman

Next block of the manual merger of the frame_order_testing branch.

The commands used were:
svn merge -r15446:15447 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15447:15448 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15448:15449 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15449:15450 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15450:15451 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15451:15452 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15468:15469 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15469:15470 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15649:15650 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15663:15664 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .

The console messages were:
[edau@... relax-trunk]$ svn merge -r15446:15447 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15447 into '.':
U maths_fns/frame_order_matrix_ops.py
U maths_fns/frame_order.py
[edau@... relax-trunk]$ svn merge -r15447:15448 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15448 into '.':
G maths_fns/frame_order.py
[edau@... relax-trunk]$ svn merge -r15448:15449 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15449 into '.':
G maths_fns/frame_order_matrix_ops.py
G maths_fns/frame_order.py
[edau@... relax-trunk]$ svn merge -r15449:15450 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15450 into '.':
G maths_fns/frame_order_matrix_ops.py
G maths_fns/frame_order.py
[edau@... relax-trunk]$ svn merge -r15450:15451 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15451 into '.':
G maths_fns/frame_order_matrix_ops.py
G maths_fns/frame_order.py
[edau@... relax-trunk]$ svn merge -r15451:15452 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15452 into '.':
G maths_fns/frame_order_matrix_ops.py
G maths_fns/frame_order.py
[edau@... relax-trunk]$ svn merge -r15468:15469 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15469 into '.':
G maths_fns/frame_order.py
[edau@... relax-trunk]$ svn merge -r15469:15470 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15470 into '.':
G maths_fns/frame_order.py
[edau@... relax-trunk]$ svn merge -r15649:15650 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15650 into '.':
U generic_fns/frame_order.py
[edau@... relax-trunk]$ svn merge -r15663:15664 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
Conflict discovered in 'docs/latex/develop.tex'.
Select: (p) postpone, (df) diff-full, (e) edit,
(mc) mine-conflict, (tc) theirs-conflict,
(s) show all options: p
--- Merging r15664 into '.':
C docs/latex/develop.tex
Summary of conflicts:
Text conflicts: 1
[edau@... relax-trunk]$

 2013-03-22 15:23:24 Tree
[r18970] by bugman

Next block of the manual merger of the frame_order_testing branch.

The commands used were:
svn merge -r15381:15382 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15383:15384 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15386:15387 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15428:15429 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15429:15430 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15433:15434 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15436:15437 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15437:15438 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15438:15439 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .

The console messages were:
[edau@... relax-trunk]$ svn merge -r15381:15382 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15382 into '.':
U test_suite/system_tests/scripts/frame_order/cam/iso_cone_torsionless.py
[edau@... relax-trunk]$ svn merge -r15383:15384 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15384 into '.':
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
A test_suite/shared_data/frame_order/cam/iso_cone_torsionless/axis_system
A test_suite/shared_data/frame_order/cam/iso_cone_torsionless/frame_order_matrix
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
[edau@... relax-trunk]$ svn merge -r15386:15387 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15387 into '.':
U test_suite/shared_data/frame_order/cam/opt_stats
U test_suite/system_tests/frame_order.py
[edau@... relax-trunk]$ svn merge -r15428:15429 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15429 into '.':
U test_suite/system_tests/scripts/frame_order/cam/iso_cone_free_rotor2.py
[edau@... relax-trunk]$ svn merge -r15429:15430 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15430 into '.':
U test_suite/shared_data/frame_order/cam/pseudo_ellipse2/frame_order.log.bz2
U test_suite/shared_data/frame_order/cam/pseudo_ellipse2/frame_order.py
[edau@... relax-trunk]$ svn merge -r15433:15434 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15434 into '.':
U maths_fns/frame_order_matrix_ops.py
[edau@... relax-trunk]$ svn merge -r15436:15437 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15437 into '.':
G maths_fns/frame_order_matrix_ops.py
[edau@... relax-trunk]$ svn merge -r15437:15438 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15438 into '.':
G test_suite/shared_data/frame_order/cam/opt_stats
U test_suite/system_tests/scripts/frame_order/cam/pseudo_ellipse.py
G test_suite/system_tests/frame_order.py
[edau@... relax-trunk]$ svn merge -r15438:15439 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15439 into '.':
G maths_fns/frame_order_matrix_ops.py
[edau@... relax-trunk]$

 2013-03-22 15:21:05 Tree
[r18969] by bugman

Next block of the manual merger of the frame_order_testing branch.

The commands used were:
svn merge -r15372:15373 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15373:15374 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15374:15375 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15375:15376 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15376:15377 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15377:15378 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15378:15379 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .

The console messages were:
[edau@... relax-trunk]$ svn merge -r15372:15373 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15373 into '.':
U test_suite/shared_data/frame_order/cam/opt_stats
U test_suite/system_tests/scripts/frame_order/cam/free_rotor2.py
U test_suite/system_tests/frame_order.py
[edau@... relax-trunk]$ svn merge -r15373:15374 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15374 into '.':
G test_suite/system_tests/scripts/frame_order/cam/free_rotor2.py
[edau@... relax-trunk]$ svn merge -r15374:15375 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15375 into '.':
G test_suite/system_tests/frame_order.py
[edau@... relax-trunk]$ svn merge -r15375:15376 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15376 into '.':
G test_suite/shared_data/frame_order/cam/opt_stats
U test_suite/system_tests/scripts/frame_order/cam/iso_cone_free_rotor2.py
G test_suite/system_tests/frame_order.py
svn merge -r15376:15377 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
[edau@... relax-trunk]$ svn merge -r15376:15377 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15377 into '.':
G test_suite/system_tests/scripts/frame_order/cam/free_rotor2.py
[edau@... relax-trunk]$ svn merge -r15377:15378 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15378 into '.':
G test_suite/system_tests/frame_order.py
[edau@... relax-trunk]$ svn merge -r15378:15379 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r15379 into '.':
G test_suite/system_tests/frame_order.py
[edau@... relax-trunk]$

 2013-03-22 15:19:53 Tree
Older >
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.