Mercurial > public > mercurial-scm > hg-stable

diff mercurial/merge.py @ 18334:44bda93df90e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: changing the mode of a file is also an update It was a change in the file system that wasn't reported in the summaries.
author Mads Kiilerich <mads@kiilerich.com>
date Thu, 10 Jan 2013 00:44:23 +0100
parents f6f23ecafc9b
children 435909bf0257
line wrap: on
line diff
--- a/mercurial/merge.py	Tue Jan 15 01:05:12 2013 +0100
+++ b/mercurial/merge.py	Thu Jan 10 00:44:23 2013 +0100
@@ -440,6 +440,7 @@
             flags = a[2]
             audit(f)
             util.setflags(repo.wjoin(f), 'l' in flags, 'x' in flags)
+            updated += 1
     ms.commit()
     repo.ui.progress(_('updating'), None, total=numupdates, unit=_('files'))