Mercurial > hg

comparison tests/test-import.t @ 25631:2748bf78a5bf

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch: add fuzz config flag (issue4697)
author Matt Mackall <mpm@selenic.com>
date Thu, 18 Jun 2015 15:42:40 -0500
parents 0b6dee81ebb7
children 1f14920a892c
comparison
equal deleted inserted replaced
25630:c88082baf693 25631:2748bf78a5bf
490 $ echo line0 >> a 490 $ echo line0 >> a
491 $ echo line1 >> a 491 $ echo line1 >> a
492 $ echo line0 >> a 492 $ echo line0 >> a
493 $ hg ci -m brancha 493 $ hg ci -m brancha
494 created new head 494 created new head
495 $ hg import --config patch.fuzz=0 -v fuzzy-tip.patch
496 applying fuzzy-tip.patch
497 patching file a
498 Hunk #1 FAILED at 0
499 1 out of 1 hunks FAILED -- saving rejects to file a.rej
500 abort: patch failed to apply
501 [255]
495 $ hg import --no-commit -v fuzzy-tip.patch 502 $ hg import --no-commit -v fuzzy-tip.patch
496 applying fuzzy-tip.patch 503 applying fuzzy-tip.patch
497 patching file a 504 patching file a
498 Hunk #1 succeeded at 2 with fuzz 1 (offset 0 lines). 505 Hunk #1 succeeded at 2 with fuzz 1 (offset 0 lines).
499 applied to working directory 506 applied to working directory