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

[navaneeth.suresh (Navaneeth Suresh)]

navaneeth.suresh added a comment.


  In D6479#98737 <https://phab.mercurial-scm.org/D6479#98737>, @durin42 wrote:
  
  > 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?
  
  The ultimate goal is to store the mergestate info in the changeset extras only. But, now , it has no support to store the local version of the files which are stored in the mergestate. This lacks info when the user gets conflicts other than a usual `hg merge`.

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