##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

Add a pointer to "hg -v help" to the bottom of hg help {,cmd} output...
Add a pointer to "hg -v help" to the bottom of hg help {,cmd} output This should make it easier to discover global options. As a bonus, they are no longer displayed by something like a hg -v help dates
Thomas Arendsen Hein - - Load All Authors

File last commit:

r3751:797c6e70 default
r4315:bc6f5a1d default
Show More
test-extdiff
34 lines | 534 B | text/plain | TextLexer
/ tests / test-extdiff
History | Source | Raw |Copy content |Copy permalink
Vadim Gelfer
extdiff: fix bugs. add test.
 r2906 #!/bin/sh
Thomas Arendsen Hein
Make tests append settings to $HGRCPATH instead of $HGTMP/.hgrc...
 r2990 echo "[extensions]" >> $HGRCPATH
echo "extdiff=" >> $HGRCPATH
Vadim Gelfer
extdiff: fix bugs. add test.
 r2906
hg init a
cd a
echo a > a
hg add
Thomas Arendsen Hein
Don't require a diff which accepts the -N option.
 r3751 hg extdiff -o -r $opt
Vadim Gelfer
extdiff: fix bugs. add test.
 r2906
Thomas Arendsen Hein
Make tests append settings to $HGRCPATH instead of $HGTMP/.hgrc...
 r2990 echo "[extdiff]" >> $HGRCPATH
echo "cmd.falabala=echo" >> $HGRCPATH
echo "opts.falabala=diffing" >> $HGRCPATH
Vadim Gelfer
extdiff: fix bugs. add test.
 r2906
hg falabala
hg help falabala
hg ci -d '0 0' -mtest1
echo b >> a
hg ci -d '1 0' -mtest2
Benoit Boissinot
fix traceback of extdiff after a merge...
 r3330 hg falabala -r 0:1
# test diff during merge
hg update 0
echo b >> b
hg add b
hg ci -m "new branch" -d '1 0'
hg update -C 1
hg merge tip
hg falabala || echo "diff-like tools yield a non-zero exit code"