[PATCH 09 of 14] merge: changing the mode of a file is also an update
Mads Kiilerich
mads at kiilerich.com
Sun Jan 13 13:02:44 CST 2013
# HG changeset patch
# User Mads Kiilerich <mads at kiilerich.com>
# Date 1357775063 -3600
# Node ID 4059319bd1d4a9145c5f2b159e5d909f64bdf54c
# Parent 20c93961481db4980e9ff08e34e92268974d12b6
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.
diff --git a/mercurial/merge.py b/mercurial/merge.py
--- a/mercurial/merge.py
+++ b/mercurial/merge.py
@@ -440,6 +440,7 @@ def applyupdates(repo, actions, wctx, mc
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'))
diff --git a/tests/test-execute-bit.t b/tests/test-execute-bit.t
--- a/tests/test-execute-bit.t
+++ b/tests/test-execute-bit.t
@@ -20,7 +20,7 @@ Make sure we notice the change of mode i
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
diff --git a/tests/test-flags.t b/tests/test-flags.t
--- a/tests/test-flags.t
+++ b/tests/test-flags.t
@@ -79,7 +79,7 @@ the changelog should mention file a:
$ 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 @@ the changelog should mention file a:
$ 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
diff --git a/tests/test-hgweb-diffs.t b/tests/test-hgweb-diffs.t
--- a/tests/test-hgweb-diffs.t
+++ b/tests/test-hgweb-diffs.t
@@ -689,7 +689,7 @@ comparison new file
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'
diff --git a/tests/test-issue1802.t b/tests/test-issue1802.t
--- a/tests/test-issue1802.t
+++ b/tests/test-issue1802.t
@@ -59,7 +59,7 @@ Simulate a Windows merge:
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:
diff --git a/tests/test-merge-types.t b/tests/test-merge-types.t
--- a/tests/test-merge-types.t
+++ b/tests/test-merge-types.t
@@ -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)
diff --git a/tests/test-update-issue1456.t b/tests/test-update-issue1456.t
--- a/tests/test-update-issue1456.t
+++ b/tests/test-update-issue1456.t
@@ -30,7 +30,7 @@ Validate update of standalone execute bi
$ 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 ..
More information about the Mercurial-devel
mailing list