merge: changing the mode of a file is also an update

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.

--- 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'))
 

--- a/tests/test-execute-bit.t	Tue Jan 15 01:05:12 2013 +0100
+++ b/tests/test-execute-bit.t	Thu Jan 10 00:44:23 2013 +0100
@@ -20,7 +20,7 @@
   M a
 
   $ hg up 0
-  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
+  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg id
   d69afc33ff8a
   $ test -x a && echo executable -- bad || echo not executable -- good

--- a/tests/test-flags.t	Tue Jan 15 01:05:12 2013 +0100
+++ b/tests/test-flags.t	Thu Jan 10 00:44:23 2013 +0100
@@ -79,7 +79,7 @@
 
   $ hg -v merge
   resolving manifests
-  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
+  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
 
   $ cd ../test3
@@ -128,7 +128,7 @@
 
   $ hg -v merge
   resolving manifests
-  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
+  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
 
   $ ls -l ../test[123]/a > foo

--- a/tests/test-hgweb-diffs.t	Tue Jan 15 01:05:12 2013 +0100
+++ b/tests/test-hgweb-diffs.t	Thu Jan 10 00:44:23 2013 +0100
@@ -689,7 +689,7 @@
 comparison existing file
 
   $ hg up
-  0 files updated, 0 files merged, 1 files removed, 0 files unresolved
+  1 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ echo a >> a
   $ hg ci -mc
   $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT 'comparison/tip/a'

--- a/tests/test-issue1802.t	Tue Jan 15 01:05:12 2013 +0100
+++ b/tests/test-issue1802.t	Thu Jan 10 00:44:23 2013 +0100
@@ -59,7 +59,7 @@
    ancestor: a03b0deabf2b, local: d6fa54f68ae1+, remote: 2d8bcf2dda39
    a: update permissions -> e
   updating: a 1/1 files (100.00%)
-  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
+  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
 
 Simulate a Windows commit:

--- a/tests/test-merge-types.t	Tue Jan 15 01:05:12 2013 +0100
+++ b/tests/test-merge-types.t	Thu Jan 10 00:44:23 2013 +0100
@@ -10,7 +10,7 @@
   $ hg ci -mexecutable
 
   $ hg up 0
-  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
+  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ rm a
   $ ln -s symlink a
   $ hg ci -msymlink
@@ -25,7 +25,7 @@
   (n)one, e(x)ec or sym(l)ink? n
    a: update permissions -> e
   updating: a 1/1 files (100.00%)
-  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
+  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
 
 

--- a/tests/test-update-issue1456.t	Tue Jan 15 01:05:12 2013 +0100
+++ b/tests/test-update-issue1456.t	Thu Jan 10 00:44:23 2013 +0100
@@ -30,7 +30,7 @@
   $ hg up -C 0
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg up
-  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
+  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg st
 
   $ cd ..