Bug 58858 - Kompare fails on tiny files.And whitespace are not ignored when asked to do so.
Summary: Kompare fails on tiny files.And whitespace are not ignored when asked to do so.
Status: RESOLVED FIXED
Alias: None
Product: kompare
Classification: Applications
Component: general (show other bugs)
Version: unspecified
Platform: RedHat Enterprise Linux Linux
: NOR normal
Target Milestone: ---
Assignee: Otto Bruggeman
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2003-05-23 18:26 UTC by Mark van Rossum
Modified: 2003-11-16 12:45 UTC (History)
0 users

See Also:
Latest Commit:
Version Fixed In:

Attachments
Add an attachment

Note You need to log in before you can comment on or make changes to this bug.
Description Mark van Rossum 2003-05-23 18:26:46 UTC 
Version:            (using KDE KDE 3.1.1a)
Installed from:    RedHat RPMs
Compiler:          RH 9.0 
OS:          Linux

1) I told kompare to ignore whitespaces but it does not seem to do so.
The output is different from:
diff -bB /tmp/xx /tmp/xxx 

2) When I tried kompare on two tiny files (one line, no newline), kompare failed.
Saying it could not parse diff output.
diff -bB /tmp/yy /tmp/yyy
Comment 1 Otto Bruggeman 2003-05-26 01:12:32 UTC 
what are the files you compare ? It seems to work for me with make_it_cool/head (cant 
test 3.1.1a or 3.1.2 since i dont have them currently installed on my system) 
 
The problems with files without newlines should be fixed already.
Comment 2 Kino 2003-09-26 12:23:16 UTC 
I'm using 3.1.4 and "ignore whitespace" don't work
Comment 3 Otto Bruggeman 2003-11-16 12:45:47 UTC 
Subject: kdesdk/kompare/libdiff2

CVS commit by bruggie: 

Instead of using Default diff options use the user specified ones. This fixes the first part of bug 58858. The second part was already fixed.
CCMAIL: 58858-done@bugs.kde.org


  M +2 -2      komparemodellist.cpp   1.42


--- kdesdk/kompare/libdiff2/komparemodellist.cpp  #1.41:1.42
@@ -162,5 +162,5 @@ bool KompareModelList::compareFiles( con
 
         m_fileWatch->startScan();
-        m_diffProcess = new KompareProcess( m_diffSettings, m_viewSettings, Kompare::Default, m_source, m_destination );
+        m_diffProcess = new KompareProcess( m_diffSettings, m_viewSettings, Kompare::Custom, m_source, m_destination );
 
         connect( m_diffProcess, SIGNAL(diffHasFinished( bool )),
@@ -190,5 +190,5 @@ bool KompareModelList::compareDirs( cons
 
         m_dirWatch->startScan();
-        m_diffProcess = new KompareProcess( m_diffSettings, m_viewSettings, Kompare::Default, m_source, m_destination );
+        m_diffProcess = new KompareProcess( m_diffSettings, m_viewSettings, Kompare::Custom, m_source, m_destination );
 
         connect( m_diffProcess, SIGNAL(diffHasFinished( bool )),