Mercurial > hg > mercurial-crew-with-dirclash
annotate tests/test-nested-repo.out @ 5390:36c46e20976a
merge: provide *_ISLINK environment vars to merge helper
Sets HG_MY_ISLINK, HG_OTHER_ISLINK, HG_BASE_ISLINK in environment. Without these variables, it's impossible for the merge application to know whether the 'other' and 'base' files were symlinks in their original contexts. For the purposes of the merge they are always emitted as small text files.
| author | Patrick Mezard <pmezard@gmail.com> |
|---|---|
| date | Wed, 03 Oct 2007 23:09:36 +0200 |
| parents | c7e8fe11f34a |
| children |
| rev | line source |
|---|---|
|
2061
5987c1eac2ce
support nested repositories.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
1 # should print nothing |
|
5141
d316124ebbea
Make audit_path more stringent.
Bryan O'Sullivan <bos@serpentine.com>
parents:
2139
diff
changeset
|
2 # should fail |
|
d316124ebbea
Make audit_path more stringent.
Bryan O'Sullivan <bos@serpentine.com>
parents:
2139
diff
changeset
|
3 abort: path 'b/x' is inside repo 'b' |
|
d316124ebbea
Make audit_path more stringent.
Bryan O'Sullivan <bos@serpentine.com>
parents:
2139
diff
changeset
|
4 abort: path 'b/x' is inside repo 'b' |
|
5200
c7e8fe11f34a
path_auditor: cache names of audited directories
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
5141
diff
changeset
|
5 # should fail |
|
c7e8fe11f34a
path_auditor: cache names of audited directories
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
5141
diff
changeset
|
6 abort: path 'b/x' is inside repo 'b' |
|
5141
d316124ebbea
Make audit_path more stringent.
Bryan O'Sullivan <bos@serpentine.com>
parents:
2139
diff
changeset
|
7 # should arguably print nothing |
|
d316124ebbea
Make audit_path more stringent.
Bryan O'Sullivan <bos@serpentine.com>
parents:
2139
diff
changeset
|
8 # should fail |
|
d316124ebbea
Make audit_path more stringent.
Bryan O'Sullivan <bos@serpentine.com>
parents:
2139
diff
changeset
|
9 abort: path 'b/a' is inside repo 'b' |