# HG changeset patch
# User Siddharth Agarwal <sid0@fb.com>
# Date 2015-03-31 22:41:02
# Node ID afc29e29d569e1761b86d9b1924ea5db8dc64288
# Parent  a2292da6d821beb0c846eafe3a1edafa22608302

dirstate: fix order of initializing nf vs f

Result of a bad merge.

diff --git a/mercurial/dirstate.py b/mercurial/dirstate.py
--- a/mercurial/dirstate.py
+++ b/mercurial/dirstate.py
@@ -777,8 +777,8 @@ 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