tests/test-empty-dir
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
Tue, 14 Oct 2008 20:13:53 +0200
changeset 7104 9514cbb6e4f6
parent 3469 33b6c8193652
child 12156 4c94b6d0fb1c
permissions -rwxr-xr-x
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

hg init
echo 123 > a
hg add a
hg commit -m "first" -d "1000000 0" a
mkdir sub
echo 321 > sub/b
hg add sub/b
hg commit -m "second" -d "1000000 0" sub/b
cat sub/b
hg co 0
cat sub/b 2>/dev/null || echo "sub/b not present"
test -d sub || echo "sub not present"

true