diff mercurial/extensions.py @ 20589:31993cd23b11 stable

merge: change the merge state serialisation to use a record based logic The format of the file is unchanged. But we are preparing a new file with a new format that would be record based. So we change all the read/write logic to handle a list of record until a very low level. This will allow simple plugging of the new format in the current code.
author Pierre-Yves David <pierre-yves.david@fb.com>
date Thu, 27 Feb 2014 12:59:41 -0800
parents 6f72e7d28b35
children 352abbb0be88
line wrap: on
line diff