Mercurial > hg-stable
changeset 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 | 777996744942 |
| children | f2f42262adbd dccc127bfc07 |
| files | tests/test-import tests/test-import.out |
| diffstat | 2 files changed, 31 insertions(+), 0 deletions(-) [+] |
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 ..
--- a/tests/test-import.out Sun Nov 25 11:49:34 2007 +0100 +++ b/tests/test-import.out Sun Nov 25 12:17:30 2007 +0100 @@ -125,3 +125,10 @@ % committer should be 'someoneelse' user: someoneelse % should be empty +% test fuzziness +adding a +1 files updated, 0 files merged, 0 files removed, 0 files unresolved +applying tip.patch +patching file a +Hunk #1 succeeded at 1 with fuzz 2 (offset -2 lines). +a