mergestate: handle additional record types specially
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.
Showing
- mercurial/merge.py 18 additions, 1 deletionmercurial/merge.py
- tests/fakemergerecord.py 25 additions, 0 deletionstests/fakemergerecord.py
- tests/test-histedit-non-commute-abort.t 36 additions, 1 deletiontests/test-histedit-non-commute-abort.t
- tests/test-rebase-abort.t 39 additions, 1 deletiontests/test-rebase-abort.t
- tests/test-resolve.t 61 additions, 1 deletiontests/test-resolve.t
Loading
Please register or sign in to comment