Mercurial > hg
view tests/test-rebase-interruptions.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 | 808f03f61ebe |
children | b345b1cc124f |
line wrap: on
line source
% Changes during an interruption - continue @ 4: E | o 3: D | | o 2: C | | | o 1: B |/ o 0: A % - Rebasing B onto E merging A warning: conflicts during merge. merging A failed! abort: fix unresolved conflicts with hg resolve then run hg rebase --continue % - Force a commit on C during the interruption 1 files updated, 0 files merged, 1 files removed, 0 files unresolved @ 6: Extra | | o 5: B | | | o 4: E | | | o 3: D | | o | 2: C | | o | 1: B |/ o 0: A % - Resume the rebasing merging A warning: conflicts during merge. merging A failed! abort: fix unresolved conflicts with hg resolve then run hg rebase --continue % - Solve the conflict and go on warning: new changesets detected on source branch, not stripping rebase completed @ 7: C | | o 6: Extra | | o | 5: B | | o | 4: E | | o | 3: D | | | o 2: C | | | o 1: B |/ o 0: A % Changes during an interruption - abort @ 4: E | o 3: D | | o 2: C | | | o 1: B |/ o 0: A % Rebasing B onto E merging A warning: conflicts during merge. merging A failed! abort: fix unresolved conflicts with hg resolve then run hg rebase --continue % Force a commit on B' during the interruption 1 files updated, 0 files merged, 0 files removed, 0 files unresolved @ 6: Extra | o 5: B | o 4: E | o 3: D | | o 2: C | | | o 1: B |/ o 0: A % Abort the rebasing warning: new changesets detected on target branch, not stripping @ 6: Extra | o 5: B | o 4: E | o 3: D | | o 2: C | | | o 1: B |/ o 0: A