Mercurial > hg

changeset 8750:9b8733291dd0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: drop unused diverge initialization
author Matt Mackall <mpm@selenic.com>
date Mon, 08 Jun 2009 18:14:44 -0500
parents 69caf50da4a0
children e8d80e0835c7
files mercurial/merge.py
diffstat 1 files changed, 4 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/merge.py	Mon Jun 08 18:14:44 2009 -0500
+++ b/mercurial/merge.py	Mon Jun 08 18:14:44 2009 -0500
@@ -130,7 +130,7 @@
     repo.ui.debug(_(" ancestor %s local %s remote %s\n") % (pa, p1, p2))
 
     action = []
-    copy, copied, diverge = {}, {}, {}
+    copy, copied = {}, {}
     m1 = p1.manifest()
     m2 = p2.manifest()
 
@@ -164,9 +164,9 @@
         if pa and repo.ui.configbool("merge", "followcopies", True):
             dirs = repo.ui.configbool("merge", "followdirs", True)
             copy, diverge = copies.copies(repo, p1, p2, pa, dirs)
-        copied = set(copy.values())
-        for of, fl in diverge.iteritems():
-            act("divergent renames", "dr", of, fl)
+            for of, fl in diverge.iteritems():
+                act("divergent renames", "dr", of, fl)
+            copied = set(copy.values())
 
     # Compare manifests
     for f, n in m1.iteritems():