changeset 14150 | 3a3584967a93 |
parent 14102 | 7f45b1911893 |
child 14154 | 497493b777ad |
--- a/mercurial/localrepo.py Mon Mar 07 14:47:30 2011 +0100 +++ b/mercurial/localrepo.py Thu Feb 24 14:06:08 2011 +0100 @@ -1228,8 +1228,7 @@ if fn in mf1: if (fn not in deleted and (mf1.flags(fn) != mf2.flags(fn) or - (mf1[fn] != mf2[fn] and - (mf2[fn] or ctx1[fn].cmp(ctx2[fn]))))): + mf1[fn] != mf2[fn])): modified.append(fn) elif listclean: clean.append(fn)