[bug-patch] [PATCH 0/3] Asymmetric hunks fix

[Steven Drake]

GNU patches inability to handle asymmetric hunks as noted in
"bug #25833: Patch fails to correctly apply hunks with asymmetric context"
has become a major problem for pkgsrc users and it has been decided be
some developers that using gnu patch "is just not worth the trouble"
and that an alternative patch should be used.

So I've been working on the problem and have come up with the following
patches to hopefully fix the problem.

References:
http://mail-index.netbsd.org/tech-pkg/2011/12/09/msg008128.html
http://gnats.netbsd.org/44713
http://gnats.netbsd.org/33783
http://mail-index.netbsd.org/pkgsrc-changes/2011/12/14/msg064714.html

Steven Drake (3):
  test/asymmetric-hunks: perform tests with fuzzy=0.
  Allow asymmetric hunks to apply with a fuzzy factor of 0.
  Fix the merge functionality.

 src/merge.c            |    6 ++++--
 src/patch.c            |   43 ++++++-------------------------------------
 tests/asymmetric-hunks |   11 +++++------
 3 files changed, 15 insertions(+), 45 deletions(-)

-- 
steven