Mercurial > hg
view tests/test-convert-bzr-directories @ 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 | 9e6d6568bf7a |
children |
line wrap: on
line source
#!/bin/sh . "$TESTDIR/bzr-definitions" echo % empty directory mkdir test-empty cd test-empty bzr init -q source cd source echo content > a bzr add -q a bzr commit -q -m 'Initial add' mkdir empty bzr add -q empty bzr commit -q -m 'Empty directory added' echo content > empty/something bzr add -q empty/something bzr commit -q -m 'Added file into directory' cd .. hg convert source source-hg manifest source-hg 1 manifest source-hg tip cd .. echo % directory renames mkdir test-dir-rename cd test-dir-rename bzr init -q source cd source mkdir tpyo echo content > tpyo/something bzr add -q tpyo bzr commit -q -m 'Added directory' bzr mv tpyo typo bzr commit -q -m 'Oops, typo' cd .. hg convert source source-hg manifest source-hg 0 manifest source-hg tip cd .. echo % nested directory renames mkdir test-nested-dir-rename cd test-nested-dir-rename bzr init -q source cd source mkdir -p firstlevel/secondlevel/thirdlevel echo content > firstlevel/secondlevel/file echo this_needs_to_be_there_too > firstlevel/secondlevel/thirdlevel/stuff bzr add -q firstlevel bzr commit -q -m 'Added nested directories' bzr mv firstlevel/secondlevel secondlevel bzr commit -q -m 'Moved secondlevel one level up' cd .. hg convert source source-hg manifest source-hg tip cd .. echo % directory remove mkdir test-dir-remove cd test-dir-remove bzr init -q source cd source mkdir src echo content > src/sourcecode bzr add -q src bzr commit -q -m 'Added directory' bzr rm -q src bzr commit -q -m 'Removed directory' cd .. hg convert source source-hg manifest source-hg 0 manifest source-hg tip cd .. echo % directory replace mkdir test-dir-replace cd test-dir-replace bzr init -q source cd source mkdir first second echo content > first/file echo morecontent > first/dummy echo othercontent > second/something bzr add -q first second bzr commit -q -m 'Initial layout' bzr mv first/file second/file bzr mv first third bzr commit -q -m 'Some conflicting moves' cd .. hg convert source source-hg manifest source-hg tip cd ..