Mercurial > hg
view tests/test-inotify @ 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 | a87bc6e2a907 |
children | 95e1867f765b |
line wrap: on
line source
#!/bin/sh "$TESTDIR/hghave" inotify || exit 80 hg init touch a b c d e mkdir dir mkdir dir/bar touch dir/x dir/y dir/bar/foo hg ci -Am m echo "[extensions]" >> $HGRCPATH echo "inotify=" >> $HGRCPATH echo % inserve hg inserve -d --pid-file=hg.pid cat hg.pid >> "$DAEMON_PIDS" # let the daemon finish its stuff sleep 1 # issue907 hg status echo % clean hg status -c echo % all hg status -A echo '% path patterns' echo x > dir/x hg status . hg status dir cd dir hg status . cd .. #issue 1375 #Testing that we can remove a folder and then add a file with the same name echo % issue 1375 mkdir h echo h > h/h hg ci -Am t hg rm h echo h >h hg add h hg status hg ci -m0 # Test for issue1735: inotify watches files in .hg/merge hg st echo a > a hg ci -Am a hg st echo b >> a hg ci -m ab hg st echo c >> a hg st hg up 0 hg st HGMERGE=internal:local hg up hg st kill `cat hg.pid`