view tests/test-empty-file @ 4744:44e17f5029d0

Make hg add foo; hg mv foo bar work. - foo will be removed (the user has a copy of its contents in bar) - bar will not be marked as a copy (there was no committed version of foo). We print a warning telling that to the user. Fixes issue269.
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
date Tue, 03 Jul 2007 03:06:40 -0300
parents 7a7d4937272b
children 4c94b6d0fb1c
line wrap: on
line source

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