Bug 574018 - Merge Tool label wrong in TextMergeViewer with saved changes and input "Last HEAD (unmerged)"
Summary: Merge Tool label wrong in TextMergeViewer with saved changes and input "Last ...
Status: RESOLVED FIXED
Alias: None
Product: EGit
Classification: Technology
Component: UI (show other bugs)
Version: 5.12   Edit
Hardware: All All
: P3 minor (vote)
Target Milestone: 5.13   Edit
Assignee: Project Inbox CLA
QA Contact:
URL:
Whiteboard:
Keywords:
Depends on:
Blocks:
 
Reported: 2021-06-04 07:21 EDT by Thomas Wolf CLA
Modified: 2021-08-28 06:36 EDT (History)
0 users

See Also:


Attachments

Note You need to log in before you can comment on or make changes to this bug.
Description Thomas Wolf CLA 2021-06-04 07:21:55 EDT
Follow-up on bug 548813:

Open a conflict in the merge tool with "Last HEAD (unmerged)" as input. Make an edit and save, close the merge tool. Re-open the merge tool on that file.

Actual:

The label on the left (current) version states the item was from the 'ours' commit, but the text shown is from the working tree file.

Expected:

The label on that stage 2 version in the TextMergeViewer should not be the 'ours' commit but indicate that it's the working tree version.


The labels cannot be assigned statically up front; they depend on the actual ITypeElements chosen by the tree walk.
Comment 1 Eclipse Genie CLA 2021-06-15 13:47:46 EDT
New Gerrit change created: https://git.eclipse.org/r/c/egit/egit/+/182006