##// END OF EJS Templates
changectx: ancestor should only prefer merge.preferancestor if it is a revision...
changectx: ancestor should only prefer merge.preferancestor if it is a revision The value '*' currently designates that bid merge should be used. The best way to test bid merge is to set preferancestor=* in the configuration file ... but then it would abort with unknown revision '*' when other code paths ended up in changectx.ancestor . Instead, just skip and ignore the value '*' when looking for a preferred ancestor.

File last commit:

r22047:8fb6844a default
r22180:17011b36 stable
Show More
test-permissions.t
74 lines | 1.2 KiB | text/troff | Tads3Lexer
/ tests / test-permissions.t
Mads Kiilerich
tests: warn on invalid #if directive
r21023 #if 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 ..
Matt Mackall
tests: skip tests that require not having root (issue4089)...
r20008
#endif