Mercurial > hg
view tests/test-bookmarks-current.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 | cb516e788238 |
children | 717c35d55fb3 |
line wrap: on
line source
% no bookmarks no bookmarks set % set bookmark X % list bookmarks * X -1:000000000000 % update to bookmark X 0 files updated, 0 files merged, 0 files removed, 0 files unresolved % list bookmarks * X -1:000000000000 % rename % list bookmarks * Z -1:000000000000 % new bookmark Y % list bookmarks * Y -1:000000000000 Z -1:000000000000 % commit % list bookmarks * Y 0:719295282060 Z -1:000000000000 % delete bookmarks % list bookmarks no bookmarks set % update to tip 0 files updated, 0 files merged, 0 files removed, 0 files unresolved