Mercurial > hg
view tests/test-bookmarks @ 8810:ac92775b3b80
Add patch.eol to ignore EOLs when patching (issue1019)
The intent is to fix many issues involving patching when win32ext is enabled.
With win32ext, the working directory and repository files EOLs are not the same
which means that patches made on a non-win32ext host do not apply cleanly
because of EOLs discrepancies. A theorically correct approach would be
transform either the patched file or the patch content with the
encoding/decoding filters used by win32ext. This solution is tricky to
implement and invasive, instead we prefer to address the win32ext case, by
offering a way to ignore input EOLs when patching and rewriting them when
saving the patched result.
author | Patrick Mezard <pmezard@gmail.com> |
---|---|
date | Mon, 15 Jun 2009 00:03:26 +0200 |
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