Mercurial > hg
view tests/test-double-merge.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 | d8143769e1d4 |
children | ba5e508b5e92 |
line wrap: on
line source
created new head changeset: 1:7731dad1c2b9 user: test date: Mon Jan 12 13:46:40 1970 +0000 summary: cp foo bar; change both searching for copies back to rev 1 unmatched files in other: bar all copies found (* = to merge, ! = divergent): bar -> foo * checking for directory renames resolving manifests overwrite None partial False ancestor 310fd17130da local 2092631ce82b+ remote 7731dad1c2b9 foo: versions differ -> m foo: remote copied to bar -> m preserving foo for resolve of bar preserving foo for resolve of foo picked tool 'internal:merge' for bar (binary False symlink False) merging foo and bar to bar my bar@2092631ce82b+ other bar@7731dad1c2b9 ancestor foo@310fd17130da premerge successful picked tool 'internal:merge' for foo (binary False symlink False) merging foo my foo@2092631ce82b+ other foo@7731dad1c2b9 ancestor foo@310fd17130da premerge successful 0 files updated, 2 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) -- foo -- line 0 line 1 line 2-1 -- bar -- line 0 line 1 line 2-2