branch | stable |
changeset 29181 | dae38633eba8 |
parent 28883 | 032c4c2f802a |
child 29237 | ee935a6e1ea2 |
--- a/mercurial/localrepo.py Sat May 21 02:48:51 2016 +0900 +++ b/mercurial/localrepo.py Thu May 19 14:35:22 2016 -0700 @@ -1404,6 +1404,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)