Package: diffutils
Version: 1:2.9-2
Severity: important

Steps to reproduce:
1) echo -en '\nline1\nline2\nline3' > a
2) echo -en '\nnew line\n\nline1\nline2\nline3' > b
3) diff -u a b > c
4) patch -p0 -F0 < c

Expected results:
3) c contains

--- a   2010-04-15 02:30:51.000000000 +0300
+++ b   2010-04-15 02:30:51.000000000 +0300
@@ -1,4 +1,6 @@

+new line
+
 line1
 line2
 line3
\ No newline at end of file

4) patch prints

patching file a

Actual results:
3) c contains

--- a   2010-04-14 23:31:49.000000000 +0000
+++ b   2010-04-14 23:31:49.000000000 +0000
@@ -1,4 +1,6 @@

+new line
+
 line1
 line2
 line3

4) patch prints

patching file a
Hunk #1 FAILED at 1.
1 out of 1 hunk FAILED -- saving rejects to file a.rej


More info:
1) diff 2.8.1-12 in lenny works.

2) Severity is set to important since this causes problems with the
new source format (quilt). If upstream ships a file that does not end
with a newline it is not possible to modify it since the generated
debian/patches/debian-changes-0.01-1 can not be applied...


-- System Information:
Debian Release: squeeze/sid
  APT prefers unstable
  APT policy: (500, 'unstable')
Architecture: amd64 (x86_64)

Kernel: Linux 2.6.32-amd64-lindi2 (SMP w/4 CPU cores)
Locale: LANG=C, LC_CTYPE=fi_FI (charmap=ISO-8859-1)
Shell: /bin/sh linked to /bin/dash

Versions of packages diffutils depends on:
ii  libc6                         2.10.2-6   Embedded GNU C Library: Shared lib

diffutils recommends no packages.

Versions of packages diffutils suggests:
pn  diffutils-doc                 <none>     (no description available)
pn  wdiff                         <none>     (no description available)

-- no debconf information



-- 
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org

Reply via email to