Mercurial > hg
view tests/test-bookmarks-strip @ 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 | 9737041646bc |
children | 12e5149cafca |
line wrap: on
line source
#!/bin/sh echo "[extensions]" >> $HGRCPATH echo "bookmarks=" >> $HGRCPATH echo "mq=" >> $HGRCPATH hg init echo qqq>qqq.txt echo % add file hg add echo % commit first revision hg ci -m 1 -u user -d "1 0" echo % set bookmark hg book test echo www>>qqq.txt echo % commit second revision hg ci -m 2 -u usr -d "1 0" echo % set bookmark hg book test2 echo % update to -2 hg update -r -2 echo eee>>qqq.txt echo % commit new head hg ci -m 3 -u user -d "1 0" echo % bookmarks updated? hg book echo % strip to revision 1 hg strip 1 2>&1 | sed 's/\(saving bundle to \).*/\1/' echo % list bookmarks hg book