D6169: unshelve: disable unshelve during merge (issue5123)

yuja (Yuya Nishihara) phabricator at mercurial-scm.org
Mon Mar 25 18:29:48 EDT 2019


yuja added a comment.


  >   As stated in the issue5123, unshelve can destroy the second parent of
  >   the context when tried to unshelve with an uncommitted merge. This
  >   patch makes unshelve to abort when called with an uncommitted merge.
  
  Is it difficult to fix unshelve to not lose merge parents?
  
  https://bz.mercurial-scm.org/show_bug.cgi?id=5123#c2

REPOSITORY
  rHG Mercurial

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

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


More information about the Mercurial-devel mailing list