D6738: unshelve: add --unresolved flag to unshelve mergestate with unresolved files

pulkit (Pulkit Goyal) phabricator at mercurial-scm.org
Mon Aug 19 11:10:43 EDT 2019


pulkit added inline comments.

INLINE COMMENTS

> shelve.py:754
> +    ms = merge.mergestate.clean(repo)
> +    ms._writerecordsv2(_decodemergerecords(records))
> +

we should write both the versions, `_writerecords()` should be used.

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D6738/new/

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

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


More information about the Mercurial-devel mailing list