[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#358853: marked as done (kompare: cannot parse multi-file unified diffs without "diff ...." line)

Your message dated Tue, 5 Dec 2006 21:24:27 +0100
with message-id <200612052124.27386@nivalis.org>
and subject line kompare: cannot parse multi-file unified diffs without "diff ...." line
has caused the attached Bug report 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 I am
talking about this indicates a serious mail system misconfiguration
somewhere.  Please contact me immediately.)

Debian bug tracking system administrator
(administrator, Debian Bugs database)
--- Begin Message --- 
Package: kompare
Version: 4:3.5.1-1
Severity: normal

Hi,

when reading a unified diff file that comprises diffs to more than one file,
kompare fails to decode it correctly when the leading "diff ...." line is
not given.

Examples:

--- empty1.txt	2006-03-24 20:03:07.000000000 +0100
+++ text1.txt	2006-03-24 20:02:00.000000000 +0100
@@ -0,0 +1 @@
+just a little text
--- empty2.txt	2006-03-24 20:03:07.000000000 +0100
+++ text2.txt	2006-03-24 20:02:22.000000000 +0100
@@ -0,0 +1 @@
+and another text

fails while

diff -ub empty1.txt text1.txt
--- empty1.txt	2006-03-24 20:03:07.000000000 +0100
+++ text1.txt	2006-03-24 20:02:00.000000000 +0100
@@ -0,0 +1 @@
+just a little text
diff -ub empty2.txt text2.txt
--- empty2.txt	2006-03-24 20:03:07.000000000 +0100
+++ text2.txt	2006-03-24 20:02:22.000000000 +0100
@@ -0,0 +1 @@
+and another text

works.

I tested it with kompare from KDE 3.4.3 and 3.5.1: same behaviour.

Peter


-- System Information:
Debian Release: testing/unstable
  APT prefers testing
  APT policy: (990, 'testing'), (500, 'unstable'), (500, 'stable')
Architecture: i386 (i686)
Shell:  /bin/sh linked to /bin/bash
Kernel: Linux 2.6.15-1-k7
Locale: LANG=de_DE.UTF-8, LC_CTYPE=de_DE.UTF-8 (charmap=UTF-8)

Versions of packages kompare depends on:
ii  kdelibs4c2a               4:3.5.1-2      core libraries for all KDE applica
ii  libacl1                   2.2.35-1       Access control list shared library
ii  libart-2.0-2              2.3.17-1       Library of functions for 2D graphi
ii  libattr1                  2.4.31-1       Extended attribute shared library
ii  libaudio2                 1.7-5          The Network Audio System (NAS). (s
ii  libc6                     2.3.6-3        GNU C Library: Shared libraries an
ii  libfam0                   2.7.0-9        Client library to control the FAM 
ii  libfontconfig1            2.3.2-1.1      generic font configuration library
ii  libfreetype6              2.1.10-1       FreeType 2 font engine, shared lib
ii  libgcc1                   1:4.0.3-1      GCC support library
ii  libice6                   6.9.0.dfsg.1-4 Inter-Client Exchange library
ii  libidn11                  0.5.18-2       GNU libidn library, implementation
ii  libjpeg62                 6b-12          The Independent JPEG Group's JPEG 
ii  libpng12-0                1.2.8rel-5     PNG library - runtime
ii  libqt3-mt                 3:3.3.5-4      Qt GUI Library (Threaded runtime v
ii  libsm6                    6.9.0.dfsg.1-4 X Window System Session Management
ii  libstdc++6                4.0.3-1        The GNU Standard C++ Library v3
ii  libx11-6                  6.9.0.dfsg.1-4 X Window System protocol client li
ii  libxcursor1               1.1.3-1        X cursor management library
ii  libxext6                  6.9.0.dfsg.1-4 X Window System miscellaneous exte
ii  libxft2                   2.1.8.2-3      FreeType-based font drawing librar
ii  libxi6                    6.9.0.dfsg.1-4 X Window System Input extension li
ii  libxinerama1              6.9.0.dfsg.1-4 X Window System multi-head display
ii  libxrandr2                6.9.0.dfsg.1-4 X Window System Resize, Rotate and
ii  libxrender1               1:0.9.0.2-1    X Rendering Extension client libra
ii  libxt6                    6.9.0.dfsg.1-4 X Toolkit Intrinsics
ii  zlib1g                    1:1.2.3-9      compression library - runtime

kompare recommends no packages.

-- no debconf information

--- End Message ---
--- Begin Message --- 
Version: 4:3.5.5-3

Le vendredi 24 mars 2006 20:29, Peter Marschall <peter@adpm.de> a écrit :
> Package: kompare
> Version: 4:3.5.1-1
> Severity: normal
>
> Hi,
>
> when reading a unified diff file that comprises diffs to more than one
> file, kompare fails to decode it correctly when the leading "diff ...."
> line is not given.
>
> Examples:
>
> --- empty1.txt	2006-03-24 20:03:07.000000000 +0100
> +++ text1.txt	2006-03-24 20:02:00.000000000 +0100
> @@ -0,0 +1 @@
> +just a little text
> --- empty2.txt	2006-03-24 20:03:07.000000000 +0100
> +++ text2.txt	2006-03-24 20:02:22.000000000 +0100
> @@ -0,0 +1 @@
> +and another text
>
> fails while
>
> diff -ub empty1.txt text1.txt
> --- empty1.txt	2006-03-24 20:03:07.000000000 +0100
> +++ text1.txt	2006-03-24 20:02:00.000000000 +0100
> @@ -0,0 +1 @@
> +just a little text
> diff -ub empty2.txt text2.txt
> --- empty2.txt	2006-03-24 20:03:07.000000000 +0100
> +++ text2.txt	2006-03-24 20:02:22.000000000 +0100
> @@ -0,0 +1 @@
> +and another text
>
> works.
>
> I tested it with kompare from KDE 3.4.3 and 3.5.1: same behaviour.
>

Works with kompare 3.5.5

--- End Message ---
Reply to: