Mercurial > hg > mercurial-crew-with-dirclash
annotate tests/test-issue436 @ 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 | f9567a7fa3b3 |
children |
rev | line source |
---|---|
3743
68cddfbbe737
add test for issue436
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff
changeset
|
1 #!/bin/sh |
68cddfbbe737
add test for issue436
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff
changeset
|
2 |
68cddfbbe737
add test for issue436
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff
changeset
|
3 hg init a |
68cddfbbe737
add test for issue436
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff
changeset
|
4 cd a |
3749
f9567a7fa3b3
additional fixes for issue436
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3743
diff
changeset
|
5 hg -v log -v |
3743
68cddfbbe737
add test for issue436
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff
changeset
|
6 hg -v log -v x |
68cddfbbe737
add test for issue436
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff
changeset
|
7 true |