D6479: unshelve: first prototype of restoring unresolved changes

[pulkit (Pulkit Goyal)]

pulkit added inline comments.

INLINE COMMENTS

> shelve.py:724
> +    # restore the status of resolved files in shelvectx.
> +    util.rename(repo.vfs.join('merge-unresolved/%s/' % basename),
> +                repo.vfs.join('merge'))

`vfs.rename`  should be used here.

REPOSITORY
  rHG Mercurial

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

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