Mercurial > hg
view tests/test-push-hook-lock @ 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 | 876e4e6ad82b |
children |
line wrap: on
line source
#!/bin/sh hg init 1 echo '[ui]' >> 1/.hg/hgrc echo 'timeout = 10' >> 1/.hg/hgrc echo foo > 1/foo hg --cwd 1 ci -A -m foo hg clone 1 2 hg clone 2 3 echo '[hooks]' >> 2/.hg/hgrc echo 'changegroup.push = hg push -qf ../1' >> 2/.hg/hgrc echo bar >> 3/foo hg --cwd 3 ci -m bar hg --cwd 3 push ../2