view tests/test-empty-file @ 10441:dc0d1ca2d378

progress: only reset state if finishing progress for the current topic This prevents some visual glitches when doing a clone --pull locally.
author Augie Fackler <durin42@gmail.com>
date Sat, 13 Feb 2010 09:49:06 -0600
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