Mercurial > hg > mercurial-crew-with-dirclash
annotate tests/test-permissions.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 | 74723744d8e0 |
children |
rev | line source |
---|---|
1497 | 1 checking changesets |
2 checking manifests | |
3 crosschecking files in changesets and manifests | |
4 checking files | |
5 1 files, 1 changesets, 1 total revisions | |
6 checking changesets | |
7 checking manifests | |
8 crosschecking files in changesets and manifests | |
9 checking files | |
10 verify failed | |
11 checking changesets | |
12 checking manifests | |
13 crosschecking files in changesets and manifests | |
14 checking files | |
15 1 files, 1 changesets, 1 total revisions | |
16 commit failed | |
5219
74723744d8e0
fix test-permissions output
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
2152
diff
changeset
|
17 diff -r c1fab96507ef a |
74723744d8e0
fix test-permissions output
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
2152
diff
changeset
|
18 --- a/a |
74723744d8e0
fix test-permissions output
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
2152
diff
changeset
|
19 +++ b/a |
74723744d8e0
fix test-permissions output
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
2152
diff
changeset
|
20 @@ -1,1 +1,1 @@ foo |
74723744d8e0
fix test-permissions output
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
2152
diff
changeset
|
21 -foo |
74723744d8e0
fix test-permissions output
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
2152
diff
changeset
|
22 +barber |