Mercurial > hg
annotate tests/test-convert-bzr-merges.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 | 209ef5f3534c |
children |
rev | line source |
---|---|
7053 | 1 % test multiple merges at once |
2 initializing destination source-hg repository | |
3 scanning source... | |
4 sorting... | |
5 converting... | |
6 4 Initial add | |
7 3 Added branch1 file | |
8 2 Added parent file | |
9 1 Added brach2 file | |
10 0 Merged branches | |
11 o 5 "(octopus merge fixup)" files: | |
12 |\ | |
13 | o 4 "Merged branches" files: file-branch2 | |
14 | |\ | |
15 o---+ 3 "Added brach2 file" files: file-branch2 | |
16 / / | |
17 | o 2 "Added parent file" files: file-parent | |
18 | | | |
19 o | 1 "Added branch1 file" files: file file-branch1 | |
20 |/ | |
21 o 0 "Initial add" files: file | |
22 | |
23 % manifest of tip | |
24 644 file | |
25 644 file-branch1 | |
26 644 file-branch2 | |
27 644 file-parent |