Bug 45041 - Merging results in strange behavior
Summary: Merging results in strange behavior
Status: RESOLVED INVALID
Alias: None
Product: Platform
Classification: Eclipse Project
Component: Team (show other bugs)
Version: 3.0   Edit
Hardware: PC Windows 2000
: P3 normal (vote)
Target Milestone: ---   Edit
Assignee: Platform-VCM-Inbox CLA
QA Contact:
URL:
Whiteboard:
Keywords:
Depends on:
Blocks:
 
Reported: 2003-10-16 15:05 EDT by Nick Edgar CLA
Modified: 2006-06-15 12:20 EDT (History)
0 users

See Also:

Attachments
Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.
Description Nick Edgar CLA 2003-10-16 15:05:44 EDT 
When performing a merge from the latest in HEAD to the RCP branch, some strange 
behavior was witnessed. Here are the details for reproduction:

project: org.eclipse.ui.workbench
loaded: RCP_WORK_1 (tagged as PRE_RCP_MERGE_2003_10_16)
start tag: RCP_MERGED_2003_0918
end_tag: v20031015

Performing an update resulted in some changes being loaded and some not due to 
conflicts. However, some of the remaining changes showed up as incoming changes 
(e.g. org.eclipse.ui.actions.PerspectiveMenu). The ancestor could not be 
displayed in the compare editor either.
Comment 1 Michael Valenta CLA 2003-10-20 15:18:00 EDT 
The ancestor was not displayable because it's contents were equal to those on 
the branch. The problem was that, although the Eclipse compare properly showed 
the incoming changes, CVS didn't seem to handle it. I'm leaving this bug open 
as a good test case for improving merge support.
Comment 2 Nick Edgar CLA 2003-10-20 15:43:06 EDT 
To belabour the obvious, even though the contents may be equal, attempting to 
show the ancestor pane should give some feedback.  Either just show the equal 
contents, or give a warning.
Comment 3 Michael Valenta CLA 2003-10-20 16:16:27 EDT 
I have logged bug 45239 against Platform Compare for the above mentioned point.
Comment 4 Jean-Michel Lemieux CLA 2004-06-11 16:51:11 EDT 
Post 3.0
Comment 5 Michael Valenta CLA 2006-06-15 12:20:07 EDT 
Mergring is now done locally so this problem should no longer occur.