Mercurial > hg
view tests/test-mq-qdelete @ 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 | 5e9965407d53 |
children | c3d7daa0928e |
line wrap: on
line source
#!/bin/sh echo "[extensions]" >> $HGRCPATH echo "mq=" >> $HGRCPATH hg init a cd a echo 'base' > base hg ci -Ambase -d '1 0' hg qnew -d '1 0' a hg qnew -d '1 0' b hg qnew -d '1 0' c hg qdel hg qdel c hg qpop hg qdel c hg qseries ls .hg/patches hg qpop hg qdel -k b ls .hg/patches hg qdel -r a hg qapplied hg log --template '{rev} {desc}\n' hg qnew d hg qnew e hg qnew f hg qdel -r e hg qdel -r qbase:e hg qapplied hg log --template '{rev} {desc}\n' cd .. hg init b cd b echo 'base' > base hg ci -Ambase -d '1 0' hg qfinish hg qfinish -a hg qnew -d '1 0' a hg qnew -d '1 0' b hg qnew c # XXX fails to apply by /usr/bin/patch if we put a date hg qfinish 0 hg qfinish b hg qpop hg qfinish -a c hg qpush hg qfinish qbase:b hg qapplied hg log --template '{rev} {desc}\n' hg qfinish -a c hg qapplied hg log --template '{rev} {desc}\n' ls .hg/patches