Mercurial > hg
view tests/test-rebase-newancestor @ 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 | 49efeed49c94 |
children | b345b1cc124f |
line wrap: on
line source
#!/bin/sh echo "[extensions]" >> $HGRCPATH echo "graphlog=" >> $HGRCPATH echo "rebase=" >> $HGRCPATH rm -rf repo hg init repo cd repo echo A > a echo >> a hg commit -AmA -u test -d '0 0' echo B > a echo >> a hg commit -mB -u test -d '1 0' echo C > a echo >> a hg commit -mC -u test -d '2 0' hg up -C 0 echo D >> a hg commit -AmAD -u test -d '3 0' hg glog --template '{rev}:{desc} {node|short}\n' hg rebase -q -s 1 -d 3 2>&1 | grep -v 'saving bundle' hg glog --template '{rev}:{desc} {node|short}\n' exit 0