Mercurial > hg
changeset 5551:dccc127bfc07
Merge with crew-stable
| author | Patrick Mezard <pmezard@gmail.com> |
|---|---|
| date | Sun, 25 Nov 2007 12:42:06 +0100 |
| parents | db6633f11d59 (current diff) 1fb38ef1f113 (diff) |
| children | edfbbb225653 |
| files | tests/test-import |
| diffstat | 3 files changed, 32 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/patch.py Sat Nov 24 20:16:59 2007 +0100 +++ b/mercurial/patch.py Sun Nov 25 12:42:06 2007 +0100 @@ -357,7 +357,7 @@ if len(cand) > 1: # resort our list of potentials forward then back. - cand.sort(cmp=sorter) + cand.sort(sorter) return cand def hashlines(self):
--- a/tests/test-import Sat Nov 24 20:16:59 2007 +0100 +++ b/tests/test-import Sun Nov 25 12:42:06 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 Sat Nov 24 20:16:59 2007 +0100 +++ b/tests/test-import.out Sun Nov 25 12:42:06 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