Summary: | Kompare fails on tiny files.And whitespace are not ignored when asked to do so. | ||
---|---|---|---|
Product: | [Applications] kompare | Reporter: | Mark van Rossum <mark.vanrossum> |
Component: | general | Assignee: | Otto Bruggeman <bruggie> |
Status: | RESOLVED FIXED | ||
Severity: | normal | ||
Priority: | NOR | ||
Version: | unspecified | ||
Target Milestone: | --- | ||
Platform: | RedHat Enterprise Linux | ||
OS: | Linux | ||
Latest Commit: | Version Fixed In: |
Description
Mark van Rossum
2003-05-23 18:26:46 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. I'm using 3.1.4 and "ignore whitespace" don't work 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 )), |