[PATCH] dirstate: fix order of initializing nf vs f

[Siddharth Agarwal]

# HG changeset patch
# User Siddharth Agarwal <sid0 at fb.com>
# Date 1427841662 25200
#      Tue Mar 31 15:41:02 2015 -0700
# Node ID 680fbcf0edcd6e7464594d88266d1794a4eaf4e4
# Parent  9fbda55c68d77d0c026d458ac228e9f98c62d64f
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 @@
                     # 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