Mercurial > hg
view tests/test-convert-datesort @ 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 | 827d4e807d57 |
children |
line wrap: on
line source
#!/bin/sh cat >> $HGRCPATH <<EOF [extensions] convert= graphlog= EOF hg init t cd t echo a >> a hg ci -Am a0 -d '1 0' hg branch brancha echo a >> a hg ci -m a1 -d '2 0' echo a >> a hg ci -m a2 -d '3 0' echo a >> a hg ci -m a3 -d '4 0' hg up -C 0 hg branch branchb echo b >> b hg ci -Am b0 -d '6 0' hg up -C brancha echo a >> a hg ci -m a4 -d '5 0' echo a >> a hg ci -m a5 -d '7 0' echo a >> a hg ci -m a6 -d '8 0' hg up -C branchb echo b >> b hg ci -m b1 -d '9 0' cd .. echo % convert with datesort hg convert --datesort t t-datesort echo % graph converted repo hg -R t-datesort glog --template '{rev} "{desc}"\n' echo '% convert with datesort (default mode)' hg convert t t-sourcesort echo % graph converted repo hg -R t-sourcesort glog --template '{rev} "{desc}"\n'