History | Log In     View a printable version of the current page.  
Issue Details (XML | Word | Printable)

Key: IDEADEV-23987
Type: Bug Bug
Status: Resolved Resolved
Resolution: Fixed
Priority: Normal Normal
Assignee: Dmitry Jemerov
Reporter: Serge Baranov
Votes: 0
Watchers: 1
Operations

If you were logged in you would be able to see more operations.
IDEA: Development

Wrong "Patch Contents" when entering "Patch file name" manually

Created: 17 Dec 07 13:27   Updated: 19 Dec 07 14:47
Component/s: Version Control Integration
Fix Version/s: Selena 7.0.3

Original Estimate: Unknown Remaining Estimate: Unknown Time Spent: Unknown

Build: 7,590
Fixed in build: 7,608
Severity: Medium


 Description  « Hide
Support feedback:

There seems to be a problem with "Version Control->Apply Patch" when entering the "Patch file name" manually.

I have two instances of IDEA open, for different versions of my program and want to create patches in one instance and apply them in the other.
Therefore I reuse the name of the patch (e.g. c:\temp\p1.patch) and switch between the two IDEA instances. Creating the patches works fine.

When I want to apply the patch in the other IDEA instance, I choose "Version Control->Apply Patch". Now I can either write the name of the patch file
(C:\temp\p1.patch) manually in the text field "Patch file name" or use the file chooser. When using the file chooser, everything is fine. But when
entering the patch manually and leaving the field "Patch file name" by using the TAB key, the list in "Patch Contents" changes but belongs to a
previous version of my "p1.patch" file.

This is the problem. I reuse the name of the patch file and somehow IDEA shows me the content of an old version of this patch file. I have tried it
several times to be sure.

Also related to this issue:

I have tried to use the "Version Control-Apply Patch" function to apply changes made on another branch of the project. But it seems to be unusable as
it often seems to forget some files because of errors like

"Error loading changes for PersonModel.java: couldn't find context".

It also seems to often have problems with merging XML files (but not always).



 All   Comments   Work Log   Change History      Sort Order:
There are no comments yet on this issue.