Bug 517438 - When the Conflict group is fold up, the editor can loose tracks of user changes
Summary: When the Conflict group is fold up, the editor can loose tracks of user changes
Status: NEW
Alias: None
Product: EMFCompare
Classification: Modeling
Component: UI (show other bugs)
Version: unspecified   Edit
Hardware: PC Mac OS X
: P3 normal (vote)
Target Milestone: ---   Edit
Assignee: EMF Compare CLA
QA Contact:
URL:
Whiteboard:
Keywords:
Depends on:
Blocks:
 
Reported: 2017-05-30 10:01 EDT by Mathieu Cartaud CLA
Modified: 2017-09-07 10:25 EDT (History)
1 user (show)

See Also:

Attachments
test repository (2.54 KB, application/zip)
2017-05-30 10:01 EDT, Mathieu Cartaud 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 Mathieu Cartaud CLA 2017-05-30 10:01:31 EDT 
Created attachment 268638 [details]
test repository

The comparison editor can loose tracks of the changes in the editor. In this case, the editor doesn't become dirty when diffs are accepted or rejected and it is not possible to save the changes. It happens when the conflict group is fold up.

To reproduce, import the given repository, checkout branch master and compare extlibrary.ecore with branch right.
In the comparison editor, fold up the "Conflicts" tree, then unfold one of the other trees and accept or reject a diff.
Comment 1 Mathieu Cartaud CLA 2017-06-01 04:12:11 EDT 
After further investigations, the issue comes when you try to accept or reject a diff while there is nothing displayed in the ContentMergeViewer.

When a diff is selected and you fold the group containing this diff, the CMV is emptied. After this you can select any other diff in the StructureMergeViewer (by single clicking), the CMV remain empty. If you click on accept or reject, you will ran into the bug.

If on the other hand you double click on a diff in the SMV, the CMV is filled and you can accept or reject the diff without bugs.
Comment 2 Laurent Goubet CLA 2017-09-07 10:25:09 EDT 
This is still happening in the latest versions