Mercurial > hg
view tests/test-rebase-issue-noparam-single-rev @ 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 | 8766fee6f225 |
children | b345b1cc124f |
line wrap: on
line source
#!/bin/sh echo "[extensions]" >> $HGRCPATH echo "graphlog=" >> $HGRCPATH echo "rebase=" >> $HGRCPATH addcommit () { echo $1 > $1 hg add $1 hg commit -d "${2} 0" -m $1 } hg init a cd a addcommit "c1" 0 addcommit "c2" 1 addcommit "l1" 2 hg update -C 1 addcommit "r1" 3 addcommit "r2" 4 hg glog --template '{rev}:{desc}\n' echo echo '% Rebase with no arguments - single revision in source branch' hg update -C 2 hg rebase 2>&1 | sed 's/\(saving bundle to \).*/\1/' hg glog --template '{rev}:{desc}\n' cd .. rm -rf a hg init a cd a addcommit "c1" 0 addcommit "c2" 1 addcommit "l1" 2 addcommit "l2" 3 hg update -C 1 addcommit "r1" 4 hg glog --template '{rev}:{desc}\n' echo echo '% Rebase with no arguments - single revision in target branch' hg update -C 3 hg rebase 2>&1 | sed 's/\(saving bundle to \).*/\1/' hg glog --template '{rev}:{desc}\n'