Eclipse Community Forums: EMF » [CDO] EMF Compare with CDOFileResources

Help

Home

Home » Modeling » EMF » [CDO] EMF Compare with CDOFileResources

Show: Today's Messages :: Show Polls :: Message Navigator

[CDO] EMF Compare with CDOFileResources [message #1738396]

Tue, 19 July 2016 12:39

Peter Mising name

Messages: 95
Registered: July 2009

Member

Hello,

I am happy to see that now CDOFileResources are a thing. Really great.
One question though. If e.g. I hava a OfflineCheckout and the
CDOTextResource contents are changed in the OfflineCheckout and in the
remote Repo, than I can't get out of the dirty state when updateing
because EMF Compare don't detects or handles the changed CDOLob.
I took a short look and it seems like the contents attributes are
transient and so are not handled by EMFCompare.
Am I missing something? How can I get out of the dirty state then?

Greetings
Peter

Report message to a moderator

Re: [CDO] EMF Compare with CDOFileResources [message #1738405 is a reply to message #1738396]

Tue, 19 July 2016 13:18

Eike Stepper

Messages: 6682
Registered: July 2009

Senior Member

Hi Peter,

I fear we currently don't support merging text. It would be great to have, though. Would you be interested in
contributing such support?

Cheers
/Eike

----
http://www.esc-net.de
http://thegordian.blogspot.com
http://twitter.com/eikestepper

Am 19.07.2016 um 15:39 schrieb Peter:
> Hello,
>
> I am happy to see that now CDOFileResources are a thing. Really great.
> One question though. If e.g. I hava a OfflineCheckout and the CDOTextResource contents are changed in the
> OfflineCheckout and in the remote Repo, than I can't get out of the dirty state when updateing because EMF Compare
> don't detects or handles the changed CDOLob.
> I took a short look and it seems like the contents attributes are transient and so are not handled by EMFCompare.
> Am I missing something? How can I get out of the dirty state then?
>
> Greetings
> Peter

Cheers
/Eike

----
http://www.esc-net.de
http://thegordian.blogspot.com
http://twitter.com/eikestepper

Report message to a moderator

Re: [CDO] EMF Compare with CDOFileResources [message #1738409 is a reply to message #1738405]

Tue, 19 July 2016 13:36

Peter Mising name

Messages: 95
Registered: July 2009

Member

Hello Eike,
that's what I thought.
Interested yes, but I am not really familar with EMF Compare. I suppose
something like this is needed?
https://wiki.eclipse.org/EMF_Compare/New_and_Noteworthy/3.1.0#Improved_Handling_of_UML_Opaque_Action.2C_Behavior.2C_and_Expression_Body_Changes

If you give me some directions I will try to implement it.

Greetings
Peter

Am 19.07.2016 um 15:18 schrieb Eike Stepper:
> Hi Peter,
>
> I fear we currently don't support merging text. It would be great to
> have, though. Would you be interested in contributing such support?
>
> Cheers
> /Eike
>
> ----
> http://www.esc-net.de
> http://thegordian.blogspot.com
> http://twitter.com/eikestepper
>
>
>
> Am 19.07.2016 um 15:39 schrieb Peter:
>> Hello,
>>
>> I am happy to see that now CDOFileResources are a thing. Really great.
>> One question though. If e.g. I hava a OfflineCheckout and the
>> CDOTextResource contents are changed in the OfflineCheckout and in the
>> remote Repo, than I can't get out of the dirty state when updateing
>> because EMF Compare don't detects or handles the changed CDOLob.
>> I took a short look and it seems like the contents attributes are
>> transient and so are not handled by EMFCompare.
>> Am I missing something? How can I get out of the dirty state then?
>>
>> Greetings
>> Peter
>

Report message to a moderator

Re: [CDO] EMF Compare with CDOFileResources [message #1741986 is a reply to message #1738409]

Fri, 12 August 2016 10:40

Eike Stepper

Messages: 6682
Registered: July 2009

Senior Member

Am 19.07.2016 um 15:36 schrieb Peter:
> Hello Eike,
> that's what I thought.
> Interested yes, but I am not really familar with EMF Compare. I suppose something like this is needed?
> https://wiki.eclipse.org/EMF_Compare/New_and_Noteworthy/3.1.0#Improved_Handling_of_UML_Opaque_Action.2C_Behavior.2C_and_Expression_Body_Changes
>
>
> If you give me some directions I will try to implement it.
Great! Unfortunately I'm not a big EMF Compare expert, but most of our code to integrate it is in
org.eclipse.emf.cdo.compare.CDOCompare. I've cc'ed Cedric in the hope that he can point us to an EMF Compare expert who
can help with those details.

Cheers
/Eike

----
http://www.esc-net.de
http://thegordian.blogspot.com
http://twitter.com/eikestepper

Cheers
/Eike

----
http://www.esc-net.de
http://thegordian.blogspot.com
http://twitter.com/eikestepper

Report message to a moderator

Previous Topic:	[CDO] CDOLock: handling of network outages
Next Topic:	[CDO] Is it possible to store generated EMF model directly to CDO?

Goto Forum:

-=] Back to Top [=-

[ Syndicate this forum (XML) ] [

]

Current Time: Sat Apr 20 13:51:28 GMT 2024

.:: Contact :: Home ::.

Breadcrumbs

Sign up to our Newsletter