D6479: unshelve: first prototype of restoring unresolved changes

[pulkit (Pulkit Goyal)]

pulkit added inline comments.

INLINE COMMENTS

> shelve.py:722
> +            repo.dirstate.setparents(p1.node(), p2.node())
> +            repo.dirstate.write(repo.currenttransaction())
> +

why do we need to do this?

> shelve.py:724
> +
> +    if not os.path.exists(repo.vfs.join('merge-unresolved')):
> +        util.makedir(repo.vfs.join('merge-unresolved'), False)

if merge-unresolved/ does not exists, it means there are no unresolved shelves, right? we should not be creating it then.

> shelve.py:1039
>          raise error.Abort(_("shelved change '%s' not found") % basename)
> +    if unresolved:
> +        cmdutil.bailifchanged(repo)

we can do this check by looking into shelvectx extras below.

REPOSITORY
  rHG Mercurial

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

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