Mercurial > hg
comparison tests/get-with-headers.py @ 27027:a01ecbcfaf84
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.
| author | Siddharth Agarwal <sid0@fb.com> |
|---|---|
| date | Wed, 18 Nov 2015 15:46:45 -0800 |
| parents | 5a6820f8da4d |
| children | 8e86679d8acd |
comparison
equal
deleted
inserted
replaced
| 27026:c93b44b79359 | 27027:a01ecbcfaf84 |
|---|