Patchwork D6547: shelve: removed redundant merge detection method

login
register
mail settings
Submitter phabricator
Date June 19, 2019, 7:30 p.m.
Message ID <differential-rev-PHID-DREV-gm2r72dds2hjxvgizq63-req@mercurial-scm.org>
Download mbox | patch
Permalink /patch/40605/
State Superseded
Headers show

Comments

phabricator - June 19, 2019, 7:30 p.m.
taapas1128 created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.

REPOSITORY
  rHG Mercurial

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

AFFECTED FILES
  hgext/shelve.py

CHANGE DETAILS




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

Patch

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()