Mercurial > hg
view tests/test-convert-clonebranches @ 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 | 1fe6f365df2e |
children | bb5ea66789e3 |
line wrap: on
line source
#!/bin/sh echo "[extensions]" >> $HGRCPATH echo "hgext.convert = " >> $HGRCPATH echo "[convert]" >> $HGRCPATH echo "hg.tagsbranch=0" >> $HGRCPATH hg init source cd source echo a > a hg ci -qAm adda # Add a merge with one parent in the same branch echo a >> a hg ci -qAm changea hg up -qC 0 hg branch branch0 echo b > b hg ci -qAm addb hg up -qC hg merge default hg ci -qm mergeab hg tag -ql mergeab cd .. # Miss perl... sometimes cat > filter.py <<EOF import sys, re r = re.compile(r'^(?:\d+|pulling from)') sys.stdout.writelines([l for l in sys.stdin if r.search(l)]) EOF echo % convert hg convert -v --config convert.hg.clonebranches=1 source dest | python filter.py # Add a merge with both parents and child in different branches cd source hg branch branch1 echo a > file1 hg ci -qAm c1 hg up -qC mergeab hg branch branch2 echo a > file2 hg ci -qAm c2 hg merge branch1 hg branch branch3 hg ci -qAm c3 cd .. echo % incremental conversion hg convert -v --config convert.hg.clonebranches=1 source dest | python filter.py