Mercurial > hg
view tests/test-merge-remove @ 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 | 653ddd1d7cd7 |
children |
line wrap: on
line source
#!/bin/sh hg init repo cd repo echo foo > foo echo bar > bar hg ci -qAm 'add foo bar' echo foo2 >> foo echo bleh > bar hg ci -m 'change foo bar' hg up -qC 0 hg mv foo foo1 echo foo1 > foo1 hg cat foo >> foo1 hg ci -m 'mv foo foo1' hg merge hg debugstate --nodates hg st -q echo '% removing foo1 and bar' cp foo1 F cp bar B hg rm -f foo1 bar hg debugstate --nodates hg st -qC echo '% readding foo1 and bar' cp F foo1 cp B bar hg add -v foo1 bar hg debugstate --nodates hg st -qC echo '% reverting foo1 and bar' hg revert -vr . foo1 bar hg debugstate --nodates hg st -qC hg diff