tests/test-merge4
author Eric Hopper <hopper@omnifarious.org>
Tue, 27 Jun 2006 09:33:12 -0700
changeset 2514 419c42223bee
parent 2283 e506c14382fd
permissions -rwxr-xr-x
Really fix http headers for web UI and issue 254. This also arranges for static content to allow a keepalive connection.

#!/bin/sh

hg init
echo This is file a1 > a
hg add a
hg commit -m "commit #0" -d "1000000 0"
echo This is file b1 > b
hg add b
hg commit -m "commit #1" -d "1000000 0"
hg update 0
echo This is file c1 > c
hg add c
hg commit -m "commit #2" -d "1000000 0"
hg merge 1
rm b
echo This is file c22 > c
hg commit -m "commit #3" -d "1000000 0"