Patchwork D6547: shelve: removed redundant merge detection method

login
register
mail settings
Submitter phabricator
Date June 28, 2019, 5:16 p.m.
Message ID <c171ef094dba1ce9991c455acae4a418@localhost.localdomain>
Download mbox | patch
Permalink /patch/40714/
State Not Applicable
Headers show

Comments

phabricator - June 28, 2019, 5:16 p.m.
Closed by commit rHGe9f2252e218e: shelve: removed redundant merge detection method (authored by taapas1128).
This revision was automatically updated to reflect the committed changes.
This revision was not accepted when it landed; it landed in state "Needs Review".

REPOSITORY
  rHG Mercurial

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

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




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