Mercurial > hg
view tests/test-rebase-mq-skip.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 | 7b19cda0fa10 |
children | c7dbd6c4877a |
line wrap: on
line source
0 files updated, 0 files merged, 1 files removed, 0 files unresolved % "Mainstream" import p1.patch 1 files updated, 0 files merged, 2 files removed, 0 files unresolved applying p1.patch % Rebase 1 files updated, 0 files merged, 1 files removed, 0 files unresolved saving bundle to adding branch adding changesets adding manifests adding file changes added 2 changesets with 2 changes to 2 files rebase completed @ 3 P0 tags: p0.patch qtip tip qbase | o 2 P1 tags: qparent | o 1 R1 tags: | o 0 C1 tags: