view tests/test-empty-file @ 4333:4f721e96f1de

Add test for issue 529 - "mq aborts when merging patch deleting files".
author Patrick Mezard <pmezard@gmail.com>
date Sat, 07 Apr 2007 19:42:26 +0100
parents ad3d5b4367cb
children 7a7d4937272b
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