--- a/mercurial/context.py	Sat Dec 13 18:32:29 2008 +0100
+++ b/mercurial/context.py	Sun Dec 14 17:35:19 2008 +0100
@@ -734,7 +734,7 @@
         parents = [(p or nullid) for p in parents]
         p1, p2 = parents
         self._parents = [changectx(self._repo, p) for p in (p1, p2)]
-        files = util.sort(list(files))
+        files = util.sort(util.unique(files))
         self._status = [files, [], [], [], []]
         self._filectxfn = filectxfn