facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-07 15:27:13 +03:00
Code Issues Projects Releases Wiki Activity

copies: don't double-detect items in the directory copy check

Browse Source
This commit is contained in:
Matt Mackall 2008-03-29 12:39:47 -05:00
parent c9895536f8
commit ba8f438e7a
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
mercurial/copies.py
View File

@ -185,8 +185,9 @@ def copies(repo, c1, c2, ca, checkdirs=False):
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