Mercurial Mercurial > hg / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
cmdutil: use filectx.cmp() in amend()
authorPatrick Mezard <patrick@mezard.eu>
Sun, 13 May 2012 13:19:46 +0200
changeset 16701 34c30506dd4e
parent 16700 28001e8a5149
child 16702 1751d96d324f
cmdutil: use filectx.cmp() in amend()
mercurial/cmdutil.py file | annotate | diff | comparison | revisions 
--- 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
Mercurial