Re: [sage-combinat-devel] queue is broken -- am I responsible ?
Salut Alex, applying trac_8696-character_rings-nt.patch patching file sage/combinat/j_trivial_monoids.py Hunk #2 FAILED at 223 1 out of 9 hunks FAILED -- saving rejects to file sage/combinat/ j_trivial_monoids.py.rej patch failed, unable to continue (try -v) patch failed, rejects left in working dir errors during apply, please fix and refresh trac_8696-character_rings- nt.patch Abort Did you read the 10 lines about reject in the following section ? http://wiki.sagemath.org/combinat/MercurialStepByStep#Handlingrejection I was having the same reject this morning (I should have written to sage-combinat-devel about it but I didn't), so I don't think you are responsable for it. Another way for you to know if you are responsable for the reject is to ask yourself if you modified the file where the conflicts arise, in this case : j_trivial_monoids.py. The problem seems to come from trac_8696-character_rings-nt.patch, which is N. Thiéry's patch, but I don't understand how I could have made it fail, nor how I can fix it. One thing you can do is to sage -hg qpush -a one more time (and do not worry about the conflicts) and until all patches are applied or until you get to your patch. It is possible that sage -br still works anyway so that you can work on your patch anyway. In any case, it is a good thing to email sage-combinat-devel, because most probably the author didn't know about the conflict. Sébastien -- 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-de...@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] queue is broken -- am I responsible ?
Hi Alexandre, I think I broke the queue, the thing is I don't understand how I did it and how I can repair it. Before I added my patch trac_8739_kolakoski_word-abm.patch, everything was fine, but when I moved it down in the series file, I had the following message error. Applying all the patches [...] applying trac_8696-character_rings-nt.patch patching file sage/combinat/j_trivial_monoids.py Hunk #2 FAILED at 223 1 out of 9 hunks FAILED -- saving rejects to file sage/combinat/ j_trivial_monoids.py.rej patch failed, unable to continue (try -v) patch failed, rejects left in working dir errors during apply, please fix and refresh trac_8696-character_rings- nt.patch This one is fixed but there is another one later: application de trac_8431-word_morphism_extensions-vd.patch unable to find 'sage/combinat/invariant_ring_perm_gps/evaluation.py' for patching The problem comes from the following chunk: diff -r 79d9e00bcdb7 sage/combinat/invariant_ring_perm_gps/evaluation.py --- a/sage/combinat/invariant_ring_perm_gps/evaluation.py Sun Mar 07 13:06:54 20 10 +0100 +++ b/sage/combinat/invariant_ring_perm_gps/evaluation.py Sun Mar 07 13:08:37 20 10 +0100 @@ -1,3 +1,4 @@ It has certainly nothing to do with vincent's patch but I'm reluctant to modify it without his permission... Cheers, Florent -- 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-de...@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.
