Mercurial > hg
view tests/test-merge-closedheads @ 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 | ca8d05e1f1d1 |
children | ee876e42dd74 |
line wrap: on
line source
#!/bin/sh hgcommit() { hg commit -u user -d '0 0' "$@" } hg init clhead cd clhead touch foo && hg add && hgcommit -m 'foo' touch bar && hg add && hgcommit -m 'bar' touch baz && hg add && hgcommit -m 'baz' echo "flub" > foo hgcommit -m "flub" echo "nub" > foo hgcommit -m "nub" hg up -C 2 echo "c1" > c1 hg add c1 hgcommit -m "c1" echo "c2" > c1 hgcommit -m "c2" hg up -C 2 echo "d1" > d1 hg add d1 hgcommit -m "d1" echo "d2" > d1 hgcommit -m "d2" hg tag -l good echo '% fail with three heads' hg up -C good hg merge echo '% close one of the heads' hg up -C 6 hgcommit -m 'close this head' --close-branch echo '% succeed with two open heads' hg up -C good hg up -C good hg merge hgcommit -m 'merged heads'