Mercurial > evolve

changeset 5593:28dc9ac2958a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
evolvecmd: rename `r` to usual `stats`
author Martin von Zweigbergk <martinvonz@google.com>
date Thu, 24 Sep 2020 16:54:13 -0700
parents 95949b06bd48
children dcadb8b1d098
files hgext3rd/evolve/evolvecmd.py
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/hgext3rd/evolve/evolvecmd.py	Thu Sep 24 16:34:04 2020 -0700
+++ b/hgext3rd/evolve/evolvecmd.py	Thu Sep 24 16:54:13 2020 -0700
@@ -929,8 +929,8 @@
 
     tr = repo.currenttransaction()
     assert tr is not None
-    r = _evolvemerge(repo, orig, dest, pctx, keepbranch)
-    if r.unresolvedcount: # some conflict
+    stats = _evolvemerge(repo, orig, dest, pctx, keepbranch)
+    if stats.unresolvedcount: # some conflict
         hint = _(b"see 'hg help evolve.interrupted'")
         raise error.InterventionRequired(_(b"unresolved merge conflicts"),
                                          hint=hint)