Mercurial > hg

diff mercurial/dirstate.py @ 24553:afc29e29d569

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
dirstate: fix order of initializing nf vs f Result of a bad merge.
author Siddharth Agarwal <sid0@fb.com>
date Tue, 31 Mar 2015 15:41:02 -0700
parents 9fbda55c68d7
children 4728d6f7c69f
line wrap: on
line diff
--- 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