Page MenuHomePhabricator

shelve: add method for storing mergestate in changeset extras
AbandonedPublic

Authored by navaneeth.suresh on Oct 4 2019, 4:46 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Summary

We store mergestate records in .hg/merge. This patch adds a method
of storage in changeset extras. This will help in the exchange of
mergestate records to other repos. Also, this can be used by
shelve --unresolved to store the mergestate records.

It uses the storage format supported for hg versions 3.7 or later. For the
time being, I have omitted the storage of the content of the local version
of unresolved files.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped