[kompare] [Bug 330401] [PATCH] Badly parsing context diffs

Kevin Kofler kevin.kofler at chello.at
Sun Sep 28 17:11:18 UTC 2014


https://bugs.kde.org/show_bug.cgi?id=330401

Kevin Kofler <kevin.kofler at chello.at> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
         Resolution|---                         |FIXED
             Status|UNCONFIRMED                 |RESOLVED
   Version Fixed In|                            |4.14.2
      Latest Commit|                            |http://commits.kde.org/libk
                   |                            |omparediff2/2e2a56b4069deee
                   |                            |62525cd4fcc207afc58e19089

--- Comment #11 from Kevin Kofler <kevin.kofler at chello.at> ---
Git commit 7705bc06e3baeb869993702872256505b4518b87 by Kevin Kofler, on behalf
of Pavel Raiskup.
Committed on 25/01/2014 at 16:58.
Pushed by kkofler into branch 'KDE/4.14'.

tests: add tests for context diffs

This problem is fixed by the following commit.

M  +92   -0    tests/interactivedifftest.cpp
M  +1    -0    tests/interactivedifftest.h

http://commits.kde.org/libkomparediff2/7705bc06e3baeb869993702872256505b4518b87

--- Comment #12 from Kevin Kofler <kevin.kofler at chello.at> ---
Git commit 2e2a56b4069deee62525cd4fcc207afc58e19089 by Kevin Kofler, on behalf
of Pavel Raiskup.
Committed on 25/01/2014 at 11:10.
Pushed by kkofler into branch 'KDE/4.14'.

contextdiff: parse bigger subset of diffs

E.g. filterdiff tries to put some context info (function name,
namespace) at the line determining changed lines.  Also, it does
not have the ability to use timestamp information, so it
generates diffs without it.
FIXED-IN: 4.14.2

M  +2    -2    diffparser.cpp
M  +5    -5    parserbase.cpp

http://commits.kde.org/libkomparediff2/2e2a56b4069deee62525cd4fcc207afc58e19089

-- 
You are receiving this mail because:
You are the assignee for the bug.


More information about the Kompare-devel mailing list