On Thu, Jan 14, 2010 at 05:08:13PM +0100, Sébastien Labbé wrote: > I am currently experiencing a small conflict in the sage-combinat > tree. See below for the content of the reject file.
Please try again after a sage -combinat qselect. The iwahori hecke patch and a couple others are already guarded for 4.3.1, and interfers with Jason's patch. Cheers, > > Sébastien > > > sla...@pol:~/sage-4.3/devel/sage-combinat$ hg qpop -a > aucun patch appliqué > sla...@pol:~/sage-4.3/devel/sage-combinat$ hg qselect > no active guards > sla...@pol:~/sage-4.3/devel/sage-combinat$ hg qpush -a > application de trac_7776-inject_variable-nt.patch > application de trac_7777_symmetric_functions-inject_shorthands-nt.patch > skipping trac_7921-categories_for_extension_types-nt.patch - guarded > by ['+category'] > application de trac_7145-iet-final.patch > application de trac_7543_s_adic_final.patch > application de trac_7520_words_construction_improvements-sl.patch > application de trac_7619_pickle_for_FiniteWord_iter_callable-sl.patch > skipping words_ng-cpp_basic_string.patch - guarded by ['+words_ng_fixme'] > application de classcall_metaclass-nt.patch > application de element_wrapper-improvement-nt.patch > patching file sage/categories/examples/finite_semigroups.py > Hunk #1 succeeded at 171 with fuzz 2 (offset 57 lines). > application de crystal_cleanup-as.patch > patching file sage/combinat/crystals/letters.py > Hunk #11 succeeded at 1309 with fuzz 2 (offset 0 lines). > application de crystal_cleanup-nt.patch > application de trac_7538_poset_equal_fix-fh.patch > application de trac_6641-poset_antichains_backtracker.patch > application de trac_6641-poset_antichains_backtracker-part2.patch > application de combinat-quickref-jb.patch > application de trac_6655_partition_newfeature-ny.patch > patching file sage/combinat/partition.py > Hunk #1 succeeded at 834 with fuzz 2 (offset -13 lines). > application de triangular-morphisms-jb.patch > patching file sage/categories/modules_with_basis.py > Hunk #3 FAILED at 240 > Hunk #4 succeeded at 245 with fuzz 2 (offset -28 lines). > 1 out of 8 hunks FAILED -- saving rejects to file > sage/categories/modules_with_basis.py.rej > l'application du patch a échoué, impossible de continuer (essayez avec -v) > patch failed, rejects left in working dir > des erreurs se sont produites durant l'application, veuillez corriger > puis rafraîchir triangular-morphisms-jb.patch > > > Here is the reject : > > > sla...@pol:~/sage-4.3/devel/sage-combinat$ cat > sage/categories/modules_with_basis.py.rej > --- modules_with_basis.py > +++ modules_with_basis.py > @@ -239,6 +241,16 @@ class ModulesWithBasis(Category_over_bas > > # TODO: find something better to get this inheritance from > CategoryWithTensorProduct.Element > class ElementMethods(CategoryWithTensorProduct.ElementMethods, > CategoryWithCartesianProduct.ElementMethods): > + # TODO: Define the appropriate element methods here (instead of in > + # subclasses). These methods should be consistent with those on > + # polynomials. > + > +# def _neg_(self): > +# """ > +# Default implementation of negation by trying to multiply by -1. > +# TODO: doctest > +# """ > +# return self._lmul_(-self.parent().base_ring().one(), self) > > def support_of_monomial(self): > """ > -- > 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-de...@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. > > 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-de...@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.
