Mercurial > hg
view tests/test-convert-tla @ 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 | 5b7da468531b |
children | bb5ea66789e3 |
line wrap: on
line source
#!/bin/sh "$TESTDIR/hghave" tla || exit 80 mkdir do_not_use_HOME_tla cd do_not_use_HOME_tla HOME=`pwd`; export HOME cd .. tla my-id "mercurial <mercurial@selenic.com>" echo "[extensions]" >> $HGRCPATH echo "convert=" >> $HGRCPATH echo 'hgext.graphlog =' >> $HGRCPATH echo % create tla archive tla make-archive tla@mercurial--convert `pwd`/hg-test-convert-tla echo % initialize tla repo mkdir tla-repo cd tla-repo/ tla init-tree tla@mercurial--convert/tla--test--0 tla import echo % create initial files echo 'this is a file' > a tla add a mkdir src tla add src cd src dd count=1 if=/dev/zero of=b > /dev/null 2> /dev/null tla add b tla commit -s "added a file, src and src/b (binary)" echo % create link file and modify a ln -s ../a a-link tla add a-link echo 'this a modification to a' >> ../a tla commit -s "added link to a and modify a" echo % create second link and modify b ln -s ../a a-link-2 tla add a-link-2 dd count=1 seek=1 if=/dev/zero of=b > /dev/null 2> /dev/null tla commit -s "added second link and modify b" echo % b file to link and a-link-2 to regular file rm -f a-link-2 echo 'this is now a regular file' > a-link-2 ln -sf ../a b tla commit -s "file to link and link to file test" echo % move a-link-2 file and src directory cd .. tla mv src/a-link-2 c tla mv src test tla commit -s "move and rename a-link-2 file and src directory" cd .. echo % converting tla repo to Mercurial hg convert tla-repo tla-repo-hg tla register-archive -d tla@mercurial--convert glog() { hg glog --template '{rev} "{desc|firstline}" files: {files}\n' "$@" } echo % show graph log glog -R tla-repo-hg hg up -q -R tla-repo-hg hg -R tla-repo-hg manifest --debug