Mercurial > hg

changeset 16701:34c30506dd4e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
cmdutil: use filectx.cmp() in amend()
author Patrick Mezard <patrick@mezard.eu>
date Sun, 13 May 2012 13:19:46 +0200
parents 28001e8a5149
children 1751d96d324f
files mercurial/cmdutil.py
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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