Mercurial > hg
view tests/test-mq-qnew @ 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 | bd6deb7525f4 |
children | f16ec85f125c |
line wrap: on
line source
#!/bin/sh echo "[extensions]" >> $HGRCPATH echo "mq=" >> $HGRCPATH hg init mq cd mq echo a > a hg ci -Ama echo '% qnew should refuse bad patch names' hg qnew series hg qnew status hg qnew guards hg qnew .hgignore hg qinit -c echo '% qnew with uncommitted changes' echo a > somefile hg add somefile hg qnew uncommitted.patch hg st hg qseries hg revert --no-backup somefile rm somefile echo '% qnew implies add' hg qnew test.patch hg -R .hg/patches st echo '% qnew missing' hg qnew missing.patch missing echo '% qnew -m' hg qnew -m 'foo bar' mtest.patch cat .hg/patches/mtest.patch echo '% qnew twice' hg qnew first.patch hg qnew first.patch touch ../first.patch hg qimport ../first.patch echo '% qnew -f from a subdirectory' hg qpop -a mkdir d cd d echo b > b hg ci -Am t echo b >> b hg st hg qnew -g -f p cat ../.hg/patches/p