Bug 28840 - Strange behavious applying patch
Summary: Strange behavious applying patch
Status: VERIFIED FIXED
Alias: None
Product: Platform
Classification: Eclipse Project
Component: Compare (show other bugs)
Version: 2.1   Edit
Hardware: PC Windows 2000
: P2 major (vote)
Target Milestone: 2.1 RC1   Edit
Assignee: Andre Weinand CLA
QA Contact:
URL:
Whiteboard:
Keywords:
: 24664 25635 31197 (view as bug list)
Depends on:
Blocks:
 
Reported: 2002-12-23 10:58 EST by Igor Fedorenko CLA
Modified: 2003-03-05 08:09 EST (History)
3 users (show)

See Also:


Attachments

Note You need to log in before you can comment on or make changes to this bug.
Description Igor Fedorenko CLA 2002-12-23 10:58:55 EST
I have a project with following directory structure

/project
  /src
    /test
      Test.java

This project is under cvs version control. Here are the steps to reproduce 
patch problem

0. "project" is in sync with repository
1. Modify Test.java (for example, add comments)
2. Select "project" in package view or navigator, right-click, Team, Create 
patch, Finish. This should save patch to clipboard.
3. Replace Test.java with latest version from repository.
4. Select Test.java in package explorer or navigator, right-click, Compare 
with, Patch, Next, Finish.

Problem: new directory /project/src/test/src/test is created, this directory 
has two files Test.java and Test.java.rej. /project/src/test/Test.java is not 
modified.

Win2k SP2, Eclipse 200212181304, JDK 1.4.1_01.
Comment 1 Michael Valenta CLA 2002-12-23 12:01:25 EST
The patch must be applied at the same level it was created or you must specify 
how many directory levels to ignore. It looks like you generated the patch by 
selecting the project and applied it by selecting the file or the parent 
directory of the file. However, the user should probably be warned when 
applying a patch that is not a file creation to a non-existent file. Moving to 
Platform Compare for comment.
Comment 2 Andre Weinand CLA 2003-02-10 08:50:56 EST
*** Bug 31197 has been marked as a duplicate of this bug. ***
Comment 3 Andre Weinand CLA 2003-02-10 09:36:05 EST
*** Bug 25635 has been marked as a duplicate of this bug. ***
Comment 4 Andre Weinand CLA 2003-02-10 18:55:36 EST
fixed and released on 20030211
Comment 5 Dani Megert CLA 2003-02-26 10:07:51 EST
start verifying
Comment 6 Andre Weinand CLA 2003-03-05 08:09:41 EST
*** Bug 24664 has been marked as a duplicate of this bug. ***