Mercurial Mercurial > mercurial / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mercurial/localrepo.py
changeset 21480 d19f491e5d5b
parent 21479 e18ef2e11219
child 21483 6adfc311eee8 
--- a/mercurial/localrepo.py	Tue Apr 22 19:06:37 2014 -0500
+++ b/mercurial/localrepo.py	Thu Apr 24 08:34:44 2014 -0500
@@ -1551,11 +1551,8 @@
 
         r = [[], [], [], [], [], [], []]
         r = ctx2._prestatus(ctx1, r, match, listignored, listclean, listunknown)
-
-        if not parentworking:
-            r = ctx2._buildstatus(ctx1, r, match, listignored, listclean,
-                                  listunknown)
-
+        r = ctx2._buildstatus(ctx1, r, match, listignored, listclean,
+                              listunknown)
         r = ctx2._poststatus(ctx1, r, match, listignored, listclean,
                              listunknown)
mercurial