# HG changeset patch
# User Taapas Agrawal <taapas2897@gmail.com>
# Date 1560972556 -19800
# Node ID 5c64d0b4c037176a95426bca13affd728f2ea253
# Parent  2db96bf84a8f3f99e664fce5d9b25dde9e91a93b
shelve: removed redundant merge detection method

Differential Revision: https://phab.mercurial-scm.org/D6547

diff -r 2db96bf84a8f -r 5c64d0b4c037 hgext/shelve.py
--- a/hgext/shelve.py	Wed Jun 05 17:58:34 2019 +0200
+++ b/hgext/shelve.py	Thu Jun 20 00:59:16 2019 +0530
@@ -452,8 +452,6 @@
 def _docreatecmd(ui, repo, pats, opts):
     wctx = repo[None]
     parents = wctx.parents()
-    if len(parents) > 1:
-        raise error.Abort(_('cannot shelve while merging'))
     parent = parents[0]
     origbranch = wctx.branch()
 
@@ -979,12 +977,6 @@
             return unshelvecontinue(ui, repo, state, opts)
     elif len(shelved) > 1:
         raise error.Abort(_('can only unshelve one change at a time'))
-
-    # abort unshelve while merging (issue5123)
-    parents = repo[None].parents()
-    if len(parents) > 1:
-        raise error.Abort(_('cannot unshelve while merging'))
-
     elif not shelved:
         shelved = listshelves(repo)
         if not shelved: