tests/test-empty-file
author Thomas Arendsen Hein <thomas@intevation.de>
Fri, 27 Oct 2006 15:56:34 +0200
changeset 3563 db946221a58a
parent 3509 9de0e64545a3
child 3736 ad3d5b4367cb
permissions -rwxr-xr-x
Some clarifications for pull/push protocols: - List file:// and static-http:// - Mention that you can pull from bundle files - List http and https as valid push targets, but emphasize that this feature has to be enabled.

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