Mercurial > hg
view tests/test-branchmap @ 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 | 79e749b26b2b |
children | 7bb004fc14ec |
line wrap: on
line source
#!/bin/sh hgserve() { hg serve -a localhost -p $HGPORT1 -d --pid-file=hg.pid -E errors.log -v $@ \ | sed -e 's/:[0-9][0-9]*//g' -e 's/http:\/\/[^/]*\//http:\/\/localhost\//' cat hg.pid >> "$DAEMON_PIDS" } hg init a hg --encoding utf-8 -R a branch æ echo foo > a/foo hg -R a ci -Am foo hgserve -R a --config web.push_ssl=False --config web.allow_push=* --encoding latin1 hg --encoding utf-8 clone http://localhost:$HGPORT1 b hg --encoding utf-8 -R b log echo bar >> b/foo hg -R b ci -m bar hg --encoding utf-8 -R b push | sed "s/$HGPORT1/PORT/" hg -R a --encoding utf-8 log kill `cat hg.pid`