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).
% create cvs repository
% Create a new project
N src/a
N src/b
No conflicts created by this import
cvs checkout: Updating src
U src/a
U src/b
% Branch the project
cvs tag: Tagging .
T a
T b
cvs update: Updating .
% Modify file a, then b, then a
cvs commit: Examining .
checking in src/a,v
cvs commit: Examining .
checking in src/b,v
cvs commit: Examining .
checking in src/a,v
% Convert
assuming destination src-hg
initializing destination src-hg repository
using builtin cvsps
collecting CVS rlog
7 log entries
creating changesets
5 changeset entries
connecting to cvsrepo
scanning source...
sorting...
converting...
4 Initial revision
3 init
2 mod a
1 mod b
0 mod a again
updating tags
% Check the result
o 5 () update tags files: .hgtags
|
| o 4 (BRANCH) mod a again files: a
| |
| o 3 (BRANCH) mod b files: b
| |
| o 2 (BRANCH) mod a files: a
| |
| o 1 (v0) init files:
|/
o 0 () Initial revision files: a b