Mercurial > hg
view tests/test-hgweb @ 5503:6f26c7677463
Test a merge of a symlink against an executable file.
This should result in a conflict, but the symlink always wins.
author | Bryan O'Sullivan <bos@serpentine.com> |
---|---|
date | Fri, 02 Nov 2007 14:02:28 -0700 |
parents | e3a0c092b4e2 |
children | 22713dce19f6 |
line wrap: on
line source
#!/bin/sh hg init test cd test mkdir da echo foo > da/foo echo foo > foo hg ci -Ambase -d '0 0' hg serve -p $HGPORT -d --pid-file=hg.pid echo % manifest ("$TESTDIR/get-with-headers.py" localhost:$HGPORT '/file/tip/?style=raw') ("$TESTDIR/get-with-headers.py" localhost:$HGPORT '/file/tip/da?style=raw') kill `cat hg.pid`