Mercurial > hg

changeset 42539:5c64d0b4c037

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
shelve: removed redundant merge detection method Differential Revision: https://phab.mercurial-scm.org/D6547
author Taapas Agrawal <taapas2897@gmail.com>
date Thu, 20 Jun 2019 00:59:16 +0530
parents 2db96bf84a8f
children 80e0ea08b55c
files hgext/shelve.py
diffstat 1 files changed, 0 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- 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: