Mercurial > hg
view tests/test-bookmarks-current @ 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 | cb516e788238 |
children | 717c35d55fb3 |
line wrap: on
line source
#!/bin/sh echo "[extensions]" >> $HGRCPATH echo "bookmarks=" >> $HGRCPATH echo "[bookmarks]" >> $HGRCPATH echo "track.current = True" >> $HGRCPATH hg init echo % no bookmarks hg bookmarks echo % set bookmark X hg bookmark X echo % list bookmarks hg bookmark echo % update to bookmark X hg update X echo % list bookmarks hg bookmarks echo % rename hg bookmark -m X Z echo % list bookmarks hg bookmarks echo % new bookmark Y hg bookmark Y echo % list bookmarks hg bookmark echo % commit echo 'b' > b hg add b hg commit -m'test' echo % list bookmarks hg bookmark echo % delete bookmarks hg bookmark -d Y hg bookmark -d Z echo % list bookmarks hg bookmark echo % update to tip hg update tip