Mercurial > hg
view tests/test-convert-splicemap.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 | a3d73b3e1f8a |
children |
line wrap: on
line source
adding a adding b adding c adding a adding d adding e % test invalid splicemap abort: syntax error in splicemap(1): key/value pair expected % splice repo2 on repo1 updating to branch default 3 files updated, 0 files merged, 0 files removed, 0 files unresolved scanning source... sorting... converting... 2 addaandd spliced in ['6d4c2037ddc2cb2627ac3a244ecce35283268f8e'] as parents of 527cdedf31fbd5ea708aa14eeecf53d4676f38db 1 changed spliced in ['e55c719b85b60e5102fac26110ba626e7cb6b7dc', '527cdedf31fbd5ea708aa14eeecf53d4676f38db'] as parents of e4ea00df91897da3079a10fab658c1eddba6617b 0 adde o 5 "adde" files: e | o 4 "changed" files: d |\ | o 3 "addaandd" files: a d | | @ | 2 "addc" files: c |/ o 1 "addb" files: a b | o 0 "adda" files: a