D6547: shelve: removed redundant merge detection method
taapas1128 (Taapas Agrawal)
phabricator at mercurial-scm.org
Thu Jun 27 15:30:46 EDT 2019
taapas1128 updated this revision to Diff 15687.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D6547?vs=15642&id=15687
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()
@@ -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:
To: taapas1128, #hg-reviewers
Cc: mercurial-devel
More information about the Mercurial-devel
mailing list