annotate tests/test-merge4 @ 2536:8106e477f584

Fix new tests to be better.  In particular, fix webraw test to
specify a date on commit to be less brittle, and fix test-oldcgi to test
fetching a subdirectory of a webdir instance.

#!/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"