Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.
Bug 34746 - [Java] Changes show as incoming/outgoing in structure compare, but as conflict in text
Summary: [Java] Changes show as incoming/outgoing in structure compare, but as conflic...
Status: CLOSED WONTFIX
Alias: None
Product: Platform
Classification: Eclipse Project
Component: Compare (show other bugs)
Version: 2.1   Edit
Hardware: PC Windows XP
: P3 normal (vote)
Target Milestone: ---   Edit
Assignee: Platform-Compare-Inbox CLA
QA Contact:
URL:
Whiteboard: stalebug
Keywords:
Depends on:
Blocks:
 
Reported: 2003-03-11 16:46 EST by Boris Shingarov CLA
Modified: 2021-09-26 14:19 EDT (History)
1 user (show)

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 Boris Shingarov CLA 2003-03-11 16:46:10 EST 
1. Create a project with class Test, containing one method, Test.firstMethod().
2. Create a branch.
3. In the branch, add method Test.branchMethod().  Release.
4. In HEAD, add method Test.headMethod().
5. (optional) You may want or not want to release headMethod to HEAD.
6. Try merging from the branch into HEAD.  In the structure compare, 
branchMethod() will show up as an incoming change, headMethod() as outgoing 
change, but in the text there will be only one change showing as conflict.
Comment 1 Erich Gamma CLA 2003-03-12 05:19:47 EST 
should investigate for RC3
Comment 2 Erich Gamma CLA 2003-03-19 09:03:31 EST 
not critical enough for RC3, removing milestone tag
Comment 3 Tomasz Zarna CLA 2007-11-26 05:35:09 EST 
Unfortunately, this is still valid in N20071124-0010.
Comment 4 Eclipse Webmaster CLA 2019-09-06 15:35:52 EDT 
This bug hasn't had any activity in quite some time. Maybe the problem got resolved, was a duplicate of something else, or became less pressing for some reason - or maybe it's still relevant but just hasn't been looked at yet.

If you have further information on the current state of the bug, please add it. The information can be, for example, that the problem still occurs, that you still want the feature, that more information is needed, or that the bug is (for whatever reason) no longer relevant.
Comment 5 Eclipse Genie CLA 2021-09-26 14:19:19 EDT 
This bug hasn't had any activity in quite some time. Maybe the problem got resolved, was a duplicate of something else, or became less pressing for some reason - or maybe it's still relevant but just hasn't been looked at yet. As such, we're closing this bug.

If you have further information on the current state of the bug, please add it and reopen this bug. The information can be, for example, that the problem still occurs, that you still want the feature, that more information is needed, or that the bug is (for whatever reason) no longer relevant.

--
The automated Eclipse Genie.