Eclipse Community Forums: EMF » [Compare] Understanding the comparison panes

Help

Home

Home » Modeling » EMF » [Compare] Understanding the comparison panes

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

[Compare] Understanding the comparison panes [message #1638368]

Fri, 27 February 2015 05:01

Eike Stepper

Messages: 6682
Registered: July 2009

Senior Member

<html>
<head>

<meta http-equiv="content-type" content="text/html; charset=utf-8">
</head>
<body bgcolor="#FFFFFF" text="#000000">
Hi, 
 
Please imagine you have two versions of a model tree. Let's call
them "MAIN" and "branch1": 
 
<img src="https://www.eclipse.org/forums/index.php?t=getfile&id=21018" alt=""> 
 
In the MAIN version I've added a single object and now I want to
merge this addition into branch1. I always thought that the target
of a merge is displayed in the (lower) left pane of the Compare
editor and the source in the right pane. But with this configuration
the upper pane displays a "delete" of the object that *will* be
added when the merge result is saved. I was expecting to see that an
"add" will happen when I accept the change. Am I confusing the left
and the right pane or am I misunderstanding the meaning of this
"delete" decoration in the upper pane? 
 
Cheers 
/Eike 
 
---- 
<a class="moz-txt-link-freetext" href="http://www.esc-net.de">http://www.esc-net.de</a> 
<a class="moz-txt-link-freetext" href="http://thegordian.blogspot.com">http://thegordian.blogspot.com</a> 
<a class="moz-txt-link-freetext" href="http://twitter.com/eikestepper">http://twitter.com/eikestepper</a> 
 
 
</body>
</html>

Attachment: fcfejegb.png
(Size: 31.89KB, Downloaded 98 times)

Cheers
/Eike

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

Report message to a moderator

Re: [Compare] Understanding the comparison panes [message #1638551 is a reply to message #1638368]

Fri, 27 February 2015 07:07

Eike Stepper

Messages: 6682
Registered: July 2009

Senior Member

I've played a little bit more and exchanged my left and right panes, i.e., their contents. And now it all seems to make
more sense: accepting a change means to merge it from left to right. I hope that I'm on the "right" track now ;-)

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/Net4j] How to properly authenticate
Next Topic:	MissingResourceException in a unit test with EMF commands

Goto Forum:

-=] Back to Top [=-

[ Syndicate this forum (XML) ] [

]

Current Time: Fri Apr 26 11:05:59 GMT 2024

.:: Contact :: Home ::.

Breadcrumbs

Sign up to our Newsletter