Mercurial > hg > mercurial-crew-with-dirclash
annotate tests/test-hgweb @ 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 | e3a0c092b4e2 |
children |
rev | line source |
---|---|
3936 | 1 #!/bin/sh |
2 | |
3 hg init test | |
4 cd test | |
5 mkdir da | |
6 echo foo > da/foo | |
7 echo foo > foo | |
8 hg ci -Ambase -d '0 0' | |
5384
e3a0c092b4e2
Allow tests to run in parallel.
Bryan O'Sullivan <bos@serpentine.com>
parents:
3936
diff
changeset
|
9 hg serve -p $HGPORT -d --pid-file=hg.pid |
3936 | 10 echo % manifest |
5384
e3a0c092b4e2
Allow tests to run in parallel.
Bryan O'Sullivan <bos@serpentine.com>
parents:
3936
diff
changeset
|
11 ("$TESTDIR/get-with-headers.py" localhost:$HGPORT '/file/tip/?style=raw') |
e3a0c092b4e2
Allow tests to run in parallel.
Bryan O'Sullivan <bos@serpentine.com>
parents:
3936
diff
changeset
|
12 ("$TESTDIR/get-with-headers.py" localhost:$HGPORT '/file/tip/da?style=raw') |
3936 | 13 kill `cat hg.pid` |