tests/test-basic
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
Wed, 25 Oct 2006 02:51:27 -0300
changeset 3506 9de0e64545a3
parent 1933 7544700fd931
child 3736 ad3d5b4367cb
permissions -rwxr-xr-x
Test that we notice the empty files from the second parent during a merge This didn't work with 0.9.1, but was fixed by 05257fd28591.

#!/bin/sh

mkdir t
cd t
hg init
echo a > a
hg add a
hg commit -m test -d "1000000 0"
hg history
hg manifest
hg cat a
hg verify