Skip to content
Snippets Groups Projects
  • Siddharth Agarwal's avatar
    a01ecbcf
    mergestate: handle additional record types specially · a01ecbcf
    Siddharth Agarwal authored
    This works around a bug in older Mercurial versions' handling of the v2 merge
    state.
    
    We also add a bunch of tests that make sure that
    (1) we correctly abort when the merge state has an unsupported record type
    (2) aborting the merge, rebase or histedit continues to work and clears out the
        merge state.
    a01ecbcf
    History
    mergestate: handle additional record types specially
    Siddharth Agarwal authored
    This works around a bug in older Mercurial versions' handling of the v2 merge
    state.
    
    We also add a bunch of tests that make sure that
    (1) we correctly abort when the merge state has an unsupported record type
    (2) aborting the merge, rebase or histedit continues to work and clears out the
        merge state.
fakemergerecord.py 686 B