D6479: unshelve: first prototype of restoring unresolved changes

[navaneeth.suresh (Navaneeth Suresh)]

navaneeth.suresh added a comment.


  In https://phab.mercurial-scm.org/D6479#94556, @pulkit wrote:
  
  > In https://phab.mercurial-scm.org/D6479#94555, @navaneeth.suresh wrote:
  >
  > > > 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.
  >
  >
  > There are other ways to set the second parent, like dirstate.setparents() I think. It is worth investigating to find a way to do it without merging again.
  
  
  Interesting. Then, I shall investigate it and update the diff.

REPOSITORY
  rHG Mercurial

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

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