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 21479 e18ef2e11219
parent 21478 3b647aed4394
child 21480 d19f491e5d5b 
--- a/mercurial/localrepo.py	Tue Apr 22 13:02:38 2014 -0500
+++ b/mercurial/localrepo.py	Tue Apr 22 19:06:37 2014 -0500
@@ -1558,12 +1558,12 @@
 
         r = ctx2._poststatus(ctx1, r, match, listignored, listclean,
                              listunknown)
-        modified, added, removed, deleted, unknown, ignored, clean = r
 
         if reversed:
-            added, removed = removed, added
-
-        r = modified, added, removed, deleted, unknown, ignored, clean
+            # since we are maintaining whether we reversed ctx1 and ctx2 (due
+            # to comparing the workingctx with its parent), we need to switch
+            # back added files (r[1]) and removed files (r[2])
+            r[1], r[2] = r[2], r[1]
 
         if listsubrepos:
             for subpath, sub in scmutil.itersubrepos(ctx1, ctx2):
mercurial