Skip to main content


Eclipse Community Forums
Forum Search:

Search      Help    Register    Login    Home
Home » Modeling » EMF » [Compare] Understanding the comparison panes
[Compare] Understanding the comparison panes [message #1638368] Fri, 27 February 2015 05:01 Go to next message
Eike Stepper is currently offline Eike StepperFriend
Messages: 6444
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,<br>
<br>
Please imagine you have two versions of a model tree. Let's call
them "MAIN" and "branch1":<br>
<br>
<img src="https://www.eclipse.org/forums/index.php?t=getfile&amp;id=21018" alt=""><br>
<br>
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?<br>
<br>
Cheers<br>
/Eike<br>
<br>
----<br>
<a class="moz-txt-link-freetext" href="http://www.esc-net.de">http://www.esc-net.de</a><br>
<a class="moz-txt-link-freetext" href="http://thegordian.blogspot.com">http://thegordian.blogspot.com</a><br>
<a class="moz-txt-link-freetext" href="http://twitter.com/eikestepper">http://twitter.com/eikestepper</a><br>
<br>
<br>
</body>
</html>
  • Attachment: fcfejegb.png
    (Size: 31.89KB, Downloaded 63 times)


Re: [Compare] Understanding the comparison panes [message #1638551 is a reply to message #1638368] Fri, 27 February 2015 07:07 Go to previous message
Eike Stepper is currently offline Eike StepperFriend
Messages: 6444
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


Previous Topic:[CDO/Net4j] How to properly authenticate
Next Topic:MissingResourceException in a unit test with EMF commands
Goto Forum:
  


Current Time: Thu Sep 19 00:10:33 GMT 2019

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

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

Back to the top