bdiff: normalize the diff (
issue1295)
When the common part of a diff can be moved forward, move it forward.
Otherwise we don't get deterministic results (it would depends on the way we
split for the recursion).
That way we get identical hunks when doing the same change, it helps to solve
issue1295 (inconsistent diffs on different side during a merge).
changeset: 0:0acdaf898367
tag: tip
user: test
date: Mon Jan 12 13:46:40 1970 +0000
summary: test
changeset: 1:3ecf002a1c57
tag: tip
user: test
date: Mon Jan 12 13:46:40 1970 +0000
summary: Added tag bleah for changeset 0acdaf898367
changeset: 0:0acdaf898367
tag: bleah
user: test
date: Mon Jan 12 13:46:40 1970 +0000
summary: test
abort: working copy of .hgtags is changed (please commit .hgtags manually)
failed
abort: tag names must be unique
failed
abort: the name 'tip' is reserved
failed
abort: tag 'bleah' already exists (use -f to force)
failed
abort: tag 'bleah' already exists (use -f to force)
failed
abort: tag 'blecch' does not exist
failed
abort: tag 'blecch' does not exist
failed
0acdaf8983679e0aac16e811534eb49d7ee1f2b4 bleah
0acdaf8983679e0aac16e811534eb49d7ee1f2b4 bleah0
868cc8fbb43b754ad09fa109885d243fc49adae7 gack
868cc8fbb43b754ad09fa109885d243fc49adae7 gawk
868cc8fbb43b754ad09fa109885d243fc49adae7 gorp
3807bcf62c5614cb6c16436b514d7764ca5f1631 gack
3807bcf62c5614cb6c16436b514d7764ca5f1631 gack
0000000000000000000000000000000000000000 gack
868cc8fbb43b754ad09fa109885d243fc49adae7 gorp
0000000000000000000000000000000000000000 gorp
3ecf002a1c572a2f3bb4e665417e60fca65bbd42 bleah1
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
0acdaf8983679e0aac16e811534eb49d7ee1f2b4 foobar
3ecf002a1c572a2f3bb4e665417e60fca65bbd42 bleah1
abort: '\n' cannot be used in a tag name
abort: ':' cannot be used in a tag name
% issue 601
3ecf002a1c572a2f3bb4e665417e60fca65bbd42 bleah13ecf002a1c572a2f3bb4e665417e60fca65bbd42 bleah1
f68b039e72eacbb2e68b0543e1f6e50990aa2bb5 localnewline
0acdaf8983679e0aac16e811534eb49d7ee1f2b4 foobar0acdaf8983679e0aac16e811534eb49d7ee1f2b4 foobar
6ae703d793c8b1f097116869275ecd97b2977a2b newline