Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.
Bug 362698 - [gmf comparison] Cannot merge
Summary: [gmf comparison] Cannot merge
Status: CLOSED WORKSFORME
Alias: None
Product: EMFCompare
Classification: Modeling
Component: Diagram (show other bugs)
Version: 1.3   Edit
Hardware: All All
: P3 critical (vote)
Target Milestone: ---   Edit
Assignee: EMF Compare CLA
QA Contact:
URL:
Whiteboard:
Keywords:
Depends on:
Blocks: 365285
  Show dependency tree
 
Reported: 2011-11-02 12:31 EDT by Bouchet Stéphane CLA
Modified: 2013-02-06 05:39 EST (History)
1 user (show)

See Also:

Attachments
patch to fix transaction error on merge (3.25 KB, patch)
2011-11-02 12:37 EDT, Bouchet Stéphane CLA 		laurent.goubet: iplog+
Details | Diff
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 Bouchet Stéphane CLA 2011-11-02 12:31:33 EDT 
Hi,

I cannot merga nay of the diff using the gmf compare editor. 
I always get a "cannot write without transaction" error.
atttached is the patch correcting this.
Comment 1 Bouchet Stéphane CLA 2011-11-02 12:37:44 EDT 
Created attachment 206350 [details]
patch to fix transaction error on merge
Comment 2 Laurent Goubet CLA 2011-11-03 04:30:51 EDT 
Thanks Stéphane, patch applied on master.
Comment 3 Laurent Goubet CLA 2011-11-03 05:02:47 EDT 
Stéphane, the last build from http://download.eclipse.org/modeling/emf/compare/updates/nightly/1.3 (build ID : N201111030432) should contain the fix for this. Could you verify that this fixes the issue on your side?
Comment 4 Bouchet Stéphane CLA 2011-11-03 06:14:33 EDT 
tested the nightly, and the merge all from right or left is working. 

but there is still transaction errors for the selected diff merge only. 

I suspect the annotation will try to run a recording command inside a recording command ( the copy will fire up an update )
Comment 5 Laurent Goubet CLA 2013-01-23 06:09:37 EST 
Take a look at this for Juno SR2 (1.3.3) in case a quick fix can be found.

This bug has not been observed with version 2.1 though.
Comment 6 Laurent Goubet CLA 2013-02-06 05:39:10 EST 
Could not be reproduced with either 1.3 or 2.1, closing.