dirstate: fix order of initializing nf vs f

Result of a bad merge.

mercurial/dirstate.py

@@ -777,8 +777,8 b' class dirstate(object):'
                     # 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