Problem: SSIA. For examples, please look at the test-case in patch 0001. Fix is in 0002. The tool http://git.postgresql.org/gitweb/?p=postgresql.git;a=blob;f=src/tools/git-external-diff;h=59fa36624c7c produces diffs which are not usable (e.g. by git show --ext-diff). Workaround: `git show --ext-diff | filterdiff --format unified` Reproducible: Always Actual Results: Fails to parse.
Created attachment 84840 [details] Testcase.
Created attachment 84841 [details] Fix.
Created attachment 84842 [details] 0001-Testcase Removed leftovers in testcase.
Ping?
Sorry for the (long) delay. Your patches look right. Do you have KDE git write access? (If yes, you can just push the patches, if not, just tell me and I'll push them.) And as I see your @redhat.com mailing address: I can also add these to Fedora packaging. I don't have any control over RHEL though.
(In reply to Kevin Kofler from comment #5) > Your patches look right. Do you have KDE git write access? (If yes, you can > just push the patches, if not, just tell me and I'll push them.) Yes, please push them. > And as I see your @redhat.com mailing address: I can also add these to > Fedora packaging. I don't have any control over RHEL though. Fedora would be really nice, thanks! Patches will find a way probably to RHEL8 automatically (or possibly, somebody may request them later for RHEL7, not my case ATM).
Unfortunately, we're right in the middle of the KDE Applications 4.14.0 release, so I'll better wait until after the release to push the fixes.
Has this patch been committed yet?
Oops, darn, and now we're in the 4.14.1 tagging freeze. I'll get this in for 4.14.2. Sorry for that. :-(
Now would be the right time to commit for 4.14.2 ;)
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
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
I also merged those 2 commits into master and frameworks. For Fedora, we are currently in the process of getting 4.14.1 into Fedora 20 and 21, we will be importing 4.14.2 as soon as it is released, and so Fedora will get the fix with the 4.14.2 rebase. (I don't think it's worth editing the 4.14.1 update, unless we have other changes to pull in anyway, as that will just slow down the process.) I can backport the fix to Fedora 19 if you think it's worth it.
(In reply to Kevin Kofler from comment #13) > I also merged those 2 commits into master and frameworks. Thanks for merging! > For Fedora, we are currently in the process of getting 4.14.1 into Fedora 20 > and 21, we will be importing 4.14.2 as soon as it is released, and so Fedora > will get the fix with the 4.14.2 rebase. (I don't think it's worth editing > the 4.14.1 update, unless we have other changes to pull in anyway, as that > will just slow down the process.) I can backport the fix to Fedora 19 if you > think it's worth it. I Agree here. Back-porting would be contra-effective, and Fedora 19 is almost EOL.