Mercurial > hg
view tests/test-manifest @ 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 | 7239e06e58e9 |
children |
line wrap: on
line source
#!/bin/sh # Source bundle was generated with the following script. # # hg init # echo a > a # ln -s a l # hg ci -Ama -d'0 0' # mkdir b # echo a > b/a # chmod +x b/a # hg ci -Amb -d'1 0' hg init hg -q pull "$TESTDIR/test-manifest.hg" echo % should be empty hg manifest hg co hg manifest hg manifest -v hg manifest --debug hg manifest -r 0 hg manifest -r 1 hg manifest -r tip echo % should fail hg manifest -r 2 hg manifest -r tip tip hg manifest tip