tests/test-empty-file
author Matt Mackall <mpm@selenic.com>
Thu, 30 Nov 2006 17:36:33 -0600
changeset 3730 d377f8d25662
parent 3506 9de0e64545a3
child 3736 ad3d5b4367cb
permissions -rwxr-xr-x
merge: only store one direction of copies in the copy map simplify checkpair generate copied hash from copy map make copy cases more symmetrical

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