changeset 24553 | afc29e29d569 |
parent 24542 | 9fbda55c68d7 |
child 24559 | 4728d6f7c69f |
--- a/mercurial/dirstate.py Mon Mar 30 18:10:59 2015 -0700 +++ b/mercurial/dirstate.py Tue Mar 31 15:41:02 2015 -0700 @@ -777,8 +777,8 @@ # even though f might be a directory, we're only interested # in comparing it to files currently in the dmap -- # therefore normalizefile is enough + nf = normalizefile(nd and (nd + "/" + f) or f, True, True) f = d and (d + "/" + f) or f - nf = normalizefile(nd and (nd + "/" + f) or f, True, True) else: nf = nd and (nd + "/" + f) or f f = nf