[sage-combinat-devel] conflict in trac_9128-sphinx_links_all-fh.patch

2011-08-01 Thread Christian Stump
Salut, there is a conflict in trac_9128-sphinx_links_all-fh.patch. Could someone (maybe Florent, if it is that patches fault) please solve it. Thanks, Christian -- You received this message because you are subscribed to the Google Groups "sage-combinat-devel" group. To post to this group, send

Re: [sage-combinat-devel] conflict in trac_9128-sphinx_links_all-fh.patch

2011-08-02 Thread Florent Hivert
On Mon, Aug 01, 2011 at 04:56:40PM -0700, Christian Stump wrote: > Salut, > > there is a conflict in trac_9128-sphinx_links_all-fh.patch. Could > someone (maybe Florent, if it is that patches fault) please solve it. As usual, could you be more specific (sage-version... etc, did you correctly upda

Re: [sage-combinat-devel] conflict in trac_9128-sphinx_links_all-fh.patch

2011-08-02 Thread Christian Stump
> As usual, could you be more specific (sage-version... etc, did you correctly > update your guard with sage -conbinat qselect or sage -update). It is ok on my > computer with a sage-combinat install one week old. I'm on a extremely sloppy > network and sage-combinat server is down. So there is not

Re: [sage-combinat-devel] conflict in trac_9128-sphinx_links_all-fh.patch

2011-08-02 Thread William Stein
On Tue, Aug 2, 2011 at 5:31 PM, Christian Stump wrote: >> As usual, could you be more specific (sage-version... etc, did you correctly >> update your guard with sage -conbinat qselect or sage -update). It is ok on >> my >> computer with a sage-combinat install one week old. I'm on a extremely slo

Re: [sage-combinat-devel] conflict in trac_9128-sphinx_links_all-fh.patch

2011-08-02 Thread Christian Stump
Thanks to William for rebooting! >> update your guard with sage -combinat qselect after updating the guards, everything worked well. Sorry for the noise. (I didn't know that I need to do that once in a while even if I keep using the same version of sage...) Best, Christian -- You received thi

Re: [sage-combinat-devel] conflict in trac_9128-sphinx_links_all-fh.patch

2011-08-04 Thread Florent Hivert
Hi Christian, On Tue, Aug 02, 2011 at 10:28:46PM -0400, Christian Stump wrote: > Thanks to William for rebooting! > > >> update your guard with sage -combinat qselect > > after updating the guards, everything worked well. Sorry for the noise. > > (I didn't know that I need to do that onc

Re: [sage-combinat-devel] conflict in trac_9128-sphinx_links_all-fh.patch

2011-08-04 Thread Christian Stump
Hi Florent, > It has nothing to do with the version of sage you use but with the sage > combinat installation. You have to update it when someone (= me for this time) > prepare the new release and add a guard for a new sage version. In this case I > marked with the guard 4_7_2 the patch that has b

Re: [sage-combinat-devel] conflict in trac_9128-sphinx_links_all-fh.patch

2011-08-08 Thread Nicolas M. Thiery
Hi William! On Tue, Aug 02, 2011 at 05:50:58PM -0700, William Stein wrote: > I initiated a reboot of the virtual machine. > > By the way, I would be thrilled if somebody could move > combinat.sagemath.org from the virtual machine to boxen, since then I > wouldn't have to run that virtual