https://bugs.kde.org/show_bug.cgi?id=369346
Bug ID: 369346
Summary: Annotation Show Diff... shows incorrect in-line diff
for old commits
Product: kdevplatform
Version: git master
Platform: Compiled Sources
OS: Linux
Status: UNCONFIRMED
Severity: normal
Priority: NOR
Component: patchreview
Assignee: kdevelop-bugs-n...@kde.org
Reporter: igor...@meta.ua
CC: david.nolden....@art-master.de
There are Show Diff... and Show Diff (all files)... actions in the KDevelop's
Annotation Bar context menu.
In case when a file was modified after the interesting commit, the line numbers
in the current version of the file are different.
After clicking Show Diff... KDevelop loads the current version of the file
alongside the (correct) Overview tab and tries to show an old diff in this
file.
The diff is usually incorrect since the patch no longer applies to the new
version of the file.
I can think of two ways to deal with this issue:
1. Display the older version of the file in Patch Review mode - from the
interesting commit.
2. Show only one tab - Overview - in this case.
Reproducible: Always
Steps to Reproduce:
1. Load a project with git VCS into KDevelop.
2. Open a file that has been changed several times.
3. Right click in the document area -> Git -> Annotation...
4. Pick an older commit in the middle of the document, right click on it in the
Annotation Bar -> Show Diff...
Actual Results:
The (correct) diff in the Overview tab differs from the diff displayed in the
next (file) tab.
Expected Results:
Diff is correct in all tabs.
--
You are receiving this mail because:
You are watching all bug changes.
