Mercurial > hg
view tests/test-simplemerge-cmd @ 6456:db5324d3c257
Pager extension: switch it off if --debugger is set
The pager is preventing the debugger prompt and much of the
debugger output to be refreshed. Moreover the pager does not
make sense when debugging line by line.
(This supersedes the similar ui.debugflag patch. Disabling
the pager for debug output doesn't make that much sense,
as this is actually when the pager might be useful.)
author | Gilles Moris <gilles.moris@free.fr> |
---|---|
date | Thu, 03 Apr 2008 11:11:31 +0200 |
parents | c6413f8f2f8e |
children | e1f4343db740 |
line wrap: on
line source
#!/bin/sh cp "$TESTDIR"/../contrib/simplemerge . echo base > base echo local > local cat base >> local cp local orig cat base > other echo other >> other echo '% changing local directly' python simplemerge local base other && echo "merge succeeded" cat local cp orig local echo '% printing to stdout' python simplemerge -p local base other echo ' local:' cat local echo '% conflicts' cp base conflict-local cp other conflict-other echo not other >> conflict-local echo end >> conflict-local echo end >> conflict-other python simplemerge -p conflict-local base conflict-other || echo "merge failed" echo '% --no-minimal' python simplemerge -p --no-minimal conflict-local base conflict-other echo '% 1 label' python simplemerge -p -L foo conflict-local base conflict-other echo '% 2 labels' python simplemerge -p -L foo -L bar conflict-local base conflict-other echo '% too many labels' python simplemerge -p -L foo -L bar -L baz conflict-local base conflict-other echo '% binary file' python -c "f = file('binary-local', 'w'); f.write('\x00'); f.close()" cat orig >> binary-local python simplemerge -p binary-local base other echo '% binary file --text' python simplemerge -a -p binary-local base other echo '% help' python simplemerge --help echo '% wrong number of arguments' python simplemerge echo '% bad option' python simplemerge --foo -p local base other exit 0