2 Commits

Author	SHA1	Message	Date
Pierre-Yves David	28aeffe8d0	fakemergerecord: take wlock to write the merge state ... The merge state is supposed to be covered by the wlock. We fix the test extensions to comply to that.	2016-08-08 17:33:45 +02:00
Siddharth Agarwal	4a78a436f9	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.	2015-11-18 15:46:45 -08:00