[sage-combinat-devel] sage-5.5

2012-12-27 Thread Anne Schilling
Hi All!

sage-combinat does not seem to apply to sage-5.5:

Applying all the patches
  hg --config 'extensions.hgext.mq=' --config 'ui.username=sage-combinat 
script' qpush -a
applying trac_12930-add_mt_lattice-as.patch
skipping trac_13579-temporarily_disable_cmdline_tests_for_security-nt.patch - 
guarded by '+5_4'
applying trac12215_weak_cached_function-sk.patch
patching file sage/misc/cachefunc.pyx
Hunk #4 succeeded at 348 with fuzz 2 (offset 0 lines).
applying trac12215_segfault_fixes.patch
patching file sage/all.py
Hunk #1 FAILED at 232
1 out of 1 hunks FAILED -- saving rejects to file sage/all.py.rej
patching file sage/categories/action.pyx
Hunk #1 succeeded at 87 with fuzz 1 (offset 0 lines).
patching file sage/libs/pari/gen.pyx
Hunk #1 FAILED at 9127
1 out of 1 hunks FAILED -- saving rejects to file sage/libs/pari/gen.pyx.rej
patch failed, unable to continue (try -v)
patch failed, rejects left in working dir
errors during apply, please fix and refresh trac12215_segfault_fixes.patch
Abort

Ticket #12215 does not seem to have positive review on trac. Why is
it in this category in the queue?

Best,

Anne

-- 
You received this message because you are subscribed to the Google Groups 
sage-combinat-devel group.
To post to this group, send email to sage-combinat-devel@googlegroups.com.
To unsubscribe from this group, send email to 
sage-combinat-devel+unsubscr...@googlegroups.com.
For more options, visit this group at 
http://groups.google.com/group/sage-combinat-devel?hl=en.



[sage-combinat-devel] Re: sage-5.5

2012-12-27 Thread Hugh Thomas
Hi Anne--

It looks #12215 had a positive review on trac at one point (4 months ago), 
so that's probably the explanation for its location in the series file.  

Recently (before the conflict between 13762 and 13605) , the queue did 
apply if trac12215_segfault_fixes.patch was disabled, and sage ran, though 
I don't know if that's the best plan.  Part of what was in 
trac12215_segfault_fixes.patch is now being done by #13741, so 
segfault_fixes needs to be rebased over it.  This seems like it might just 
be a matter of removing the obvious hunks from segfault_fixes, but I don't 
really know what's going on with this stuff.  

cheers,

Hugh

On Thursday, December 27, 2012 9:32:17 AM UTC-8, Anne Schilling wrote:

 Hi All! 

 sage-combinat does not seem to apply to sage-5.5: 

 Applying all the patches 
   hg --config 'extensions.hgext.mq=' --config 'ui.username=sage-combinat 
 script' qpush -a 
 applying trac_12930-add_mt_lattice-as.patch 
 skipping 
 trac_13579-temporarily_disable_cmdline_tests_for_security-nt.patch - 
 guarded by '+5_4' 
 applying trac12215_weak_cached_function-sk.patch 
 patching file sage/misc/cachefunc.pyx 
 Hunk #4 succeeded at 348 with fuzz 2 (offset 0 lines). 
 applying trac12215_segfault_fixes.patch 
 patching file sage/all.py 
 Hunk #1 FAILED at 232 
 1 out of 1 hunks FAILED -- saving rejects to file sage/all.py.rej 
 patching file sage/categories/action.pyx 
 Hunk #1 succeeded at 87 with fuzz 1 (offset 0 lines). 
 patching file sage/libs/pari/gen.pyx 
 Hunk #1 FAILED at 9127 
 1 out of 1 hunks FAILED -- saving rejects to file 
 sage/libs/pari/gen.pyx.rej 
 patch failed, unable to continue (try -v) 
 patch failed, rejects left in working dir 
 errors during apply, please fix and refresh trac12215_segfault_fixes.patch 
 Abort 

 Ticket #12215 does not seem to have positive review on trac. Why is 
 it in this category in the queue? 

 Best, 

 Anne 


-- 
You received this message because you are subscribed to the Google Groups 
sage-combinat-devel group.
To view this discussion on the web visit 
https://groups.google.com/d/msg/sage-combinat-devel/-/l6dw4w6vPP8J.
To post to this group, send email to sage-combinat-devel@googlegroups.com.
To unsubscribe from this group, send email to 
sage-combinat-devel+unsubscr...@googlegroups.com.
For more options, visit this group at 
http://groups.google.com/group/sage-combinat-devel?hl=en.



Re: [sage-combinat-devel] Re: sage-5.5

2012-12-27 Thread Anne Schilling
Hi Hugh,

 It looks #12215 had a positive review on trac at one point (4 months ago), so 
 that's probably the explanation for its location in the series file. 
 
 Recently (before the conflict between 13762 and 13605) ,

Travis fixed this (and I rebased another patch), so the queue should apply
again on sage-5.5.rc0.

 the queue did apply if trac12215_segfault_fixes.patch was disabled, and sage 
 ran, though I don't know if that's the best plan.  Part of what
 was in trac12215_segfault_fixes.patch is now being done by #13741, so 
 segfault_fixes needs to be rebased over it.  This seems like it might just be 
 a matter of removing the obvious hunks from
 segfault_fixes, but I don't really know what's going on with this stuff. 

Thanks for investigating this! If 12215 is rebased in the queue, one would
probably also need to import 13741 for older versions of sage.

Cheers,

Anne

-- 
You received this message because you are subscribed to the Google Groups 
sage-combinat-devel group.
To post to this group, send email to sage-combinat-devel@googlegroups.com.
To unsubscribe from this group, send email to 
sage-combinat-devel+unsubscr...@googlegroups.com.
For more options, visit this group at 
http://groups.google.com/group/sage-combinat-devel?hl=en.