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.