##// END OF EJS Templates
largefiles: restore standins according to restored dirstate...
largefiles: restore standins according to restored dirstate Before this patch, standins are restored from the NEW parent of the working directory at "hg rollback", and this causes: - standins removed in the rollback-ed revision are restored, and become orphan, because they are already marked as "R" in the restored dirstate and expected to be unlinked - standins added in the rollback-ed revision are left as they were before rollback, because they are not included in the new parent (this may not be so serious) This patch replaces the "merge.update" invocation with a specific implementation to restore standins according to restored dirstate. This is also the preparation to centralize the logic of updating largefiles into the function wrapping "merge.update" in the subsequent patch. After that patch, "merge.update" will also update largefiles in the working directory and be redundant for restoring standins only.

File last commit:

r22047:8fb6844a default
r22285:85bded43 default
Show More
test-permissions.t
72 lines | 1.2 KiB | text/troff | Tads3Lexer
/ tests / test-permissions.t
Matt Mackall
tests: change some #ifs to #requires
r22047 #require unix-permissions no-root
Mads Kiilerich
tests: use 'hghave unix-permissions' for tests that really use chmod...
r15443
Adrian Buehlmann
combine tests
r12279 $ hg init t
$ cd t
$ echo foo > a
$ hg add a
$ hg commit -m "1"
$ hg verify
checking changesets
checking manifests
crosschecking files in changesets and manifests
checking files
1 files, 1 changesets, 1 total revisions
$ chmod -r .hg/store/data/a.i
Matt Mackall
tests: cleanup exit code handling in unified tests
r12365 $ hg verify
Adrian Buehlmann
combine tests
r12279 checking changesets
checking manifests
crosschecking files in changesets and manifests
checking files
Mads Kiilerich
tests: remove redundant globs...
r12640 abort: Permission denied: $TESTTMP/t/.hg/store/data/a.i
Matt Mackall
tests: cleanup exit code handling in unified tests
r12365 [255]
Adrian Buehlmann
combine tests
r12279
$ chmod +r .hg/store/data/a.i
Matt Mackall
tests: cleanup exit code handling in unified tests
r12365 $ hg verify
Adrian Buehlmann
combine tests
r12279 checking changesets
checking manifests
crosschecking files in changesets and manifests
checking files
1 files, 1 changesets, 1 total revisions
$ chmod -w .hg/store/data/a.i
$ echo barber > a
Matt Mackall
tests: cleanup exit code handling in unified tests
r12365 $ hg commit -m "2"
Adrian Buehlmann
combine tests
r12279 trouble committing a!
Mads Kiilerich
tests: remove redundant globs...
r12640 abort: Permission denied: $TESTTMP/t/.hg/store/data/a.i
Matt Mackall
tests: cleanup exit code handling in unified tests
r12365 [255]
Adrian Buehlmann
combine tests
r12279
$ chmod -w .
$ hg diff --nodates
diff -r 2a18120dc1c9 a
--- a/a
+++ b/a
@@ -1,1 +1,1 @@
-foo
+barber
$ chmod +w .
$ chmod +w .hg/store/data/a.i
$ mkdir dir
$ touch dir/a
$ hg status
M a
? dir/a
$ chmod -rx dir
$ hg status
dir: Permission denied
M a
Reenable perm to allow deletion:
$ chmod +rx dir
Mads Kiilerich
tests: add missing trailing 'cd ..'...
r16913 $ cd ..