Patchwork D2693: histedit: always define update results

login
register
mail settings
Submitter phabricator
Date March 24, 2018, 9:22 p.m.
Message ID <b54f11ff11680546897a499b81b6929f@localhost.localdomain>
Download mbox | patch
Permalink /patch/29822/
State Not Applicable
Headers show

Comments

phabricator - March 24, 2018, 9:22 p.m.
This revision was automatically updated to reflect the committed changes.
indygreg marked an inline comment as done.
Closed by commit rHG0351fb0153ba: histedit: always define update results (authored by indygreg, committed by ).

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D2693?vs=6653&id=7273

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

AFFECTED FILES
  hgext/histedit.py

CHANGE DETAILS




To: indygreg, durin42, #hg-reviewers, martinvonz
Cc: martinvonz, mercurial-devel

Patch

diff --git a/hgext/histedit.py b/hgext/histedit.py
--- a/hgext/histedit.py
+++ b/hgext/histedit.py
@@ -566,7 +566,7 @@ 
         # edits are "in place" we do not need to make any merge,
         # just applies changes on parent for editing
         cmdutil.revert(ui, repo, ctx, (wcpar, node.nullid), all=True)
-        stats = None
+        stats = mergemod.updateresult(0, 0, 0, 0)
     else:
         try:
             # ui.forcemerge is an internal variable, do not document