Mercurial > hg
view tests/test-merge-force @ 8311:e0eb03bfa5af
manpage build: fail early when xmlto is not available
When we try to build manpages with xmlto and sed, but xmlto is
missing fail at the xmlto stage. Otherwise, one may run `cd doc;
make' and miss the warnings like:
xmlto: not found
sed: hg.1: No such file or directory
and end up with empty files installed as manpages.
author | Giorgos Keramidas <keramida@ceid.upatras.gr> |
---|---|
date | Thu, 07 May 2009 15:08:25 +0300 |
parents | 69c75d063c7a |
children |
line wrap: on
line source
#!/bin/sh hg init repo cd repo echo a > a hg ci -qAm 'add a' echo b > b hg ci -qAm 'add b' hg up -qC 0 hg rm a hg ci -m 'rm a' hg up -qC 1 rm a echo '% local deleted a file, remote removed' hg merge # should fail, since there are deleted files hg -v merge --force echo % should show a as removed hg st hg ci -m merge echo % manifest. should not have a: hg manifest