HomePhabricator

mergestate: fix BC breakage introduced because of removal of a merge record

Authored by pulkit.

Description

mergestate: fix BC breakage introduced because of removal of a merge record

In fcd0cff3400a I removed the usage of RECORD_RESOLVED_OTHER. However I also
removed the reading support, hence if there is any user who runs into merge
conflict with older version of hg, upgrades hg and then tries to read
mergestate, they will end up with an MergeRecordUnsupportedError.

Details

Committed
pulkitAug 1 2020, 9:09 AM
Parents
rHG9b5723784aac: dispatch: adjust ui.flush() timing to stabilize test-blackbox.t
Branches
Unknown
Tags
Unknown