D6479: unshelve: first prototype of restoring unresolved changes

navaneeth.suresh (Navaneeth Suresh) phabricator at mercurial-scm.org
Mon Jun 10 11:48:17 EDT 2019


navaneeth.suresh added a comment.


  > Can we prevent merging again? Since we are getting content from old unresolved commit, copying mergestate from previously stored one, what purpose does this merging serves?
  
  The usual unshelve mechanism restores the content of the files in the mergestate. However, we'll be still in a state with only one parent. This merge will help to recreate the exact same state with two parents.

REPOSITORY
  rHG Mercurial

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

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


More information about the Mercurial-devel mailing list