mercurial-crew-with-dirclash: tests/test-hgweb@dc5920ea12f8

Mercurial Mercurial > hg > mercurial-crew-with-dirclash / file revision

tests/test-hgweb

author	Alexis S. L. Carvalho <alexis@cecm.usp.br>
	Fri, 22 Jun 2007 20:44:40 -0300
changeset 4681	dc5920ea12f8
parent 3936	8eccfce0ab5e
child 5384	e3a0c092b4e2
permissions	-rwxr-xr-x

merge: fix small bug with a failed merge across a rename If $HGMERGE wasn't able to fix the conflicts, we wouldn't copy f to fd, and util.set_exec wouldn't find the file.


#!/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 20060 -d --pid-file=hg.pid
echo % manifest
("$TESTDIR/get-with-headers.py" localhost:20060 '/file/tip/?style=raw')
("$TESTDIR/get-with-headers.py" localhost:20060 '/file/tip/da?style=raw')
kill `cat hg.pid`

mercurial-crew-with-dirclash

RSS Atom