facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-06 23:07:18 +03:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
It was a change in the file system that wasn't reported in the summaries.
This commit is contained in:
Mads Kiilerich 2013-01-10 00:44:23 +01:00
parent b4877a560f
commit a09e5b862c
7 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
mercurial/merge.py
View File

@ -440,6 +440,7 @@ def applyupdates(repo, actions, wctx, mctx, actx, overwrite):
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'))

2
tests/test-execute-bit.t
View File

@ -20,7 +20,7 @@ Make sure we notice the change of mode if the cached size == -1:
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

4
tests/test-flags.t
View File

@ -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

2
tests/test-hgweb-diffs.t
View File

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

2
tests/test-issue1802.t
View File

@ -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:

4
tests/test-merge-types.t
View File

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

2
tests/test-update-issue1456.t
View File

@ -30,7 +30,7 @@ Validate update of standalone execute bit change:
$ 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 ..