Re: [sage-combinat-devel] conflict with sage-4.7.1

2011-10-06 Thread Christian Stump
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 subscri

Re: [sage-combinat-devel] conflict with sage-4.7.1

2011-10-05 Thread Christian Stump
> I won't have time before next week, so please anyone feel free to take > over. okay, i will build alpha3 then and have a look. 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-c

Re: [sage-combinat-devel] conflict with sage-4.7.1

2011-10-05 Thread Nicolas M. Thiery
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 bef

Re: [sage-combinat-devel] conflict with sage-4.7.1

2011-10-05 Thread Christian Stump
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, Chri

Re: [sage-combinat-devel] conflict with sage-4.7.1

2011-10-04 Thread Anne Schilling
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-r

Re: [sage-combinat-devel] conflict with sage-4.7.1

2011-10-03 Thread Christian Stump
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 fig

Re: [sage-combinat-devel] conflict with sage-4.7.1

2011-09-30 Thread Anne Schilling
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 sa

Re: [sage-combinat-devel] conflict with sage-4.7.1

2011-09-30 Thread Nicolas M. Thiery
On Fri, Sep 30, 2011 at 07:02:53AM -0700, Anne Schilling wrote: > 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

Re: [sage-combinat-devel] conflict with sage-4.7.1

2011-09-30 Thread Anne Schilling
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,

Re: [sage-combinat-devel] conflict with sage-4.7.1

2011-09-30 Thread Nicolas M. Thiery
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. > > Unfortunat

[sage-combinat-devel] conflict with sage-4.7.1

2011-09-29 Thread Anne Schilling
Hi! 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