Re: [sage-combinat-devel] conflict with sage-4.7.1
Salut -- okay, i will build alpha3 then and have a look. It took me about 2 hours to solve the reject in posets.py, I now don't know how to solve combinat/index.rst and poset_examples.py. So can someone else take that over? Best, Christian -- 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.
Re: [sage-combinat-devel] conflict with sage-4.7.1
Hi Anne, Thanks, but now I get another conflict (I am running sage-4.7.2.alpha3): errors during apply, please fix and refresh trac_10998-categories-posets-nt.patch Maybe Nicolas can have a look at this, I do not run 4.7.2.alpha3, so I don't really know what to do to solve that! Best, Christian -- 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.
Re: [sage-combinat-devel] conflict with sage-4.7.1
On Wed, Oct 05, 2011 at 02:37:31PM +0200, Christian Stump wrote: errors during apply, please fix and refresh trac_10998-categories-posets-nt.patch Maybe Nicolas can have a look at this, I do not run 4.7.2.alpha3, so I don't really know what to do to solve that! I won't have time before next week, so please anyone feel free to take over. Cheers, Nicolas -- Nicolas M. Thiéry Isil nthi...@users.sf.net http://Nicolas.Thiery.name/ -- 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.
Re: [sage-combinat-devel] conflict with sage-4.7.1
Hi Anne -- Adding the patch #10530 which was merged in sage-4.7.2.alpha2 to the sage-combinat queue, now gives a conflict with your patch sorry that it took a while - i was waiting that someone solves the reject in trac_10335-permgroup_domain-mh.patch. (It broke everywhere, but I didn't figure what I might have done wrong.) So I disabled it... I also fixed 11010, and I merged the two implementations of to_partition for DyckWords. Best, Christian -- 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.
Re: [sage-combinat-devel] conflict with sage-4.7.1
Hi Christian, Thanks, but now I get another conflict (I am running sage-4.7.2.alpha3): applying trac_9534-permgroup_base.patch applying trac_11003.patch applying trac_11003-review-nt.patch applying trac_8-finite_enumset_list_cache-fh.patch applying trac_8-finite_enumset_list_cache-review-nt.patch patching file sage/combinat/root_system/pieri_factors.py Hunk #1 succeeded at 17 with fuzz 1 (offset -1 lines). applying trac_10998-categories-posets-nt.patch patching file doc/en/reference/combinat/index.rst Hunk #1 FAILED at 35 1 out of 1 hunks FAILED -- saving rejects to file doc/en/reference/combinat/index.rst.rej patching file sage/combinat/posets/hasse_diagram.py Hunk #1 succeeded at 23 with fuzz 1 (offset -6 lines). patching file sage/combinat/posets/poset_examples.py Hunk #2 FAILED at 17 1 out of 12 hunks FAILED -- saving rejects to file sage/combinat/posets/poset_examples.py.rej patching file sage/combinat/posets/posets.py Hunk #2 FAILED at 17 1 out of 34 hunks FAILED -- saving rejects to file sage/combinat/posets/posets.py.rej patch failed, unable to continue (try -v) patch failed, rejects left in working dir errors during apply, please fix and refresh trac_10998-categories-posets-nt.patch Best, Anne On 10/3/11 11:22 PM, Christian Stump wrote: Hi Anne -- Adding the patch #10530 which was merged in sage-4.7.2.alpha2 to the sage-combinat queue, now gives a conflict with your patch sorry that it took a while - i was waiting that someone solves the reject in trac_10335-permgroup_domain-mh.patch. (It broke everywhere, but I didn't figure what I might have done wrong.) So I disabled it... I also fixed 11010, and I merged the two implementations of to_partition for DyckWords. Best, Christian -- 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.
Re: [sage-combinat-devel] conflict with sage-4.7.1
On Thu, Sep 29, 2011 at 05:24:32PM -0700, Anne Schilling wrote: I just had to rebase the patch trac_11742-cores-as.patch for sage-4.7.2.alpha3. Some code on debruijn sequences must have been merged into sage, which is not on the sage-combinat queue, which created a conflict. Unfortunately now the patch does not apply anymore to sage-4.7.1. I am not sure which guards I am supposed to put. What about importing the debruijn patch into the queue, in the merged section? Cheers, Nicolas -- Nicolas M. Thiéry Isil nthi...@users.sf.net http://Nicolas.Thiery.name/ -- 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.
Re: [sage-combinat-devel] conflict with sage-4.7.1
On 9/30/11 12:11 AM, Nicolas M. Thiery wrote: On Thu, Sep 29, 2011 at 05:24:32PM -0700, Anne Schilling wrote: I just had to rebase the patch trac_11742-cores-as.patch for sage-4.7.2.alpha3. Some code on debruijn sequences must have been merged into sage, which is not on the sage-combinat queue, which created a conflict. Unfortunately now the patch does not apply anymore to sage-4.7.1. I am not sure which guards I am supposed to put. What about importing the debruijn patch into the queue, in the merged section? Feel free to do so (if you know who wrote the code). 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.
Re: [sage-combinat-devel] conflict with sage-4.7.1
Hi Christian, Adding the patch #10530 which was merged in sage-4.7.2.alpha2 to the sage-combinat queue, now gives a conflict with your patch applying trac_11010-subword_complex-cs.patch patching file sage/combinat/all.py Hunk #1 FAILED at 119 1 out of 1 hunks FAILED -- saving rejects to file sage/combinat/all.py.rej patch failed, unable to continue (try -v) patch failed, rejects left in working dir errors during apply, please fix and refresh trac_11010-subword_complex-cs.patch You might want to update! 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.
