[Bug 139209] New: can not parse multi-file unified diffs without "diff ...." lines

Olivier Trichet bugs.kde.org at nivalis.org
Mon Dec 25 16:23:50 CET 2006


------- You are receiving this mail because: -------
You are the assignee for the bug, or are watching the assignee.
         
http://bugs.kde.org/show_bug.cgi?id=139209         
           Summary: can not parse multi-file unified diffs without "diff
                    ...." lines
           Product: kompare
           Version: 3.4
          Platform: unspecified
        OS/Version: Linux
            Status: UNCONFIRMED
          Severity: normal
          Priority: NOR
         Component: parser
        AssignedTo: kompare-devel kde org
        ReportedBy: bugs.kde.org nivalis org


Version:           3.4 (using KDE 3.5.5, Debian Package 4:3.5.5a.dfsg.1-5 (4.0))

Imported bug from http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=358853

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.


More information about the Kompare-devel mailing list