Mercurial > hg
view tests/test-update-reverse.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 | af5f099d932b |
children | ba5e508b5e92 |
line wrap: on
line source
0 files updated, 0 files merged, 1 files removed, 0 files unresolved Main should be gone a created new head changeset: 3:ded32b0db104 tag: tip user: test date: Mon Jan 12 13:46:40 1970 +0000 summary: Added side2 changeset: 2:92a816cea698 parent: 0:537353581d3d user: test date: Mon Jan 12 13:46:40 1970 +0000 summary: Added side1 changeset: 1:221226fb2bd8 user: test date: Mon Jan 12 13:46:40 1970 +0000 summary: Added main changeset: 0:537353581d3d user: test date: Mon Jan 12 13:46:40 1970 +0000 summary: Added a Should have two heads, side2 and main changeset: 3:ded32b0db104 tag: tip user: test date: Mon Jan 12 13:46:40 1970 +0000 summary: Added side2 changeset: 1:221226fb2bd8 user: test date: Mon Jan 12 13:46:40 1970 +0000 summary: Added main Should show a side1 side2 a side1 side2 resolving manifests overwrite True partial False ancestor ded32b0db104+ local ded32b0db104+ remote 221226fb2bd8 side2: other deleted -> r side1: other deleted -> r main: remote created -> g removing side1 removing side2 getting main 1 files updated, 0 files merged, 2 files removed, 0 files unresolved Should only show a main a main