view tests/test-debugindexdot @ 9827:4fe9ca519637

mdiff: fix diff -b/B/w on mixed whitespace hunks (issue127) Previous code was computing hunks then checking if these hunks could be ignored when taking whitespace/blank-lines options in accounts. This approach is simple but fails with hunks containing both whitespace and non-whitespace changes, the whole hunk is emitted while it can be mostly made of whitespace. The new version normalize the whitespaces before hunk generation, and test for blank-lines afterwards.
author Patrick Mezard <pmezard@gmail.com>
date Wed, 11 Nov 2009 18:31:42 +0100
parents 8838fe5a236f
children
line wrap: on
line source

#!/bin/sh

# Just exercize debugindexdot
# Create a short file history including a merge.
hg init t
cd t
echo a > a
hg ci -qAm t1 -d '0 0'
echo a >> a
hg ci -m t2 -d '1 0'
hg up -qC 0
echo b >> a
hg ci -m t3 -d '2 0'
HGMERGE=true hg merge -q
hg ci -m merge -d '3 0'

hg debugindexdot .hg/store/data/a.i