Mercurial > hg
view tests/test-extdiff @ 6537:b6a24c273c30
test-convert-svn-branches: short identifiers are more legible
author | Patrick Mezard <pmezard@gmail.com> |
---|---|
date | Mon, 14 Apr 2008 22:31:33 +0200 |
parents | d4fa6bafc43a |
children | e81e6c996e99 |
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 update -C 1 hg merge tip # should diff cloned file against wc file hg falabala > out || echo "diff-like tools yield a non-zero exit code" # cleanup the output since the wc is a tmp directory sed 's:\(.* \).*\(\/test-extdiff\):\1[tmp]\2:' out