D3945: rebase: remove unnecessary confirm block
khanchi97 (Sushil khanchi)
phabricator at mercurial-scm.org
Sat Jul 14 17:32:16 UTC 2018
khanchi97 created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
Removed unnecessary 'if confirm:' block as that thing is now
handled at 'finally'.
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D3945
AFFECTED FILES
hgext/rebase.py
CHANGE DETAILS
diff --git a/hgext/rebase.py b/hgext/rebase.py
--- a/hgext/rebase.py
+++ b/hgext/rebase.py
@@ -867,11 +867,6 @@
leaveunfinished=True)
except error.InMemoryMergeConflictsError:
ui.status(_('hit a merge conflict\n'))
- if confirm:
- # abort as in-memory merge doesn't support conflict
- rbsrt._prepareabortorcontinue(isabort=True, backup=False,
- suppwarns=True)
- needsabort = False
return 1
else:
if confirm:
To: khanchi97, #hg-reviewers
Cc: mercurial-devel
More information about the Mercurial-devel
mailing list