D6738: unshelve: add --unresolved flag to unshelve mergestate with unresolved files
navaneeth.suresh (Navaneeth Suresh)
phabricator at mercurial-scm.org
Fri Oct 4 16:53:03 EDT 2019
navaneeth.suresh added inline comments.
> pulkit wrote in shelve.py:754
> Did you manage to find why that error comes up?
Yes. This was because we are not storing the local version of the files. So, it will be `None` as returned while reading the mergestate. So, it should throw an `AssertionError`. We can get rid of this only when we store the local versions of the files in future.
CHANGES SINCE LAST ACTION
To: navaneeth.suresh, #hg-reviewers
Cc: pulkit, mercurial-devel
More information about the Mercurial-devel