Mercurial > hg
view tests/test-bundle-vs-outgoing.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 | 7d2e9121ef4f |
children |
line wrap: on
line source
% setup test repo1 adding foo.txt rev 1 rev 2 rev 3 1 files updated, 0 files merged, 0 files removed, 0 files unresolved rev 4 rev 5 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 0 files updated, 1 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) rev 7 1 files updated, 0 files merged, 0 files removed, 0 files unresolved rev 8 % the story so far @ 8 | | o 7 | | | o 6 |/| o | 5 | | o | 4 | | | o 3 | | | o 2 |/ o 1 | o 0 % sanity check of outgoing: expect revs 4 5 6 7 8 requesting all changes adding changesets adding manifests adding file changes added 4 changesets with 4 changes to 1 files updating to branch default 1 files updated, 0 files merged, 0 files removed, 0 files unresolved comparing with ../repo2 searching for changes 4 5 6 7 8 % test bundle (destination repo): expect 5 revisions searching for changes 5 changesets found % test bundle (base revision): expect 5 revisions 5 changesets found