Replace difflib with bdiff for annotate -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Replace difflib with bdiff for annotate This is a quick hack to get bdiff working for annotate, can still be optimized quite a bit. manifest hash: 380ae3092c73b7e1946952edec3588248bc13c5e -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCubxGywK+sNU5EO8RAv7RAJ9lTdxRAVqzGs4XnPoZAmx/fbeUZwCfWar2 RqLGipS5JmMOy1pL1ehNxqY= =KLgM -----END PGP SIGNATURE-----

#!/bin/sh +ex

mkdir test1
cd test1

hg init
touch a b
hg add a b
hg ci -t "added a b" -u test -d "0 0"

cd ..
mkdir test2
cd test2

hg init
hg merge ../test1
hg co
chmod +x a
hg ci -t "chmod +x a" -u test -d "0 0"

cd ../test1
echo 123 >>a
hg ci -t "a updated" -u test -d "0 0"

hg merge ../test2
hg heads
hg history

hg -dv co -m

ls -l ../test[12]/a > foo
cut -b 0-10 < foo