Your message dated Wed, 14 Feb 2018 21:13:22 +0000
with message-id <e1em4mk-000cth...@fasolo.debian.org>
and subject line Bug#717782: fixed in patch 2.7.6-1
has caused the Debian Bug report #717782,
regarding Two insertion hunks may be applied in the same place
to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact ow...@bugs.debian.org
immediately.)


-- 
717782: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=717782
Debian Bug Tracking System
Contact ow...@bugs.debian.org with problems
--- Begin Message ---
Package: patch
Version: 2.7.1-3
Severity: important

Starting with 'test' containing:

--- BEGIN ---
1
2
3
4
5
6
--- END ---

and applying the patch:

--- BEGIN ---
--- test~
+++ test
@@ -1,6 +1,7 @@
 1
 2
 3
+a
 4
 5
 6
@@ -7,6 +8,7 @@
 1
 2
 3
+b
 4
 5
 6
--- END ---

the result is:

--- BEGIN ---
1
2
3
a
b
4
5
6
--- END ---

(with no fuzz, only an offset).

This is clearly wrong.  If the insertions were meant to be immediately
adjacent then they would have been a single hunk.  Once one hunk has
been applied, the context is no longer correct for the second hunk.

Ben.

-- System Information:
Debian Release: jessie/sid
  APT prefers unstable
  APT policy: (500, 'unstable'), (500, 'testing'), (1, 'experimental')
Architecture: i386 (x86_64)
Foreign Architectures: amd64

Kernel: Linux 3.10-1-amd64 (SMP w/4 CPU cores)
Locale: LANG=en_GB.utf8, LC_CTYPE=en_GB.utf8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash

Versions of packages patch depends on:
ii  libc6  2.17-7

patch recommends no packages.

Versions of packages patch suggests:
pn  diffutils-doc  <none>
ii  ed             1.9-1

-- no debconf information

--- End Message ---
--- Begin Message ---
Source: patch
Source-Version: 2.7.6-1

We believe that the bug you reported is fixed in the latest version of
patch, which is due to be installed in the Debian FTP archive.

A summary of the changes between this version and the previous one is
attached.

Thank you for reporting the bug, which will now be closed.  If you
have further comments please address them to 717...@bugs.debian.org,
and the maintainer will reopen the bug report if appropriate.

Debian distribution maintenance software
pp.
Laszlo Boszormenyi (GCS) <g...@debian.org> (supplier of updated patch package)

(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing ftpmas...@ftp-master.debian.org)


-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256

Format: 1.8
Date: Wed, 14 Feb 2018 18:14:46 +0000
Source: patch
Binary: patch
Architecture: source amd64
Version: 2.7.6-1
Distribution: unstable
Urgency: medium
Maintainer: Laszlo Boszormenyi (GCS) <g...@debian.org>
Changed-By: Laszlo Boszormenyi (GCS) <g...@debian.org>
Description:
 patch      - Apply a diff file to an original
Closes: 717782
Changes:
 patch (2.7.6-1) unstable; urgency=medium
 .
   * New upstream release:
     - don't allow a hunk to overlap with the previous one (closes: #717782).
   * Mark historical changelog entries as is.
   * Update debhelper level to 11 .
   * Update Standards-Version to 4.1.3 .
Checksums-Sha1:
 60fd7e43a18b303e3810fc11850903cae15a854a 1810 patch_2.7.6-1.dsc
 6f64fa75993bdb285ac4ed6eca6c9212725bff91 783756 patch_2.7.6.orig.tar.xz
 3905c67fe3e006ba46e4e13033573ce4a5876492 7948 patch_2.7.6-1.debian.tar.xz
 8046b4914c28305f6d167d97bfd378bc48e662a2 181524 patch-dbgsym_2.7.6-1_amd64.deb
 fd903ae67350592f19c5c28601e58c25b22dba8d 6524 patch_2.7.6-1_amd64.buildinfo
 dc068a1f206e58986d9072ec52229fdb5a35155a 122640 patch_2.7.6-1_amd64.deb
Checksums-Sha256:
 6927ed1fdd0499d397d0df26575f32eafe7d01a0806dc28dc6a3393c0ad6305f 1810 
patch_2.7.6-1.dsc
 ac610bda97abe0d9f6b7c963255a11dcb196c25e337c61f94e4778d632f1d8fd 783756 
patch_2.7.6.orig.tar.xz
 31499b753c63876b951f7f2b3f1142817233e8e7691704d5907116ad1489cef1 7948 
patch_2.7.6-1.debian.tar.xz
 44353545dd1c29ad284eed72a1211bddc8b5b2d600d331ceedab58bc8fdf5238 181524 
patch-dbgsym_2.7.6-1_amd64.deb
 1b634244c5b4c36e9a8e27be186147a1c2899675bbf50c99fddc3ab7969dc639 6524 
patch_2.7.6-1_amd64.buildinfo
 cc15618899f343fdc12f878a1ddd43479e276a3c369e73e3be571cf70d9ae13c 122640 
patch_2.7.6-1_amd64.deb
Files:
 40897e49d6d477389295cf681ed5741c 1810 vcs standard patch_2.7.6-1.dsc
 78ad9937e4caadcba1526ef1853730d5 783756 vcs standard patch_2.7.6.orig.tar.xz
 4dec2736fa8b806e7248897ba679f383 7948 vcs standard patch_2.7.6-1.debian.tar.xz
 5975bc542cf694a14b319341200aed43 181524 debug optional 
patch-dbgsym_2.7.6-1_amd64.deb
 9d4c391e503751cdb3814cd77a751080 6524 vcs standard 
patch_2.7.6-1_amd64.buildinfo
 93d9e6ffa569fca6291d1808d5784cbb 122640 vcs standard patch_2.7.6-1_amd64.deb

-----BEGIN PGP SIGNATURE-----

iQIzBAEBCAAdFiEEfYh9yLp7u6e4NeO63OMQ54ZMyL8FAlqEkwAACgkQ3OMQ54ZM
yL/Zvw/+L+2LlUsscVPaABsSuteKQii7b4kC5yckZLHS8Mz4A7tRaA/IMv5GXmtr
O0zj+dIz4WEBUkvcmRar7k/bonQnlFzIaFkkMwG2Gvs011CofiMbuVaXQ8gnVxEL
W59V26rHXdiL06VYL7uZrVtDMjqKMLJnMOegLReULP4prrS7MlHYrKxeWCyKmcgM
Nvwk8goQ0dZLZhY9UCQ3V+zOhglGlsNAkdfPtcZ46mD3l5fD5rCKKFG9NZNJfYkk
OnJxu0c/aGXBXz3IHcTmTc7YcWZk/2YjaaokzBN45YotlvVDCtRx9NGzpZ/PheRR
qI0r4DPI+JPzPC5IzFqijJgHDlniBt2eAA50COdTOnG3U7hc5JpFBbXMCoyMxWWv
ya0tmDALi4j/uv0dOcNwIIk+8pUui9SMTaflDcRcFX9AAR5C3s54MYUOdCcaPVtX
leijE6lEpZwrTE0h8I6KzvPSNGhZuiAN2hAlDnMq1FigP3ts+fXbuFa1c9gbZCzO
4BLmN0nruy/HJtmJ5axJHhaa9EO1ovm+wI7J5Ob6qHOOPQmOGm2Zn+hH7h94ryjG
f8QyioFAutiap/Ta7jr8cP6FL1dyyQ1DPleIo4Vhc3Bk40gFAwS889L+Gb1tVSui
fg58xlJpvmNgZujI/GcuAChQ/M3dnvtdrvjugvX+joJuhDXjU8c=
=ysvB
-----END PGP SIGNATURE-----

--- End Message ---

Reply via email to