D6479: shelve: first prototype of storing/restoring unresolved changes
pulkit (Pulkit Goyal)
phabricator at mercurial-scm.org
Sat Aug 17 15:30:29 EDT 2019
pulkit added a comment.
In D6479#98757 <https://phab.mercurial-scm.org/D6479#98757>, @navaneeth.suresh wrote:
> 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`.
Hm, sorry for missing this earlier. If we start the merge with a clean working directory, we don't need to store the local version of file then.
CHANGES SINCE LAST ACTION
To: navaneeth.suresh, #hg-reviewers
Cc: durin42, pulkit, mercurial-devel
More information about the Mercurial-devel