Changes between Version 1 and Version 2 of Ticket #14772, comment 12


Ignore:
Timestamp:
07/12/13 19:56:56 (8 years ago)
Author:
darij
Comment:

Legend:

Unmodified
Added
Removed
Modified
  • Ticket #14772, comment 12

    v1 v2  
    1 Here is my queue:
    2 {{{
    3 trac_14117-jordan_normal_form-dg-v3.patch
    4 trac_7983-major_index_and_other_tableau_fixes-dg.patch
    5 trac_14748_deprecationwarning.patch
    6 trac_14136-p_partition_enumerator_folded.patch
    7 trac_14507-tropical_semiring-ts.patch
    8 trac_14775-symmetric_functions_extended-dg.patch
    9 trac_14783-toggles_on_order_ideals-jsdg.patch
    10 trac_14516-crystals_speedup-ts.2.patch
    11 trac_14519-cynthonize_element_wrapper-ts.patch
    12 trac_8386_really_just_moving-fc.patch
    13 trac_8386_big_clean_fc.patch
    14 trac_8386_assert_removal.patch
    15 trac_14808-recoils_of_permutations-dg.patch
    16 trac_14772-remove_cc_permutations-ts.patch
    17 }}}
    18 
    19 And here's what I get if I try to push the last one:
    20 
    21 {{{
    22 darij@travis-virtualbox:~/sage-5.11.beta3/devel/sage-main$ hg qpush
    23 applying trac_14772-remove_cc_permutations-ts.patch
    24 patching file sage/combinat/permutation.py
    25 Hunk #8 FAILED at 220
    26 Hunk #24 FAILED at 1576
    27 Hunk #25 FAILED at 1598
    28 Hunk #26 FAILED at 1611
    29 Hunk #27 FAILED at 1627
    30 5 out of 43 hunks FAILED -- saving rejects to file sage/combinat/permutation.py.rej
    31 patch failed, unable to continue (try -v)
    32 patch failed, rejects left in working dir
    33 errors during apply, please fix and refresh trac_14772-remove_cc_permutations-ts.patch
    34 }}}
    35 
    36 EDIT: oops, I might have been using an obsolete #14808...
     1OOPS, you're right. Sorry; I had an obsolete patch in my .hg/patches folder.