Mercurial > hg
view tests/test-issue1306 @ 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 | cb93eee1fbcd |
children |
line wrap: on
line source
#!/bin/sh echo % initialize remote repo with branches hg init remote cd remote echo a > a hg ci -Ama hg branch br hg ci -Amb echo c > c hg ci -Amc hg log cd .. echo % try cloning -r branch hg clone -rbr remote local1 hg -R local1 parents echo % try cloning -rother clone#branch hg clone -r0 remote#br local2 hg -R local2 parents echo % try cloning -r1 clone#branch hg clone -r1 remote#br local3 hg -R local3 parents