Mercurial > public > mercurial-scm > hg

diff mercurial/merge.py @ 8152:08e1baf924ca

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
replace set-like dictionaries with real sets Many of the dictionaries created by dict.fromkeys were emulating sets. These can now be replaced with real sets.
author Martin Geisler <mg@lazybytes.net>
date Wed, 22 Apr 2009 00:57:28 +0200
parents 496ae1ea4698
children 46293a0c7e9f
line wrap: on
line diff
--- a/mercurial/merge.py	Wed Apr 22 00:56:06 2009 +0200
+++ b/mercurial/merge.py	Wed Apr 22 00:57:28 2009 +0200
@@ -166,7 +166,7 @@
         if repo.ui.configbool("merge", "followcopies", True):
             dirs = repo.ui.configbool("merge", "followdirs", True)
             copy, diverge = copies.copies(repo, p1, p2, pa, dirs)
-        copied = dict.fromkeys(copy.values())
+        copied = set(copy.values())
         for of, fl in diverge.iteritems():
             act("divergent renames", "dr", of, fl)