[prev in list] [next in list] [prev in thread] [next in thread] 

List:       subclipse-users
Subject:    Re: [Subclipse-users] Merge comparison doesn't indicate incoming changes when there's a conflict
From:       Mark Phippard <markphip () gmail ! com>
Date:       2013-02-22 17:14:34
Message-ID: CAHFaGCq=7HEodsOqKMVTFE3qfAg1qRvYusJBDGvxN0+om4FXOg () mail ! gmail ! com
[Download RAW message or body]

On Fri, Feb 22, 2013 at 12:12 PM, Jacob Weber <jacob@jacobweber.com> wrote:
> I just did a merge, and resolved a tree conflict. This resulted in a file conflict. \
> On the filesystem, I have these files: 
> file
> file.merge-left.r123076
> file.merge-right.r127491
> file.working
> 
> When I do Team > Edit conflicts on the file, I get the three-way compare editor. On \
> the right, it marks the conflict areas in red, and the areas where my working copy \
> changed in black. 
> So far so good.
> 
> But there are also areas where the incoming file changed, which need to be merged \
> into my working copy. I would expect these to be marked in blue -- that's what \
> happens in CVS merges. Instead, they're also black. 
> As a result, I assume that I don't need to do anything with them, when in fact I \
> need to merge them into my working copy. This is causing me to merge incorrectly. 
> For example, there was some text that got deleted in the incoming file. When I \
> click Show Ancestor Pane, I can see that the ancestor has the text, and so does the \
> "working" file. The incoming "right" file doesn't have it, and the original "left" \
> file does. There are no conflicts near this section of the file. But this change \
> appears in black, not blue. 
> Is this something that's under Subclipse's control?

We control the files that are input to the Eclipse compare editor.  We
do not control the functionality or display of the editor itself.

-- 
Thanks

Mark Phippard
http://markphip.blogspot.com/

------------------------------------------------------
http://subclipse.tigris.org/ds/viewMessage.do?dsForumId=1047&dsMessageId=3049564

To unsubscribe from this discussion, e-mail: \
[users-unsubscribe@subclipse.tigris.org].


[prev in list] [next in list] [prev in thread] [next in thread]