Bug 34745

Summary: Incoming changes get in twice
Product: [Eclipse Project] JDT Reporter: Boris Shingarov <bshingar>
Component: UIAssignee: Andre Weinand <andre_weinand>
Status: VERIFIED FIXED QA Contact:
Severity: normal    
Priority: P2 CC: Darin_Swanson
Version: 2.1   
Target Milestone: 3.0 RC3   
Hardware: PC   
OS: Windows XP   
Whiteboard:
Bug Depends on:    
Bug Blocks: 47640    
Attachments:
Description Flags
patch for PropertiesStructureCreator
none
patch for PropertiesStructureCreator none

Description Boris Shingarov CLA 2003-03-11 16:40:07 EST 
1. For simplicity, consider a project with one class, Test, containing one 
method m1().
2. Create a new branch.
3. In the branch, add a new method, Test.m2()
4. In the workspace following HEAD, try to bring m2() in - e.g., by merging 
(but it doesn't matter).
5. After hitting "copy from right to left" and saving, the method gets brought 
in two times.
Comment 1 Erich Gamma CLA 2003-03-12 05:18:47 EST 
should investigate for RC3
Comment 2 Andre Weinand CLA 2003-03-14 15:25:22 EST 
Approved for RC3 by Erich and Andre.
Comment 3 Andre Weinand CLA 2003-03-14 15:27:33 EST 
fixed and released for I20030314.
Reviewed by Kai
Comment 4 Andre Weinand CLA 2004-06-16 07:26:28 EDT 
The same problem occurs when merging Java properties.

For the original bug we fixed the JavaNode, but we forgot to fix the
parallel class PropertiesStructureCreator.
Comment 5 Andre Weinand CLA 2004-06-16 08:24:18 EDT 
Erich and Dirk support to fix for RC3.
Comment 6 Andre Weinand CLA 2004-06-16 09:05:33 EDT 
*** Bug 45528 has been marked as a duplicate of this bug. ***
Comment 7 Andre Weinand CLA 2004-06-16 10:13:42 EDT 
Created attachment 12245 [details]
patch for PropertiesStructureCreator
Comment 8 Andre Weinand CLA 2004-06-16 10:16:56 EDT 
Created attachment 12246 [details]
patch for PropertiesStructureCreator
Comment 9 Andre Weinand CLA 2004-06-16 10:19:33 EDT 
reviewed with Martin and released for I20040616
Comment 10 Dirk Baeumer CLA 2004-06-21 05:02:06 EDT 
start verifying...
Comment 11 Dirk Baeumer CLA 2004-06-21 05:29:35 EDT 
Tested the following scenarios using build I200406192000:

Scenario one:
- messages.properties
  A.0= 0
  A.1= 1
  A.2= 2
- put into the reprository
- deleted A.1= 1
- compare with HEAD
- selected A1.1
- copied current change from right to left

Scenario two:
- properties file
  A.0= 0
  A.2= 2

- created brach
- in branch added A.1= 1
- released changes into branch
- switched back to HEAD
- merged changes with branch
- copied current change from right to left

In both cases only one occurrences of A.1= 1 got inserted.