D6547: shelve: removed redundant merge detection method

[taapas1128 (Taapas Agrawal)]

taapas1128 updated this revision to Diff 15642.

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D6547?vs=15598&id=15642

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D6547/new/

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

AFFECTED FILES
  hgext/shelve.py

CHANGE DETAILS

diff --git a/hgext/shelve.py b/hgext/shelve.py
--- a/hgext/shelve.py
+++ b/hgext/shelve.py
@@ -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()
 



To: taapas1128, #hg-reviewers
Cc: mercurial-devel