Mercurial > public > mercurial-scm > hg

diff mercurial/localrepo.py @ 14155:921683f14ad7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
backout 3a3584967a93 - the "unreachable code" was apparently not unreachable All tests repeatedly passes with 3a3584967a93 on some machines, but on other machines it regularly causes failure in test-mv-cp-st-diff.t, such as: @@ -203,6 +203,7 @@ - working to root: --rev 0 M a + M x/x A b a
author Mads Kiilerich <mads@kiilerich.com>
date Sun, 01 May 2011 19:51:28 +0200
parents 497493b777ad
children 301725c3df9a
line wrap: on
line diff
--- a/mercurial/localrepo.py	Sun May 01 19:44:28 2011 +0200
+++ b/mercurial/localrepo.py	Sun May 01 19:51:28 2011 +0200
@@ -1228,7 +1228,8 @@
                 if fn in mf1:
                     if (fn not in deleted and
                         (mf1.flags(fn) != mf2.flags(fn) or
-                         mf1[fn] != mf2[fn])):
+                         (mf1[fn] != mf2[fn] and
+                          (mf2[fn] or ctx1[fn].cmp(ctx2[fn]))))):
                         modified.append(fn)
                     elif listclean:
                         clean.append(fn)