Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-extdiff @ 4815:8808ea7da86b
merge: make test for fast-forward merge stricter (issue619)
don't allow merging with an ancestor
fix != on contexts
add a test
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Thu, 05 Jul 2007 13:34:18 -0500 |
parents | 797c6e70092b |
children | 2be225ea5722 |
line wrap: on
line source
#!/bin/sh echo "[extensions]" >> $HGRCPATH echo "extdiff=" >> $HGRCPATH hg init a cd a echo a > a hg add 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 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"