Mercurial > hg
view tests/test-merge-internal-tools-pattern.out @ 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 | 9fe7e6acf525 |
children | b2310903c462 |
line wrap: on
line source
# initial file contents adding f line 1 line 2 line 3 # branch 1: editing line 1 # branch 2: editing line 3 1 files updated, 0 files merged, 0 files removed, 0 files unresolved created new head # merge using internal:fail tool 0 files updated, 0 files merged, 0 files removed, 1 files unresolved use 'hg resolve' to retry unresolved file merges or 'hg up --clean' to abandon line 1 line 2 third line M f # merge using internal:local tool 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 0 files updated, 1 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) line 1 line 2 third line M f # merge using internal:other tool 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 0 files updated, 1 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) first line line 2 line 3 M f # merge using default tool 1 files updated, 0 files merged, 0 files removed, 0 files unresolved merging f 0 files updated, 1 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) first line line 2 third line M f