Mercurial > hg
view tests/test-rebase-issue-noparam-single-rev.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 | 808f03f61ebe |
children | 4bb4895e1693 |
line wrap: on
line source
0 files updated, 0 files merged, 1 files removed, 0 files unresolved created new head @ 4:r2 | o 3:r1 | | o 2:l1 |/ o 1:c2 | o 0:c1 % Rebase with no arguments - single revision in source branch 1 files updated, 0 files merged, 2 files removed, 0 files unresolved saving bundle to adding branch adding changesets adding manifests adding file changes added 3 changesets with 3 changes to 3 files rebase completed @ 4:l1 | o 3:r2 | o 2:r1 | o 1:c2 | o 0:c1 0 files updated, 0 files merged, 2 files removed, 0 files unresolved created new head @ 4:r1 | | o 3:l2 | | | o 2:l1 |/ o 1:c2 | o 0:c1 % Rebase with no arguments - single revision in target branch 2 files updated, 0 files merged, 1 files removed, 0 files unresolved saving bundle to adding branch adding changesets adding manifests adding file changes added 3 changesets with 3 changes to 3 files rebase completed @ 4:l2 | o 3:l1 | o 2:r1 | o 1:c2 | o 0:c1