Mercurial > hg
view tests/test-rebase-rename.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 | b969611064ae |
children | 4bb4895e1693 |
line wrap: on
line source
adding a adding b 0 files updated, 0 files merged, 1 files removed, 0 files unresolved created new head % Rename is tracked 2:rename A diff --git a/a b/a-renamed rename from a rename to a-renamed % Rebase the revision containing the rename saving bundle to % Rename is not lost 2:rename A diff --git a/a b/a-renamed rename from a rename to a-renamed adding a adding b 0 files updated, 0 files merged, 1 files removed, 0 files unresolved created new head % Copy is tracked 2:copy A diff --git a/a b/a-copied copy from a copy to a-copied % Rebase the revision containing the copy saving bundle to % Copy is not lost 2:copy A diff --git a/a b/a-copied copy from a copy to a-copied