changeset 21469 | 65cdc6bab91e |
parent 21467 | 6c90a18dd926 |
child 21470 | 1af854808a3c |
--- a/mercurial/localrepo.py Tue Apr 15 15:43:30 2014 -0500 +++ b/mercurial/localrepo.py Mon Apr 21 20:23:47 2014 -0500 @@ -1570,10 +1570,10 @@ del mf2[f] else: # we are comparing two revisions - deleted, unknown, ignored = [], [], [] mf2 = ctx2._manifestmatches(match, r) modified, added, clean = [], [], [] + deleted, unknown, ignored = r[3], [], [] withflags = mf1.withflags() | mf2.withflags() for fn, mf2node in mf2.iteritems(): if fn in mf1: