Patchwork D3945: rebase: remove unnecessary confirm block

login
register
mail settings
Submitter phabricator
Date July 15, 2018, 1:29 p.m.
Message ID <0b539b12b50e870093bb4f1cf1e92179@localhost.localdomain>
Download mbox | patch
Permalink /patch/32850/
State Not Applicable
Headers show

Comments

phabricator - July 15, 2018, 1:29 p.m.
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG70448ec995c2: rebase: remove unnecessary confirm block (authored by khanchi97, committed by ).

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D3945?vs=9595&id=9598

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

AFFECTED FILES
  hgext/rebase.py

CHANGE DETAILS




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

Patch

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: