Patchwork D520: simplemerge: remove check for null context

login
register
mail settings
Submitter phabricator
Date Aug. 25, 2017, 10:56 p.m.
Message ID <59f574093eb6a1b429a3412555684ac9@localhost.localdomain>
Download mbox | patch
Permalink /patch/23361/
State Not Applicable
Headers show

Comments

phabricator - Aug. 25, 2017, 10:56 p.m.
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG3b2a002ef685: simplemerge: remove check for null context (authored by phillco).

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D520?vs=1300&id=1313

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

AFFECTED FILES
  mercurial/simplemerge.py

CHANGE DETAILS




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

Patch

diff --git a/mercurial/simplemerge.py b/mercurial/simplemerge.py
--- a/mercurial/simplemerge.py
+++ b/mercurial/simplemerge.py
@@ -425,8 +425,6 @@ 
     The merged result is written into `localctx`.
     """
     def readctx(ctx):
-        if not ctx:
-            return None
         # Merges were always run in the working copy before, which means
         # they used decoded data, if the user defined any repository
         # filters.