Mercurial > hg
diff tests/test-transplant @ 8811:8b35b08724eb
Make mq, record and transplant honor patch.eol
author | Patrick Mezard <pmezard@gmail.com> |
---|---|
date | Mon, 15 Jun 2009 00:03:27 +0200 |
parents | 3f4f14eab085 |
children | eba6c8687fd2 |
line wrap: on
line diff
--- a/tests/test-transplant Mon Jun 15 00:03:26 2009 +0200 +++ b/tests/test-transplant Mon Jun 15 00:03:27 2009 +0200 @@ -134,3 +134,26 @@ hg transplant -s ../t -b tip -a --filter ./test-filter |\ sed 's/filtering.*/filtering/g' hg log --template '{rev} {parents} {desc}\n' +cd .. + +echo '% test with a win32ext like setup (differing EOLs)' +hg init twin1 +cd twin1 +echo a > a +echo b > b +echo b >> b +hg ci -Am t +echo a > b +echo b >> b +hg ci -m changeb +cd .. + +hg init twin2 +cd twin2 +echo '[patch]' >> .hg/hgrc +echo 'eol = crlf' >> .hg/hgrc +python -c "file('b', 'wb').write('b\r\nb\r\n')" +hg ci -m addb +hg transplant -s ../twin1 tip +python -c "print repr(file('b', 'rb').read())" +cd .. \ No newline at end of file