Mercurial > hg
view tests/test-convert-bzr-treeroot @ 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 | 9e6d6568bf7a |
children |
line wrap: on
line source
#!/bin/sh . "$TESTDIR/bzr-definitions" cat > treeset.py <<EOF import sys from bzrlib import workingtree wt = workingtree.WorkingTree.open('.') message, rootid = sys.argv[1:] wt.set_root_id('tree_root-%s' % rootid) wt.commit(message) EOF echo % change the id of the tree root mkdir test-change-treeroot-id cd test-change-treeroot-id bzr init -q source cd source echo content > file bzr add -q file bzr commit -q -m 'Initial add' python ../../treeset.py 'Changed root' new cd .. hg convert source source-hg manifest source-hg tip