D6479: unshelve: first prototype of restoring unresolved changes

[pulkit (Pulkit Goyal)]

pulkit added inline comments.

INLINE COMMENTS

> shelve.py:717
>  
> +def restoreunresolvedshelve(repo, ui, basename, pctx, shelvectx):
> +    p1, p2 = shelvectx.parents()

the functions needs documentation.

> shelve.py:722
> +
> +    # Replace `merge/` with `merge-unresolved/<basename>/` to
> +    # restore the status of resolved files in shelvectx.

this comment can be a part of function documentation.

REPOSITORY
  rHG Mercurial

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

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