tests/test-empty-file
author Martin Geisler <mg@lazybytes.net>
Thu, 14 May 2009 17:28:26 +0200
changeset 8388 dbc28d362e79
parent 4659 7a7d4937272b
child 12156 4c94b6d0fb1c
permissions -rwxr-xr-x
test-debugcomplete: add --show merge option to output

#!/bin/sh

hg init a
cd a
touch empty1
hg add empty1
hg commit -m 'add empty1' -d '1000000 0'

touch empty2
hg add empty2
hg commit -m 'add empty2' -d '1000000 0'

hg up -C 0
touch empty3
hg add empty3
hg commit -m 'add empty3' -d '1000000 0'

hg heads

hg merge 1
# before changeset 05257fd28591, we didn't notice the
# empty file that came from rev 1.
hg status
hg commit -m merge -d '1000000 0'
hg manifest --debug tip