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).

     1

#!/bin/sh

     2

     3

hg init

     4

touch a

     5

hg add a

     6

hg ci -m "a" -d "1000000 0"

     7

     8

echo 123 > b

     9

hg add b

    10

hg diff --nodates

    11

    12

hg diff --nodates -r tip

    13

    14

echo foo > a

    15

hg diff --nodates

    16

    17

hg diff -r ""

    18

hg diff -r tip -r ""

    19

    20

true