Mercurial > hg > mercurial-crew-with-dirclash
comparison tests/test-extdiff @ 3044:fcadf7a32425
Merge with mpm
| author | Josef "Jeff" Sipek <jeffpc@josefsipek.net> |
|---|---|
| date | Sun, 03 Sep 2006 06:06:02 -0400 |
| parents | d77022db1bca |
| children | 61fcd9fac434 |
comparison
equal
deleted
inserted
replaced
| 3043:2a4d4aecb2b4 | 3044:fcadf7a32425 |
|---|---|
| 1 #!/bin/sh | |
| 2 | |
| 3 HGRCPATH=$HGTMP/.hgrc; export HGRCPATH | |
| 4 echo "[extensions]" >> $HGTMP/.hgrc | |
| 5 echo "extdiff=" >> $HGTMP/.hgrc | |
| 6 | |
| 7 hg init a | |
| 8 cd a | |
| 9 echo a > a | |
| 10 hg add | |
| 11 diff -N /dev/null /dev/null 2> /dev/null | |
| 12 if [ $? -ne 0 ]; then | |
| 13 opt="-p gdiff" | |
| 14 fi | |
| 15 hg extdiff -o -Nr $opt | |
| 16 | |
| 17 echo "[extdiff]" >> $HGTMP/.hgrc | |
| 18 echo "cmd.falabala=echo" >> $HGTMP/.hgrc | |
| 19 echo "opts.falabala=diffing" >> $HGTMP/.hgrc | |
| 20 | |
| 21 hg falabala | |
| 22 | |
| 23 hg help falabala | |
| 24 | |
| 25 hg ci -d '0 0' -mtest1 | |
| 26 | |
| 27 echo b >> a | |
| 28 hg ci -d '1 0' -mtest2 | |
| 29 | |
| 30 hg falabala -r 0:1 || echo "diff-like tools yield a non-zero exit code" |