Mercurial > public > mercurial-scm > hg-stable

diff mercurial/localrepo.py @ 29237:ee935a6e1ea2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge with stable
author Matt Mackall <mpm@selenic.com>
date Wed, 25 May 2016 15:32:35 -0500
parents ad1ce3c7af72 dae38633eba8
children 0d83ad967bf8
line wrap: on
line diff
--- a/mercurial/localrepo.py	Thu May 12 22:29:05 2016 -0400
+++ b/mercurial/localrepo.py	Wed May 25 15:32:35 2016 -0500
@@ -1388,6 +1388,8 @@
             node = fctx.filenode()
             if node in [fparent1, fparent2]:
                 self.ui.debug('reusing %s filelog entry\n' % fname)
+                if manifest1.flags(fname) != fctx.flags():
+                    changelist.append(fname)
                 return node
 
         flog = self.file(fname)