Mercurial > hg
view tests/test-convert-hg-svn.out @ 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 | ea26ac58bbe3 |
children | a02d43acbc04 |
line wrap: on
line source
Checked out revision 0. A a Adding a Transmitting file data . Committed revision 1. % initial roundtrip scanning source... sorting... converting... 0 added a scanning source... sorting... converting... % second roundtrip should do nothing scanning source... sorting... converting... scanning source... sorting... converting... % new hg rev updating to branch default 1 files updated, 0 files merged, 0 files removed, 0 files unresolved % echo hg to svn scanning source... sorting... converting... 0 b % svn back to hg should do nothing scanning source... sorting... converting... % hg back to svn should do nothing scanning source... sorting... converting...