Bug 464160 - Incorrect differences reported when git repo is in merging state with conflicts
Summary: Incorrect differences reported when git repo is in merging state with conflicts
Status: ASSIGNED
Alias: None
Product: EMFCompare
Classification: Modeling
Component: Team (show other bugs)
Version: unspecified   Edit
Hardware: PC Windows NT
: P3 normal (vote)
Target Milestone: ---   Edit
Assignee: Alexandra Buzila CLA
QA Contact:
URL:
Whiteboard:
Keywords:
Depends on:
Blocks:
 
Reported: 2015-04-08 09:44 EDT by Alexandra Buzila CLA
Modified: 2015-04-15 05:38 EDT (History)
2 users (show)

See Also:

Attachments
Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.
Description Alexandra Buzila CLA 2015-04-08 09:44:43 EDT 
If the git repository in a merging state with conflicts, the differences reported by the merge viewer are incorrect.

The repository from this attachement can be used to reproduce the issue: https://bugs.eclipse.org/bugs/attachment.cgi?id=245474

Steps:
- import repository and the project in the workspace
- select the model.uml and "Compare with > Branch..", then choose the branch "conflicting-change"
- open the comparison from the "Team Synchronizing" perspective

On each of the two branches(master and conflicting-change), the same element(a UML Class) has been renamed. However, the reported differences look as if the contents of the renamed element have just been added to the model.

If the repository is reset (such that the state of the repo is no longer "merging with conflicts"), the differences are reported correctly: a rename on each branch.
Comment 1 Alexandra Buzila CLA 2015-04-15 05:38:35 EDT 
The problems seems to come from Egit. I opened Bug 464667 and will continue to investigate.