Bug 185951 - [Apply Patch] Local Copy section doesn't show an existing local copy
Summary: [Apply Patch] Local Copy section doesn't show an existing local copy
Status: VERIFIED FIXED
Alias: None
Product: Platform
Classification: Eclipse Project
Component: Compare (show other bugs)
Version: 3.3   Edit
Hardware: PC Windows XP
: P3 normal (vote)
Target Milestone: 3.3 RC1   Edit
Assignee: Tomasz Zarna CLA
QA Contact:
URL:
Whiteboard:
Keywords: contributed
Depends on: 185385
Blocks:
  Show dependency tree
 
Reported: 2007-05-08 10:21 EDT by Tomasz Zarna CLA
Modified: 2007-06-05 15:14 EDT (History)
1 user (show)

See Also:

Attachments
Patch (1.08 KB, patch)
2007-05-16 08:17 EDT, Tomasz Zarna CLA 		no flags Details | Diff
Show Obsolete (1) View All 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 Tomasz Zarna CLA 2007-05-08 10:21:19 EDT 
Build ID:  I20070503-1400

Steps To Reproduce:
1. Create a file.
2. Create a patch creating the file.
3. Apply the patch.


More information:
In the result you will get a conflicting addition, which is expected because the file already exists. The "unexpected" thing is that the Apply Patch wizard doesn't show a local copy in the Local Copy section. 
The expected behavior is that the local copy appears on the left of both the file entry and the one unmatched hunk entry representing the conflicting addition.
Comment 1 Michael Valenta CLA 2007-05-08 15:28:53 EDT 
We should investigate for RC1. If the fix isn't too complex, we can put it in.
Comment 2 Tomasz Zarna CLA 2007-05-16 08:17:20 EDT 
Created attachment 67388 [details]
Patch

This patch fixes the described bug and makes the test case from attachment 67289 [details] (bug 185385) pass.
Comment 3 Michael Valenta CLA 2007-05-16 09:47:23 EDT 
The test cases on bug 185385 were not quite right. I'll hold off on apply the fix fir this bug until that issue is addressed.
Comment 4 Tomasz Zarna CLA 2007-05-16 12:22:54 EDT 
I made the patch obsolete, please use attachment 67440 [details] from bug 185385 to fix this bug.
Comment 5 Michael Valenta CLA 2007-05-16 14:21:42 EDT 
Patches in bug 185385 released/
Comment 6 Tomasz Zarna CLA 2007-05-18 10:45:46 EDT 
Bug 185385 verified in  I20070517-0010.