diff -r 28001e8a5149 -r 34c30506dd4e mercurial/cmdutil.py --- a/mercurial/cmdutil.py Sat May 12 15:41:27 2012 +0200 +++ b/mercurial/cmdutil.py Sun May 13 13:19:46 2012 +0200 @@ -1345,7 +1345,7 @@ a = ctx.filectx(f) if f in base.manifest(): b = base.filectx(f) - return (a.data() == b.data() + return (not a.cmp(b) and a.flags() == b.flags()) else: return False