Bug 480848 - Pseudo conflicted diffs detected as Real conflicted diffs
Summary: Pseudo conflicted diffs detected as Real conflicted diffs
Status: ASSIGNED
Alias: None
Product: EMFCompare
Classification: Modeling
Component: Core (show other bugs)
Version: 3.1.0   Edit
Hardware: PC All
: P3 normal (vote)
Target Milestone: Mars SR2   Edit
Assignee: Axel RICHARD CLA
QA Contact:
URL:
Whiteboard:
Keywords:
Depends on:
Blocks:
 
Reported: 2015-10-28 05:46 EDT by Axel RICHARD CLA
Modified: 2015-10-30 10:16 EDT (History)
0 users

See Also:

Attachments
TestModels (5.17 KB, application/zip)
2015-10-28 05:46 EDT, Axel RICHARD CLA 		no flags Details
View All 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 Axel RICHARD CLA 2015-10-28 05:46:45 EDT 
Created attachment 257575 [details]
TestModels

With models in attachment, it seems that some pseudo conflicted diffs are detected as real conflicted diffs.

See EString [java.lang.string] [eType unset] under lastName : Estring [eSF delete]
and Item [eSuperTypes delete] under PeriodicalItem -> Item [eClassifiers delete]
Comment 1 Eclipse Genie CLA 2015-10-29 12:54:50 EDT 
New Gerrit change created: https://git.eclipse.org/r/59266