mirror of
https://github.com/facebook/sapling.git
synced 2024-10-07 23:38:50 +03:00
copies: don't double-detect items in the directory copy check
This commit is contained in:
parent
c9895536f8
commit
ba8f438e7a
@ -185,6 +185,7 @@ 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):]
|
||||
if df not in copy:
|
||||
copy[f] = df
|
||||
repo.ui.debug(_(" file %s -> %s\n") % (f, copy[f]))
|
||||
break
|
||||
|
Loading…
Reference in New Issue
Block a user