D6169: unshelve: disable unshelve during merge (issue5123)

navaneeth.suresh (Navaneeth Suresh) phabricator at mercurial-scm.org
Tue Mar 26 14:11:27 EDT 2019

navaneeth.suresh added a comment.

  > Is it difficult to fix unshelve to not lose merge parents?
  > https://bz.mercurial-scm.org/show_bug.cgi?id=5123#c2
  I'll try to come up with a fix. But, `hg shelve` is aborting during a merge. Can `unshelve` be aborted too? I don't have a strong opinion on this. I am just asking.

  rHG Mercurial


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

More information about the Mercurial-devel mailing list