Mercurial > hg
view tests/test-mq-qgoto @ 9827:4fe9ca519637
mdiff: fix diff -b/B/w on mixed whitespace hunks (issue127)
Previous code was computing hunks then checking if these hunks could be ignored
when taking whitespace/blank-lines options in accounts. This approach is simple
but fails with hunks containing both whitespace and non-whitespace changes, the
whole hunk is emitted while it can be mostly made of whitespace. The new
version normalize the whitespaces before hunk generation, and test for
blank-lines afterwards.
author | Patrick Mezard <pmezard@gmail.com> |
---|---|
date | Wed, 11 Nov 2009 18:31:42 +0100 |
parents | 12df451ce205 |
children |
line wrap: on
line source
#!/bin/sh echo "[extensions]" >> $HGRCPATH echo "mq=" >> $HGRCPATH hg init a cd a echo a > a hg ci -Ama hg qnew a.patch echo a >> a hg qrefresh hg qnew b.patch echo b > b hg add b hg qrefresh hg qnew c.patch echo c > c hg add c hg qrefresh hg qgoto a.patch hg qgoto c.patch hg qgoto b.patch echo echo % Using index hg qgoto 0 hg qgoto 2 echo echo % No warnings when using index hg qnew bug314159 echo d >> c hg qrefresh hg qnew bug141421 echo e >> c hg qrefresh hg qgoto 1 hg qgoto 3 echo echo % Detect ambiguous non-index hg qgoto 14 exit 0