[Bug 131717] New: kompare won't parse diffs from git
Andy Parkins
andyparkins at gmail.com
Wed Aug 2 12:06:12 CEST 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=131717
Summary: kompare won't parse diffs from git
Product: kompare
Version: unspecified
Platform: Debian testing
OS/Version: Linux
Status: UNCONFIRMED
Severity: normal
Priority: NOR
Component: general
AssignedTo: kompare-devel kde org
ReportedBy: andyparkins gmail com
Version: (using KDE KDE 3.5.3)
Installed from: Debian testing/unstable Packages
Kompare just shows blank for diffs redirected from git.
I've tracked down the cause and it seems to be on the file declaration lines. Here is a sample diff that kompare will not show.
diff --git a/file b/file
index a8b2ec6..a1e65fd 100644
--- a/file
+++ b/file
@ -1,2 +1,3 @
initial contents goes in master branch
additional content added in repo1#master
+blah
As you can see, it's a simple addition of the line "blah". Kompare shows this diff as blank. Now if I modify the file so that the "---" and "+++" lines both have "<tab>(something)" added:
diff --git a/file b/file
index a8b2ec6..a1e65fd 100644
--- a/file (anything can go here)
+++ b/file (anything can go here)
@ -1,2 +1,3 @
initial contents goes in master branch
additional content added in repo1#master
+blah
Kompare will correctly show this diff.
More information about the Kompare-devel
mailing list