Mercurial > hg
view tests/test-bookmarks @ 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 | 4ba89b6d0e05 |
children | 717c35d55fb3 |
line wrap: on
line source
#!/bin/sh echo "[extensions]" >> $HGRCPATH echo "bookmarks=" >> $HGRCPATH hg init echo % no bookmarks hg bookmarks echo % bookmark rev -1 hg bookmark X echo % list bookmarks hg bookmarks echo a > a hg add a hg commit -m 0 echo % bookmark X moved to rev 0 hg bookmarks echo % look up bookmark hg log -r X echo % second bookmark for rev 0 hg bookmark X2 echo % bookmark rev -1 again hg bookmark -r null Y echo % list bookmarks hg bookmarks echo b > b hg add b hg commit -m 1 echo % bookmarks X and X2 moved to rev 1, Y at rev -1 hg bookmarks echo % bookmark rev 0 again hg bookmark -r 0 Z echo c > c hg add c hg commit -m 2 echo % bookmarks X and X2 moved to rev 2, Y at rev -1, Z at rev 0 hg bookmarks echo % rename nonexistent bookmark hg bookmark -m A B echo % rename to existent bookmark hg bookmark -m X Y echo % force rename to existent bookmark hg bookmark -f -m X Y echo % list bookmarks hg bookmark echo % rename without new name hg bookmark -m Y echo % delete without name hg bookmark -d echo % delete nonexistent bookmark hg bookmark -d A echo % bookmark name with spaces should be stripped hg bookmark ' x y ' echo % list bookmarks hg bookmarks echo % look up stripped bookmark name hg log -r 'x y' echo % reject bookmark name with newline hg bookmark ' ' echo % bookmark with existing name hg bookmark Z echo % force bookmark with existing name hg bookmark -f Z echo % list bookmarks hg bookmark echo % revision but no bookmark name hg bookmark -r . true