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).
#!/bin/sh
mkdir t
cd t
hg init
echo a > a
hg add a
hg commit -m "test" -d "1000000 0"
hg verify
hg parents
hg status
hg rollback
hg verify
hg parents
hg status
echo % Test issue 902
hg commit -m "test"
hg branch test
hg rollback
hg branch
echo % Test rollback of hg before issue 902 was fixed
hg commit -m "test"
hg branch test
rm .hg/undo.branch
hg rollback
hg branch