view tests/test-empty-file @ 11701:84fb29f5e0d2

mq: fix qimport --name --existing --force on win32 os.rename() does not overwrite existing targets on Windows.
author Patrick Mezard <pmezard@gmail.com>
date Wed, 28 Jul 2010 11:07:20 +0200
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