[sage-combinat-devel] queue is broken -- am I responsible ?
Hello, everyone ! I think I broke the queue, the thing is I don't understand how I did it and how I can repair it. Before I added my patch trac_8739_kolakoski_word-abm.patch, everything was fine, but when I moved it down in the series file, I had the following message error. Applying all the patches /Users/alexandre/Applications/sage/sage -hg --config 'extensions.hgext.mq=' qpush -a applying sage-4.4.patch patch sage-4.4.patch is empty applying trac_7914_rebased_fixed.patch applying trac_8429_split_word-sl.patch patching file sage/combinat/words/words.py Hunk #3 succeeded at 632 with fuzz 1 (offset 3 lines). applying trac_8438-skew_partitions_from_rc_lenghts-fh.patch applying trac_7880-sets_with_partial_maps.patch applying trac_8420_features_perfect_matchings_vf.patch applying trac_8420_perfect_matchings_review-fh.patch applying trac_8420_perfect_matchings_review_review_vf.patch applying trac_8579-category-magmas-nt.patch applying trac_7555_operation_table-categories-all-in-one.patch applying trac_7538_poset_equal_fix-nb.patch applying trac_8576-category-QQ-RR-CC-nt.patch applying trac_8595_fixed_point-sl.patch applying trac_8618_is_identity-sl.patch applying trac_8635_typo_disjoint_union_enumerated_sets-fh.patch applying trac_8599_pointsize-sl.patch applying trac-8599-fix-docs.patch applying trac_8572-poset_doc_fix-fh.patch applying trac_8513_graph_theory_documentation-abm.patch applying trac_8519_Range_factory-nb.patch applying trac_8519_Range_factory-review-fh.patch applying trac_8519_Range_factory-review2-nb.patch applying trac_8543-empty_set_categories-fh.patch applying trac_8543-empty_set_categories-review-nt.patch applying trac_8513-reviewer.patch applying trac_8414_weyl_group_space.patch applying trac_8414_weyl_group_space-review-nt.patch applying trac_8524-disjoint_union_classcall_private-fh.patch applying trac_8585-permutation_group_on_empty_set-fh.patch applying trac_8705-unittest_refman-fh.patch applying trac_8707-5x_faster_latex-nt.patch applying trac_8649_crystal-as.patch applying trac_8695-uniquerep_missing__ne__-fh.patch applying trac_8574-length-sl.patch applying trac_8574_review-abm.patch applying sage-5.0.patch patch sage-5.0.patch is empty applying trac_8411_branching_rules.patch applying trac_8500_transitive_groups-final.patch applying trac_8549_cycle_enumerator-nb.patch applying trac_8413-Unknown_bool_value-fh.patch applying trac_8604_nfactor_enumerable-sl.patch applying trac_8604-corrections-sl.patch applying trac_8674_word_combinaorial_cmp-sl.patch applying trac_8674_fixes_after_review-sl.patch applying trac_8670-word-path-projection-sl.patch applying trac-8607-rename-deprecation.patch applying trac_8607_review-sl.patch applying trac_8407_word-paths-sl.patch applying trac_8288_search_forest_depth_and_breath_improvement-nb.patch applying trac_8288_search_forest_depth_and_breath_improvement-review- nt.patch applying trac_8386_iet_alphabet_bug-vd.patch applying trac_8388_pickling_path-vd.patch applying trac_8490_square_free-vd.patch skipping move_stuff_out_of_parent-nt.patch - guarded by ['+disabled'] applying trac_8562-category-integer_mod_ring-nt.patch skipping trac_7004-graphviz-old-nt.patch - guarded by ['+disabled'] applying trac_7004-graphviz-nt.patch patching file sage/graphs/digraph.py Hunk #2 succeeded at 314 with fuzz 1 (offset 18 lines). applying trac_7004-graphviz-keys-nt.patch skipping trac_7004-graphviz-spring-experiment.patch - guarded by ['+disabled'] applying trac_7004-review-vd.patch applying trac_7004-review-nt.patch applying trac_7004-review-nt2.patch applying trac_7004-fix-doc-nt.patch applying trac_8030_stabilizer_bug-nb.patch applying trac_8402-categories_missing_test-fh.patch applying trac_8402-categories_missing_fix_doctest-fh.patch applying trac_8402-categories_missing_test_fix_sagelib-fh.patch applying trac_8402-categories_tests-review-nt.patch applying needs_review patch needs_review is empty applying trac_8735-poset_size_cardinality-fh.patch applying categories-primer-improvements-nt.patch applying sage-combinat-demo.patch skipping primer-as-demo-nt.patch - guarded by ['+disabled'] applying functorial_constructions-nt.patch patching file sage/categories/sets_cat.py Hunk #2 succeeded at 21 with fuzz 2 (offset 0 lines). Hunk #4 succeeded at 591 with fuzz 2 (offset 156 lines). applying finite_semigroup-nt.patch applying trac_8430-semigroup_doctest_fix-followup-fh.patch applying trac_6641-poset_antichains_backtracker.patch applying trac_6641-poset_antichains_backtracker-part2.patch applying combinat-quickref-jb.patch applying trac_6655_partition_newfeature-ny.patch patching file sage/combinat/partition.py Hunk #1 succeeded at 834 with fuzz 2 (offset -13 lines). skipping trac_6618_view_viewer_tightpage-followup-nt.patch - guarded by ['+4_3_3'] skipping set_in_category-fh.patch - guarded by ['+not_finished'] skipping gap3_interface_v4.3.2.patch - guarded by ['+4_3_3'] applying gap3_interface_v4.3.3.patch applying trac_8359-coxeter-groups-permutation-nt.patch
Re: [sage-combinat-devel] queue is broken -- am I responsible ?
Salut Alex, applying trac_8696-character_rings-nt.patch patching file sage/combinat/j_trivial_monoids.py Hunk #2 FAILED at 223 1 out of 9 hunks FAILED -- saving rejects to file sage/combinat/ j_trivial_monoids.py.rej patch failed, unable to continue (try -v) patch failed, rejects left in working dir errors during apply, please fix and refresh trac_8696-character_rings- nt.patch Abort Did you read the 10 lines about reject in the following section ? http://wiki.sagemath.org/combinat/MercurialStepByStep#Handlingrejection I was having the same reject this morning (I should have written to sage-combinat-devel about it but I didn't), so I don't think you are responsable for it. Another way for you to know if you are responsable for the reject is to ask yourself if you modified the file where the conflicts arise, in this case : j_trivial_monoids.py. The problem seems to come from trac_8696-character_rings-nt.patch, which is N. Thiéry's patch, but I don't understand how I could have made it fail, nor how I can fix it. One thing you can do is to sage -hg qpush -a one more time (and do not worry about the conflicts) and until all patches are applied or until you get to your patch. It is possible that sage -br still works anyway so that you can work on your patch anyway. In any case, it is a good thing to email sage-combinat-devel, because most probably the author didn't know about the conflict. Sébastien -- 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.
Re: [sage-combinat-devel] queue is broken -- am I responsible ?
Hi Alexandre, I think I broke the queue, the thing is I don't understand how I did it and how I can repair it. Before I added my patch trac_8739_kolakoski_word-abm.patch, everything was fine, but when I moved it down in the series file, I had the following message error. Applying all the patches [...] applying trac_8696-character_rings-nt.patch patching file sage/combinat/j_trivial_monoids.py Hunk #2 FAILED at 223 1 out of 9 hunks FAILED -- saving rejects to file sage/combinat/ j_trivial_monoids.py.rej patch failed, unable to continue (try -v) patch failed, rejects left in working dir errors during apply, please fix and refresh trac_8696-character_rings- nt.patch This one is fixed but there is another one later: application de trac_8431-word_morphism_extensions-vd.patch unable to find 'sage/combinat/invariant_ring_perm_gps/evaluation.py' for patching The problem comes from the following chunk: diff -r 79d9e00bcdb7 sage/combinat/invariant_ring_perm_gps/evaluation.py --- a/sage/combinat/invariant_ring_perm_gps/evaluation.py Sun Mar 07 13:06:54 20 10 +0100 +++ b/sage/combinat/invariant_ring_perm_gps/evaluation.py Sun Mar 07 13:08:37 20 10 +0100 @@ -1,3 +1,4 @@ It has certainly nothing to do with vincent's patch but I'm reluctant to modify it without his permission... 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-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.
