Bug 116637

Summary: "Could not parse diff output" when timestamps are missing (timestamps are optional)
Product: [Applications] kompare Reporter: Eyal Lotem <eyal.lotem>
Component: generalAssignee: Kompare developers <kompare-devel>
Status: RESOLVED DUPLICATE    
Severity: normal    
Priority: NOR    
Version: 3.4.1   
Target Milestone: ---   
Platform: unspecified   
OS: Linux   
Latest Commit: Version Fixed In:

Description Eyal Lotem 2005-11-18 18:08:24 UTC 
Version:           3.4.1 (using KDE 3.4.3, Kubuntu Package 4:3.4.3-0ubuntu1 )
Compiler:          Target: i486-linux-gnu
OS:                Linux (i686) release 2.6.12-9-386

In diff outputs, the timestamp does not always appear.

When the --label is used to replace the filename with an arbitrary label, no timestamp is displayed in the diff line.

kompare should probably treat the timestamps as optional, so as to not fail on diff outputs when --label was used.  Example:

$ diff --label a afile --label b bfile -u
--- a
+++ b
@@ -1,30 +1,533 @@
...<more output>...

kompare is unwilling to parse the "---" and "+++" lines when they don't contain timestamps.
Comment 1 Dirk Stoecker 2006-08-30 08:44:42 UTC 

*** This bug has been marked as a duplicate of 131717 ***