Skip to main content

Eclipse Community Forums
Forum Search:

Search      Help    Register    Login    Home
Home » Eclipse Projects » Subversive » Conflict icon always when comparing models
Conflict icon always when comparing models [message #1071088] Fri, 19 July 2013 10:19 Go to next message
Marc-Florian Wendland is currently offline Marc-Florian WendlandFriend
Messages: 81
Registered: January 2013
Hi guys,

I'm not sure whether this is the correct place to ask, but when I
synchronize a resource with the repo, the conflicting mode icon is always
shown on the resource in the Synchronization view.

My background:
I want to versoning and merging Ecore models. I use EMF compare later on to
resolve conflicts. The thing is that even though the EMF compare editor does
not have conflicts (due to semantic instead of textual comparison), the
conflicting icon is shown. If I switch to the textual editor, there is of
course a conflict (due to textual conflicts, which can be resolved by EMF
compare). So, I guess the conflicting icon is based on the textual
comparison for Subversive, even though the resource is a model. Is that

Re: Conflict icon always when comparing models [message #1130991 is a reply to message #1071088] Thu, 10 October 2013 04:49 Go to previous message
Alexander Gurov is currently offline Alexander GurovFriend
Messages: 148
Registered: July 2009
Senior Member

SVN itself does not support models. It works always with just a files content without knowing their semantic.
Previous Topic:Subversive conflict editor ideas
Next Topic:Eclipse detached from svn
Goto Forum:

Current Time: Wed Nov 14 02:39:35 GMT 2018

Powered by FUDForum. Page generated in 0.01876 seconds
.:: Contact :: Home ::.

Powered by: FUDforum 3.0.2.
Copyright ©2001-2010 FUDforum Bulletin Board Software

Back to the top