On Wed, Jan 06, 2010 at 05:56:07PM +0100, Sébastien Labbé wrote: > Dear Nicolas, > > A recent changes created a conflict in the sage-combinat tree. It is > either me or you...but I think it is you!
Oops! Fixed! > > Sincèrement, > > Sébastien > > sla...@pol:~/sage-4.3/devel/sage-combinat/sage/combinat/words$ hg qpop -a > la pile de patchs est maintenant vide > sla...@pol:~/sage-4.3/devel/sage-combinat/sage/combinat/words$ hg qselect > no active guards > sla...@pol:~/sage-4.3/devel/sage-combinat/sage/combinat/words$ hg qpush -a > application de trac_7520_words_construction_improvements-sl.patch > application de trac_7520_my_own_review-sl.patch > application de trac_7543_word_s_adiques-sl.patch > application de trac_7543_review-vd.patch > application de trac_7543_correction-sl.patch > application de trac_7619_pickle_for_FiniteWord_iter_callable-sl.patch > application de trac_7842-attrcall-nt.patch > application de trac_7753_root_systems-bruhat_order-nt.patch > application de trac_7776-inject_variable-nt.patch > application de trac_7777_symmetric_functions-inject_shorthands-nt.patch > skipping words_ng-cpp_basic_string.patch - guarded by ['+words_ng_fixme'] > application de trac_7729_iwahori-hecke-algebra.patch > 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 #2 FAILED at 236 > 1 out of 5 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 > -- > 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.
