D6478: shelve: first prototype of storing unresolved changes

[pulkit (Pulkit Goyal)]

pulkit added a comment.


  Over past few days, @navaneeth.suresh was working on building the initial prototype on bitbucket and I was reviewing his initial work there. Now we have a nice initial prototype ready, and we decided to move things to core.
  
  This is a prototype, which helps us (especially Navaneeth) understand more about the things required to store etc. Right now, it just moves files from merge/ to merge-unresolved/<shelve-name>/ and storing an extra in the commit to denote that it contains an unresolved merge.
  
  Reviews and ideas on how to move forward are greatly appreciated.

REPOSITORY
  rHG Mercurial

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

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