Re: [sage-combinat-devel] Re: Don't use combinat with 5.4.rc2 (fixed)
Hi Hugh, > 9265 was merged in 5.4.beta1; it then got unmerged again. So the guards > should be set so neither of those patches would get applied to 5.4.beta1. > If you didn't run sage -combinat update explicitly, but are just using hg > to pull patches, then your guards may not be set right; you should either > run sage -combinat update or else add 5_4_rc2 to your > sage-xxx/devel/sage-combinat/.hg/patches/guards file. For normal usage, you shoudn't need to edit guards manually. The combinat script do that for you if you call sage -combinat qselect So basically sage -combinat update does more or less the following sequence: 1 - memorize the top patch returned by "hq qtop" 2 - hg qpop -a 3 - cd $SAGE_DEVEL/.hg/patch 4 - hg pull 5 - hg update 6 - cd $SAGE_DEVEL/ 7 - sage -combinat qselect 8 - hg qgoto "patch memorized at step 1" 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-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: Don't use combinat with 5.4.rc2 (fixed)
Hi Hugh, Thanks for looking into it. I switched to 5.4.rc2 and since no one else complained I'm guessing it was a glitch on my computer. -Mike On Tuesday, 30 October 2012 16:11:55 UTC-4, Hugh Thomas wrote: > > Hi Mike-- > > Sorry, I was away from email for a few days. > > 9265 was merged in 5.4.beta1; it then got unmerged again. So the guards > should be set so neither of those patches would get applied to 5.4.beta1. > If you didn't run sage -combinat update explicitly, but are just using hg > to pull patches, then your guards may not be set right; you should either > run sage -combinat update or else add 5_4_rc2 to your > sage-xxx/devel/sage-combinat/.hg/patches/guards file. > > For me, at the moment, the queue applies smoothly on 5.4.beta1, so maybe > the further problem you encountered was some temporary glitch. (Unless > someone fixed it in the meantime?) > > cheers, > > Hugh > > > > > On Wednesday, October 24, 2012 1:18:53 PM UTC-7, Mike Zabrocki wrote: >> >> Hi, >> >> I disabled both of these patches and then I run into >> trac_12876_category-fix_abstract_class-nt-rel11521.patch >> doesn't apply. It doesn't look like these patches touch >> the same files, but this patch hasn't been touched in a >> few months so something must be conflicting. >> Any ideas? >> >> I'm compiling 5.4.rc2 now, but that will take a while. >> >> -Mike >> >> >> On Wednesday, 24 October 2012 14:23:18 UTC-4, Mike Zabrocki wrote: >>> >>> Hi, >>> Something went wrong here for me using 5.4.beta1. >>> >>> The lines in the series files are: >>> trac_9265_tableaux_categories_am.patch #+5_4_beta0 >>> trac_9265_tableaux_categories_am-duplicate.patch#-5_4_rc2 >>> >>> Are those right? >>> I'd like to push some changes but I don't want to mess things up >>> with this patch. >>> >>> -Mike >>> >>> On Tuesday, 23 October 2012 02:10:18 UTC-4, Hugh Thomas wrote: You're welcome. It's actually quite fun (in a somewhat perverse way). After having set things up as I did, I realized it woud be even cleaner if I could simply have two different lines in the series file pointing to the same patch, but, alas, mercurial doesn't let you do that. cheers, Hugh On Monday, October 22, 2012 8:54:51 AM UTC-7, Nicolas M. Thiery wrote: > > On Sat, Oct 20, 2012 at 01:13:23AM -0700, Hugh Thomas wrote: > > I think this is now fixed, by introducing a second copy of > > trac_9265_tableaux_categories_am.patch which is guarded so it will > only be > > applied to 5.4.rc2 or later. > > Ah yes, that works! > > > This should mean that the queue will apply cleanly against 5.4 and > all its > > prerelease versions. > > Thanks for going the extra mile for our devs :-) > > Cheers, > Nicolas > -- > Nicolas M. Thi�ry "Isil" > http://Nicolas.Thiery.name/ > -- 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/-/44i-f6VWcosJ. 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: Don't use combinat with 5.4.rc2 (fixed)
Hi Mike-- Sorry, I was away from email for a few days. 9265 was merged in 5.4.beta1; it then got unmerged again. So the guards should be set so neither of those patches would get applied to 5.4.beta1. If you didn't run sage -combinat update explicitly, but are just using hg to pull patches, then your guards may not be set right; you should either run sage -combinat update or else add 5_4_rc2 to your sage-xxx/devel/sage-combinat/.hg/patches/guards file. For me, at the moment, the queue applies smoothly on 5.4.beta1, so maybe the further problem you encountered was some temporary glitch. (Unless someone fixed it in the meantime?) cheers, Hugh On Wednesday, October 24, 2012 1:18:53 PM UTC-7, Mike Zabrocki wrote: > > Hi, > > I disabled both of these patches and then I run into > trac_12876_category-fix_abstract_class-nt-rel11521.patch > doesn't apply. It doesn't look like these patches touch > the same files, but this patch hasn't been touched in a > few months so something must be conflicting. > Any ideas? > > I'm compiling 5.4.rc2 now, but that will take a while. > > -Mike > > > On Wednesday, 24 October 2012 14:23:18 UTC-4, Mike Zabrocki wrote: >> >> Hi, >> Something went wrong here for me using 5.4.beta1. >> >> The lines in the series files are: >> trac_9265_tableaux_categories_am.patch #+5_4_beta0 >> trac_9265_tableaux_categories_am-duplicate.patch#-5_4_rc2 >> >> Are those right? >> I'd like to push some changes but I don't want to mess things up >> with this patch. >> >> -Mike >> >> On Tuesday, 23 October 2012 02:10:18 UTC-4, Hugh Thomas wrote: >>> >>> You're welcome. It's actually quite fun (in a somewhat perverse way). >>> >>> After having set things up as I did, I realized it woud be even cleaner >>> if I could simply have two different lines in the series file pointing to >>> the same patch, but, alas, mercurial doesn't let you do that. >>> >>> cheers, >>> >>> Hugh >>> >>> On Monday, October 22, 2012 8:54:51 AM UTC-7, Nicolas M. Thiery wrote: On Sat, Oct 20, 2012 at 01:13:23AM -0700, Hugh Thomas wrote: > I think this is now fixed, by introducing a second copy of > trac_9265_tableaux_categories_am.patch which is guarded so it will only be > applied to 5.4.rc2 or later. Ah yes, that works! > This should mean that the queue will apply cleanly against 5.4 and all its > prerelease versions. Thanks for going the extra mile for our devs :-) Cheers, Nicolas -- Nicolas M. Thi�ry "Isil" http://Nicolas.Thiery.name/ >>> -- 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/-/4zvZ1dQohWYJ. 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: Don't use combinat with 5.4.rc2 (fixed)
Hi, I disabled both of these patches and then I run into trac_12876_category-fix_abstract_class-nt-rel11521.patch doesn't apply. It doesn't look like these patches touch the same files, but this patch hasn't been touched in a few months so something must be conflicting. Any ideas? I'm compiling 5.4.rc2 now, but that will take a while. -Mike On Wednesday, 24 October 2012 14:23:18 UTC-4, Mike Zabrocki wrote: > > Hi, > Something went wrong here for me using 5.4.beta1. > > The lines in the series files are: > trac_9265_tableaux_categories_am.patch #+5_4_beta0 > trac_9265_tableaux_categories_am-duplicate.patch#-5_4_rc2 > > Are those right? > I'd like to push some changes but I don't want to mess things up > with this patch. > > -Mike > > On Tuesday, 23 October 2012 02:10:18 UTC-4, Hugh Thomas wrote: >> >> You're welcome. It's actually quite fun (in a somewhat perverse way). >> >> After having set things up as I did, I realized it woud be even cleaner >> if I could simply have two different lines in the series file pointing to >> the same patch, but, alas, mercurial doesn't let you do that. >> >> cheers, >> >> Hugh >> >> On Monday, October 22, 2012 8:54:51 AM UTC-7, Nicolas M. Thiery wrote: >>> >>> On Sat, Oct 20, 2012 at 01:13:23AM -0700, Hugh Thomas wrote: >>> > I think this is now fixed, by introducing a second copy of >>> > trac_9265_tableaux_categories_am.patch which is guarded so it will >>> only be >>> > applied to 5.4.rc2 or later. >>> >>> Ah yes, that works! >>> >>> > This should mean that the queue will apply cleanly against 5.4 and all >>> its >>> > prerelease versions. >>> >>> Thanks for going the extra mile for our devs :-) >>> >>> Cheers, >>> Nicolas >>> -- >>> Nicolas M. Thi�ry "Isil" >>> http://Nicolas.Thiery.name/ >>> >> -- 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/-/qO6_Bm7B8JQJ. 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: Don't use combinat with 5.4.rc2 (fixed)
Hi, Something went wrong here for me using 5.4.beta1. The lines in the series files are: trac_9265_tableaux_categories_am.patch #+5_4_beta0 trac_9265_tableaux_categories_am-duplicate.patch#-5_4_rc2 Are those right? I'd like to push some changes but I don't want to mess things up with this patch. -Mike On Tuesday, 23 October 2012 02:10:18 UTC-4, Hugh Thomas wrote: > > You're welcome. It's actually quite fun (in a somewhat perverse way). > > After having set things up as I did, I realized it woud be even cleaner if > I could simply have two different lines in the series file pointing to the > same patch, but, alas, mercurial doesn't let you do that. > > cheers, > > Hugh > > On Monday, October 22, 2012 8:54:51 AM UTC-7, Nicolas M. Thiery wrote: >> >> On Sat, Oct 20, 2012 at 01:13:23AM -0700, Hugh Thomas wrote: >> > I think this is now fixed, by introducing a second copy of >> > trac_9265_tableaux_categories_am.patch which is guarded so it will only >> be >> > applied to 5.4.rc2 or later. >> >> Ah yes, that works! >> >> > This should mean that the queue will apply cleanly against 5.4 and all >> its >> > prerelease versions. >> >> Thanks for going the extra mile for our devs :-) >> >> Cheers, >> Nicolas >> -- >> Nicolas M. Thi�ry "Isil" >> http://Nicolas.Thiery.name/ >> > -- 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/-/kJAgrwGLm5oJ. 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: Don't use combinat with 5.4.rc2 (fixed)
You're welcome. It's actually quite fun (in a somewhat perverse way). After having set things up as I did, I realized it woud be even cleaner if I could simply have two different lines in the series file pointing to the same patch, but, alas, mercurial doesn't let you do that. cheers, Hugh On Monday, October 22, 2012 8:54:51 AM UTC-7, Nicolas M. Thiery wrote: > > On Sat, Oct 20, 2012 at 01:13:23AM -0700, Hugh Thomas wrote: > > I think this is now fixed, by introducing a second copy of > > trac_9265_tableaux_categories_am.patch which is guarded so it will only > be > > applied to 5.4.rc2 or later. > > Ah yes, that works! > > > This should mean that the queue will apply cleanly against 5.4 and all > its > > prerelease versions. > > Thanks for going the extra mile for our devs :-) > > Cheers, > Nicolas > -- > Nicolas M. Thi�ry "Isil" > > http://Nicolas.Thiery.name/ > -- 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/-/BNo8pwpY9qcJ. 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: Don't use combinat with 5.4.rc2 (fixed)
On Sat, Oct 20, 2012 at 01:13:23AM -0700, Hugh Thomas wrote: > I think this is now fixed, by introducing a second copy of > trac_9265_tableaux_categories_am.patch which is guarded so it will only be > applied to 5.4.rc2 or later. Ah yes, that works! > This should mean that the queue will apply cleanly against 5.4 and all its > prerelease versions. Thanks for going the extra mile for our devs :-) Cheers, Nicolas -- Nicolas M. Thiéry "Isil" 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.
