Mercurial > public > mercurial-scm > hg
diff tests/test-import @ 5548:1fb38ef1f113
test-import: test fuzziness, ambiguous patch locations
author | Patrick Mezard <pmezard@gmail.com> |
---|---|
date | Sun, 25 Nov 2007 12:17:30 +0100 |
parents | 9b469bdb1ce1 |
children | dccc127bfc07 03ce5a919ae3 |
line wrap: on
line diff
--- a/tests/test-import Sun Nov 25 11:49:34 2007 +0100 +++ b/tests/test-import Sun Nov 25 12:17:30 2007 +0100 @@ -129,3 +129,27 @@ hg --cwd b tip | grep someoneelse echo "% should be empty" hg --cwd b status + + +# Test fuzziness (ambiguous patch location, fuzz=2) +echo % test fuzziness +hg init fuzzy +cd fuzzy +echo line1 > a +echo line0 >> a +echo line3 >> a +hg ci -Am adda +echo line1 > a +echo line2 >> a +echo line0 >> a +echo line3 >> a +hg ci -m change a +hg export tip > tip.patch +hg up -C 0 +echo line1 > a +echo line0 >> a +echo line1 >> a +echo line0 >> a +hg ci -m brancha +hg import -v tip.patch +cd ..