D6479: shelve: first prototype of storing/restoring unresolved changes

durin42 (Augie Fackler) phabricator at mercurial-scm.org
Thu Aug 15 11:05:55 EDT 2019


durin42 added a comment.


  The only thing I'm curious about really is why we have extrastorage and usualstorge. Can we get away with only one of those choices instead of having more options?

INLINE COMMENTS

> shelve.py:432
> +
> +def _storeunresolvedmerge(ui, repo, name=None, extra=None):
> +    """Store the mergestate information in changeset extra

I think I'd like to see at least two changes here: one that introduces the code for storing merge state in extra, and then a second that uses it in shelve.

> shelve.py:434
> +    """Store the mergestate information in changeset extra
> +    if config option `experimental.store-in-extra` is set True.
> +

why aren't we just going all in on using extra for this? It feels less likely to lose data.

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D6479/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D6479

To: navaneeth.suresh, #hg-reviewers
Cc: durin42, pulkit, mercurial-devel


More information about the Mercurial-devel mailing list