Mercurial > hg
view tests/test-convert-hg-source.out @ 10092:f1bf64abcb1b stable
doc/Makefile: Fix rst2html detection
Displaying the output from the failing call to "which" didn't prevent
make from doing stupid things later. We now only search for "rst2html"
and fallback to "rst2html.py". If neither name is found, make will
eventually abort when we try to use $(RST2HTML).
| author | Mads Kiilerich <mads@kiilerich.com> |
|---|---|
| date | Wed, 16 Dec 2009 23:59:50 +0100 |
| parents | 314fc589b313 |
| children | a2f11188e2d2 |
line wrap: on
line source
created new head merging baz and foo to baz 1 files updated, 1 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) 1 files updated, 0 files merged, 1 files removed, 0 files unresolved merging foo and baz to baz 1 files updated, 1 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) created new head initializing destination new repository scanning source... sorting... converting... 5 add foo bar 4 change foo 3 make bar and baz copies of foo 2 merge local copy 1 merge remote copy 0 mark baz executable comparing with ../orig searching for changes no changes found % check shamap LF and CRLF handling scanning source... sorting... converting... 1 change foo again again 0 change foo again % init broken repository created new head % break it initializing destination fixed repository scanning source... sorting... converting... 4 init ignoring: data/b.i@1e88685f5dde: no match found 3 changeall 2 changebagain 1 merge 0 moveb checking changesets checking manifests crosschecking files in changesets and manifests checking files 3 files, 5 changesets, 5 total revisions % manifest -r 0 a % manifest -r tip a c d