Mercurial > hg
comparison mercurial/copies.py @ 17055:8b7cd9a998f0
copies: re-include root directory in directory rename detection (issue3511)
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Wed, 27 Jun 2012 13:41:04 -0500 |
parents | e9ae770eff1c |
children | 6c35b53cd28b |
comparison
equal
deleted
inserted
replaced
17054:125ff5654b72 | 17055:8b7cd9a998f0 |
---|---|
319 | 319 |
320 repo.ui.debug(" checking for directory renames\n") | 320 repo.ui.debug(" checking for directory renames\n") |
321 | 321 |
322 # generate a directory move map | 322 # generate a directory move map |
323 d1, d2 = c1.dirs(), c2.dirs() | 323 d1, d2 = c1.dirs(), c2.dirs() |
324 invalid = set([""]) | 324 d1.add('') |
325 d2.add('') | |
326 invalid = set() | |
325 dirmove = {} | 327 dirmove = {} |
326 | 328 |
327 # examine each file copy for a potential directory move, which is | 329 # examine each file copy for a potential directory move, which is |
328 # when all the files in a directory are moved to a new directory | 330 # when all the files in a directory are moved to a new directory |
329 for dst, src in fullcopy.iteritems(): | 331 for dst, src in fullcopy.iteritems(): |