view tests/test-empty-file @ 6486:960bc707ea10

doc: escape .hg at bol in manpages with make (issue1072) This works around a bug in old docbook stylesheets. Remove .*.swp example from hgignore.5.txt. Diagnosis and workaround thanks to Alexis S. L. Carvalho.
author Christian Ebert <blacktrash@gmx.net>
date Mon, 07 Apr 2008 09:02:04 +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