Mercurial > hg
view tests/test-mq-symlinks @ 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 | d08099e74b81 |
children | 8cb81d75730c |
line wrap: on
line source
#!/bin/sh "$TESTDIR/hghave" symlink || exit 80 echo "[extensions]" >> $HGRCPATH echo "mq=" >> $HGRCPATH hg init hg qinit hg qnew base.patch echo aaa > a echo bbb > b echo ccc > c hg add a b c hg qrefresh $TESTDIR/readlink.py a echo '% test replacing a file with a symlink' hg qnew symlink.patch rm a ln -s b a hg qrefresh --git $TESTDIR/readlink.py a hg qpop hg qpush $TESTDIR/readlink.py a echo '% test updating a symlink' rm a ln -s c a hg qnew --git -f updatelink $TESTDIR/readlink.py a hg qpop hg qpush --debug $TESTDIR/readlink.py a hg st echo '% test replacing a symlink with a file' ln -s c s hg add s hg qnew --git -f addlink rm s echo sss > s hg qnew --git -f replacelinkwithfile hg qpop hg qpush cat s hg st echo '% test symlink removal' hg qnew removesl.patch hg rm a hg qrefresh --git hg qpop hg qpush hg st -c