Mercurial > hg
view tests/test-branchmap.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 | b1dad6b4dfae |
children | 7bb004fc14ec |
line wrap: on
line source
marked working directory as branch æ adding foo listening at http://localhost/ (bound to 127.0.0.1) requesting all changes adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files updating to branch æ 1 files updated, 0 files merged, 0 files removed, 0 files unresolved changeset: 0:867c11ce77b8 branch: æ tag: tip user: test date: Thu Jan 01 00:00:00 1970 +0000 summary: foo pushing to http://localhost:PORT searching for changes adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files changeset: 1:58e7c90d67cb branch: æ tag: tip user: test date: Thu Jan 01 00:00:00 1970 +0000 summary: bar changeset: 0:867c11ce77b8 branch: æ user: test date: Thu Jan 01 00:00:00 1970 +0000 summary: foo