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

Bug#358853: closed by Olivier Trichet <nive@nivalis.org> (reply to nive@nivalis.org) (Re: kompare: cannot parse multi-file unified diffs without "diff ...." line)



Hi,

On Tuesday, 5. December 2006 21:33, Debian Bug Tracking System wrote:
> This is an automatic notification regarding your Bug report
> #358853: kompare: cannot parse multi-file unified diffs without "diff ...."
> line, which was filed against the kompare package.
>
> It has been closed by Olivier Trichet <nive@nivalis.org> (reply to
> nive@nivalis.org).
>
> Their explanation is attached below.  If this explanation is
> unsatisfactory and you have not received a better one in a separate
> message then please contact Olivier Trichet <nive@nivalis.org> (reply to
> nive@nivalis.org) by replying to this email.

Please reopen the bug.
I still can reproduce it with current KDE from testing
with the sample file form the original bug report.
(and with .diff.gz files from packages.qa.debian.org)

Instead of correctly showing diffs for 2 files, kompare shows only the diff
for one file and considers the 2nd diff as part of the first one

So, instead of failing completely it now shows wrong information:

It tells that the diff consists of:

Source Line	Destination Line	Difference
1		1			Inserted 1 line
1		1			Inserted 1 line
1		2			Changed 1 line


and n in the window on the left it shows:

1 -- empty2.txt  2006-03-24 20:03:07.000000000 +0100

while in the window on the right it shows:

1 just a little text
2 ++ text2.txt   2006-03-24 20:02:22.000000000 +0100
1 and another text

This is clearly not what the sample file contains.
Thus I consider the bug not solved.

Regards
Peter

-- 
Peter Marschall
peter@adpm.de



Reply to: