Mercurial > public > mercurial-scm > hg
view tests/test-extdiff @ 7775:5280c39778b6
pure/mpatch: use StringIO instead of mmap (issue1493)
This is more portable than memory mapping /dev/zero: Windows obviously
does not have /dev/zero and mapping /dev/zero failed on Mac OS X.
author | Martin Geisler <mg@daimi.au.dk> |
---|---|
date | Mon, 16 Feb 2009 00:09:47 +0100 |
parents | e81e6c996e99 |
children | 66d0a03d3afc |
line wrap: on
line source
#!/bin/sh echo "[extensions]" >> $HGRCPATH echo "extdiff=" >> $HGRCPATH hg init a cd a echo a > a echo b > b hg add # should diff cloned directories hg extdiff -o -r $opt echo "[extdiff]" >> $HGRCPATH echo "cmd.falabala=echo" >> $HGRCPATH echo "opts.falabala=diffing" >> $HGRCPATH hg falabala hg help falabala hg ci -d '0 0' -mtest1 echo b >> a hg ci -d '1 0' -mtest2 # should diff cloned files directly hg falabala -r 0:1 # test diff during merge hg update 0 echo c >> c hg add c hg ci -m "new branch" -d '1 0' hg merge 1 # should diff cloned file against wc file hg falabala > out # cleanup the output since the wc is a tmp directory sed 's:\(.* \).*\(\/test-extdiff\):\1[tmp]\2:' out # test --change option hg ci -d '2 0' -mtest3 hg falabala -c 1 # check diff are made from the first parent hg falabala -c 3 || echo "diff-like tools yield a non-zero exit code" #hg log