Mercurial > hg
view tests/test-rebase-keep-branch.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 | 609ce91670d0 |
children | 5b48d819d5f9 |
line wrap: on
line source
0 files updated, 0 files merged, 2 files removed, 0 files unresolved marked working directory as branch notdefault created new head @ 4:r1:notdefault | | o 3:l2: | | | o 2:l1: |/ o 1:c2: | o 0:c1: % Rebase a branch while preserving the branch name 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 1 changesets with 1 changes to 1 files rebase completed @ 4:r1:notdefault | o 3:l2: | o 2:l1: | o 1:c2: | o 0:c1: % dirstate branch should be "notdefault" notdefault