Mercurial Mercurial > hg / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
dirstate: fix order of initializing nf vs f
authorSiddharth Agarwal <sid0@fb.com>
Tue, 31 Mar 2015 15:41:02 -0700
changeset 24553 afc29e29d569
parent 24552 a2292da6d821
child 24554 6e73c66a6919
dirstate: fix order of initializing nf vs f Result of a bad merge.
mercurial/dirstate.py file | annotate | diff | comparison | revisions 
--- 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
Mercurial