Mercurial > evolve

changeset 5004:dc43e62ea796

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
evolve: remove dead initilization of "newnode" variable It's been dead since f9dad99a90d5 (evolve: create a new commit instead of amending one of the divergents, 2018-06-13).
author Martin von Zweigbergk <martinvonz@google.com>
date Mon, 09 Dec 2019 10:44:42 -0800
parents ad1ea34335cb
children e66ba12e5db3
files hgext3rd/evolve/evolvecmd.py
diffstat 1 files changed, 1 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/hgext3rd/evolve/evolvecmd.py	Thu Dec 12 17:16:02 2019 +0530
+++ b/hgext3rd/evolve/evolvecmd.py	Mon Dec 09 10:44:42 2019 -0800
@@ -648,9 +648,6 @@
                                    other.description())
         user = utility.mergeusers(ui, base, divergent, other)
 
-        # new node if any formed as the replacement
-        newnode = None
-
         mergehook(repo, base, divergent, other)
 
         date = divergent.date()
@@ -663,6 +660,7 @@
             else:
                 date = max(divergent.date(), other.date())
 
+        # new node if any formed as the replacement
         newnode = repo.commit(text=desc, user=user, date=date)
         if newnode == divergent.node() or newnode is None:
             # no changes