Mercurial > hg

changeset 6426:e2c49ef2dd6e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
copies: don't double-detect items in the directory copy check
author Matt Mackall <mpm@selenic.com>
date Sat, 29 Mar 2008 12:39:47 -0500
parents 2d9328a2f81f
children 6b704ef9ed06
files mercurial/copies.py
diffstat 1 files changed, 3 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- 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