# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 1206812387 18000
# Node ID e2c49ef2dd6e6167cfca1adb724ec391a646f2ec
# Parent  2d9328a2f81f7d5c948c868bb012fd692153ab2f
copies: don't double-detect items in the directory copy check

diff -r 2d9328a2f81f -r e2c49ef2dd6e mercurial/copies.py
--- a/mercurial/copies.py	Sat Mar 29 12:39:47 2008 -0500
+++ b/mercurial/copies.py	Sat Mar 29 12:39:47 2008 -0500
@@ -185,8 +185,9 @@
                 if f.startswith(d):
                     # new file added in a directory that was moved, move it
                     df = dirmove[d] + f[len(d):]
-                    copy[f] = df
-                    repo.ui.debug(_("  file %s -> %s\n") % (f, copy[f]))
+                    if df not in copy:
+                        copy[f] = df
+                        repo.ui.debug(_("  file %s -> %s\n") % (f, copy[f]))
                     break
 
     return copy, diverge